From 590adffa9316b98544cb8d67b03b80e44ba9c8b7 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 23 Sep 2018 14:18:24 +0200
Subject: Fixed release file build (did not include frontend files), formatting

---
 .gitlab-ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to '.gitlab-ci.yml')

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}
-- 
cgit v1.2.3-54-g00ecf