From c7deeb9368a6dad4e60ab80d0d7a98713d31a8b9 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 26 Jul 2019 13:32:54 +0200
Subject: Docker/Release: Add more state files, improved Dockerfiles

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

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b044e56..4724da5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ variables:
   DOCROOT: /var/www/
 
 stages:
-  - build-frontend
   - build
   - test
   - release
@@ -29,17 +28,19 @@ stages:
 
 build-image.nginx:
   <<: *docker_definition
-  stage: build-frontend
+  stage: build
   artifacts:
     name: "${CI_JOB_NAME}_${CI_JOB_ID}_assets"
     expire_in: 1 day
     paths:
       - ./public/assets
+      - ./yarn.lock
   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 cp "${instance}:/var/www/yarn.lock" .
     - docker rm "${instance}"
 
 build-image:
@@ -121,8 +122,9 @@ build-release-file:
     paths:
       - ./release/
   script:
-    - rsync -vAax "${DOCROOT}" release/
+    - rsync -vAax "${DOCROOT}" "${DOCROOT}/.babelrc" "${DOCROOT}/.browserslistrc" release/
     - rsync -vAax public/assets release/public/
+    - rsync -vAax yarn.lock release/
 
 deploy-staging:
   <<: *deploy_definition
-- 
cgit v1.2.3-54-g00ecf