diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2019-07-21 04:13:31 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2019-07-21 04:38:17 +0200 |
commit | 4f60daa29568a43ab1da761d89124308dc7b37e7 (patch) | |
tree | 404deda1d4c5534f02b5a79348637ca568d6f3e0 /.gitlab-ci.yml | |
parent | b9cb7d57fdea7246f536204fd0f267380434aa09 (diff) |
Docker: Decoupled nginx and fpm builds
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 10 insertions, 1 deletions
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 |