diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-08-19 10:48:11 +0200 |
|---|---|---|
| committer | Igor Scheller <igor.scheller@igorshp.de> | 2019-08-19 11:19:45 +0200 |
| commit | 2e0c82ea05763b2932cf741734b8116de94ff3f1 (patch) | |
| tree | e92015128cbe32e63e7d45296565984c0371b8f7 /.gitlab-ci.yml | |
| parent | 030e1ab38d1b147aa180e1a2887764ba329a8560 (diff) | |
Versioned yarn.lock, fixed docker build
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4724da5a..77786f2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,13 +34,11 @@ build-image.nginx: 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: @@ -124,7 +122,6 @@ build-release-file: script: - rsync -vAax "${DOCROOT}" "${DOCROOT}/.babelrc" "${DOCROOT}/.browserslistrc" release/ - rsync -vAax public/assets release/public/ - - rsync -vAax yarn.lock release/ deploy-staging: <<: *deploy_definition |