diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-10-27 12:20:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 12:20:30 +0100 |
| commit | 360a27016184bce3039fdbbb45b8f7b6bf02da3a (patch) | |
| tree | df2a3794ae4248b8efee23d01981b2451ca4fa2e /.gitlab-ci.yml | |
| parent | 9b08b951a2f7036519a9711ff4aa32a8709e261d (diff) | |
| parent | 545eb291b6d32c613f814eefc8e80e39899b1e90 (diff) | |
Merge pull request #662 from weeman1337/feature/660-docker-dev
Improves the docker workflow
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e14b1841..2590a0b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ build-image.nginx: paths: - ./public/assets script: - - docker build --pull -t "${TEST_IMAGE}-nginx" -f contrib/nginx/Dockerfile . + - docker build --pull -t "${TEST_IMAGE}-nginx" -f docker/nginx/Dockerfile . - docker push "${TEST_IMAGE}-nginx" - instance=$(docker create "${TEST_IMAGE}-nginx") - docker cp "${instance}:/var/www/public/assets" public/ @@ -48,7 +48,7 @@ build-image: script: - apk -q add git - VERSION="$(git describe --abbrev=0 --tags)-${CI_COMMIT_REF_NAME}+${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}" - - docker build --pull --build-arg VERSION="${VERSION}" -t "${TEST_IMAGE}" -f contrib/Dockerfile . + - docker build --pull --build-arg VERSION="${VERSION}" -t "${TEST_IMAGE}" -f docker/Dockerfile . - docker push "${TEST_IMAGE}" test: |