diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a599a6dc..2d7f3cf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ variables: DOCROOT: /var/www/ stages: + - build-frontend - build - test - release @@ -26,19 +27,19 @@ stages: before_script: - docker login -u gitlab-ci-token -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}" -build-image: +build-image.nginx: <<: *docker_definition - stage: build + stage: build-frontend script: - - docker build --pull -t "${TEST_IMAGE}" -f contrib/Dockerfile . - - docker push "${TEST_IMAGE}" + - docker build --pull -t "${TEST_IMAGE}-nginx" -f contrib/nginx/Dockerfile . + - docker push "${TEST_IMAGE}-nginx" -build-image.nginx: +build-image: <<: *docker_definition stage: build script: - - docker build --pull -t "${TEST_IMAGE}.nginx" -f contrib/nginx/Dockerfile . - - docker push "${TEST_IMAGE}.nginx" + - docker build --pull --build-arg NGINX_IMAGE="${TEST_IMAGE}-nginx" -t "${TEST_IMAGE}" -f contrib/Dockerfile . + - docker push "${TEST_IMAGE}" test: image: ${TEST_IMAGE} |