ansible-collections/phpipam_scan_agent
2
0
Fork 0
Code Issues 10 Pull Requests Actions Projects Releases 7 Wiki Activity

Merge branch 'genesis' into 'development'

Browse Source 
fix(ci): ensure docker publish uses correct tag

See merge request nofusscomputing/projects/ansible/collections/phpipam_scan_agent!5
This commit is contained in:
Jon Lockwood
2024-02-21 08:47:43 +00:00
parent d7dad5f42e 1cf73744e7
commit cb53807689
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -155,7 +155,7 @@ Github (Push --mirror):
echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG"; echo "[DEBUG] default: DOCKER_HUB_TAG=$DOCKER_HUB_TAG";
if [ "$CI_COMMIT_BRANCH" != "master" ]; then if [ "$CI_COMMIT_BRANCH" == "master" ]; then
DOCKER_HUB_TAG=latest DOCKER_HUB_TAG=latest
@ -177,8 +177,12 @@ Github (Push --mirror):
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_TAG; docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$DOCKER_HUB_TAG;
if [ "${CI_COMMIT_TAG}" ]; then
docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG; docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_PUBLISH_REGISTRY/$DOCKER_IMAGE_PUBLISH_NAME:$CI_COMMIT_TAG;
fi;
after_script: after_script:
- docker logout docker.io - docker logout docker.io