Commit 61edd6bd authored by Ryan Herbert's avatar Ryan Herbert

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.
parent 5ee80b15
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment