Merge branch 'revert-f37fa1db' into 'master'

Revert "Update ci_templates/.cic-template.yml"

See merge request grassrootseconomics/cic-internal-integration!44
This commit is contained in:
Blair Vanderlugt 2021-02-28 18:32:41 +00:00
commit 854753f120

View File

@ -40,8 +40,7 @@ before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" $CI_REGISTRY --password-stdin - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" $CI_REGISTRY --password-stdin
variables: variables:
CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
# <branch>-<sha1>-<timestamp> https://toolkit.fluxcd.io/guides/sortable-image-tags/ IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA-$CI_COMMIT_TIMESTAMP
LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
script: script:
- docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH . - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .