From 61edd6bd12e8fe94b299fe28e3f96aa0d48292ae Mon Sep 17 00:00:00 2001
From: Ryan Herbert <ryan@vidjil.org>
Date: Mon, 4 Jun 2018 12:38:07 +0100
Subject: [PATCH] Don't build docker image in docker-compose and use proper tag

Since we are building the image in gitlab ci, we should not attempt to
build it in docker-compose. We should also match the build tag to the
docker-compose file.
---
 .gitlab-ci.yml            | 2 +-
 docker/docker-compose.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5908cc1c..7971277d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -242,7 +242,7 @@ test_server_unit:
 test_server_functional:
   stage: test_functional
   script:
-    - docker build --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t $CI_BUILD_REF_SLUG docker/vidjil
+      - docker build --build-arg git_branch=$CI_COMMIT_REF_NAME --build-arg build_env=TEST -t vidjil:test docker/vidjil
     - cd docker && (docker-compose up &) && cd ..
     - HEADLESS=1 make functional_server || (cd docker && docker-compose stop; false)
     - cd docker && docker-compose stop
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6449dfbfe..6864aea3d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -8,7 +8,6 @@ services:
             - ./mysql/:/docker-entrypoint-initdb.d/
             - /opt/vidjil/mysql:/var/lib/mysql
     uwsgi:
-        build: ./vidjil
         image: vidjil:test
         command: bash /entrypoints/uwsgi-entrypoint.sh
         volumes_from:
-- 
GitLab