Slightly improved configuration for gitlab-ci [skip ci]

This commit is contained in:
ErickSkrauch 2019-08-03 22:49:17 +03:00
parent 663cfd9dbc
commit 25df1c711a

View File

@ -82,7 +82,7 @@ build:production:
--pull --pull
--target web --target web
--build-arg "build_env=prod" --build-arg "build_env=prod"
--cache-from "$APP_IMAGE_NAME:latest" --cache-from "$APP_IMAGE_NAME:$CI_PIPELINE_ID"
--cache-from "$WEB_IMAGE_NAME:latest" --cache-from "$WEB_IMAGE_NAME:latest"
-t "$WEB_IMAGE_NAME:$CI_PIPELINE_ID" . -t "$WEB_IMAGE_NAME:$CI_PIPELINE_ID" .
- > - >
@ -90,7 +90,7 @@ build:production:
--pull --pull
--target db --target db
--build-arg "build_env=prod" --build-arg "build_env=prod"
--cache-from "$APP_IMAGE_NAME:latest" --cache-from "$APP_IMAGE_NAME:$CI_PIPELINE_ID"
--cache-from "$DB_IMAGE_NAME:latest" --cache-from "$DB_IMAGE_NAME:latest"
-t "$DB_IMAGE_NAME:$CI_PIPELINE_ID" . -t "$DB_IMAGE_NAME:$CI_PIPELINE_ID" .
only: only:
@ -138,6 +138,8 @@ release:tag:
cleanup: cleanup:
stage: cleanup stage: cleanup
variables:
GIT_STRATEGY: none
script: script:
- docker rmi "$APP_IMAGE_NAME:$CI_PIPELINE_ID" "$APP_IMAGE_NAME:$VERSION" "$APP_IMAGE_NAME:latest" || true - docker rmi "$APP_IMAGE_NAME:$CI_PIPELINE_ID" "$APP_IMAGE_NAME:$VERSION" "$APP_IMAGE_NAME:latest" || true
- docker rmi "$WEB_IMAGE_NAME:$CI_PIPELINE_ID" "$WEB_IMAGE_NAME:$VERSION" "$WEB_IMAGE_NAME:latest" || true - docker rmi "$WEB_IMAGE_NAME:$CI_PIPELINE_ID" "$WEB_IMAGE_NAME:$VERSION" "$WEB_IMAGE_NAME:latest" || true