Update image tagging w/ mr prefix for MRs
Prevent any possiblilty of confusion for tags (prefixed with a `v`) vs MR tags (previously no prefix). Signed-off-by: Chris Evich <chris_gitlab@icuc.me>
This commit is contained in:
@@ -17,10 +17,11 @@ build:
|
|||||||
script:
|
script:
|
||||||
- mkdir -p /kaniko/.docker
|
- mkdir -p /kaniko/.docker
|
||||||
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
|
||||||
|
- IMAGE_TAG="${CI_COMMIT_TAG:+${CI_COMMIT_TAG}}${CI_MERGE_REQUEST_IID:+mr${CI_MERGE_REQUEST_IID}${CI_COMMIT_BRANCH:+${CI_COMMIT_BRANCH/main/latest}}"
|
||||||
- >-
|
- >-
|
||||||
/kaniko/executor \
|
/kaniko/executor
|
||||||
--context $CI_PROJECT_DIR \
|
--context $CI_PROJECT_DIR
|
||||||
--dockerfile $CI_PROJECT_DIR/Containerfile \
|
--dockerfile $CI_PROJECT_DIR/Containerfile
|
||||||
--destination "$CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-${CI_MERGE_REQUEST_IID:-${CI_COMMIT_BRANCH/main/latest}}}" \
|
--destination "$CI_REGISTRY_IMAGE:${IAMGE_TAG}"
|
||||||
--build-arg "BASE_TAG=$BASE_TAG" \
|
--build-arg "BASE_TAG=$BASE_TAG"
|
||||||
--build-arg "FLAVOR=$FLAVOR"
|
--build-arg "FLAVOR=$FLAVOR"
|
||||||
|
|||||||
Reference in New Issue
Block a user