From 4f60daa29568a43ab1da761d89124308dc7b37e7 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 21 Jul 2019 04:13:31 +0200
Subject: Docker: Decoupled nginx and fpm builds

---
 .gitlab-ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db26ce4c..7b0a8043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,15 +30,23 @@ stages:
 build-image.nginx:
   <<: *docker_definition
   stage: build-frontend
+  artifacts:
+    name: "${CI_JOB_NAME}_${CI_JOB_ID}_assets"
+    expire_in: 1 day
+    paths:
+      - ./public/assets
   script:
     - docker build --pull -t "${TEST_IMAGE}-nginx" -f contrib/nginx/Dockerfile .
     - docker push "${TEST_IMAGE}-nginx"
+    - instance=$(docker create "${TEST_IMAGE}-nginx")
+    - docker cp "${instance}:/var/www/public/assets" public/
+    - docker rm "${instance}"
 
 build-image:
   <<: *docker_definition
   stage: build
   script:
-    - docker build --pull --build-arg NGINX_IMAGE="${TEST_IMAGE}-nginx" -t "${TEST_IMAGE}" -f contrib/Dockerfile .
+    - docker build --pull -t "${TEST_IMAGE}" -f contrib/Dockerfile .
     - docker push "${TEST_IMAGE}"
 
 test:
@@ -112,6 +120,7 @@ build-release-file:
       - ./release/
   script:
     - rsync -vAax "${DOCROOT}" release/
+    - rsync -vAax public/assets release/public/
 
 deploy-staging:
   <<: *deploy_definition
-- 
cgit v1.2.3-54-g00ecf