From 46b44496fb5e5db1935b4916f84003df29374a30 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 23 Nov 2022 12:29:15 +0100 Subject: [PATCH] fix image tagging scheme --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2037684..4ec72ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ build: - opt/ - etc/ - generated-version.txt + - version.txt script: - apt update - apt install -y gcc g++ libssl-dev uuid-dev libcjson-dev xsltproc docbook docbook-xsl libmariadb-dev libpq-dev libwebsockets-dev @@ -46,6 +47,7 @@ build: - cp pw $BUILD_DIR/opt/bin - popd - VERSION=`cat VERSION` + - echo -n "$VERSION" > version.txt - REFCNT=`git rev-list --all --count` - echo -n "$VERSION.$REFCNT.$CI_COMMIT_REF_NAME" > generated-version.txt @@ -59,12 +61,15 @@ dockerize: dependencies: - build script: - - VERSION=`cat generated-version.txt` - - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest --tag $HUB_IMAGE_NAME:$VERSION . + - GENERATGED_VERSION=`cat generated-version.txt` + - VERSION=`cat version.txt` + - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $IMAGE_NAME:$GENERATED_VERSION --tag $HUB_IMAGE_NAME:latest --tag $HUB_IMAGE_NAME:$VERSION --tag $GENERATED_VERSION . - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:$VERSION + - docker push $IMAGE_NAME:$GENERATED_VERSION - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD - docker push $HUB_IMAGE_NAME:latest - docker push $HUB_IMAGE_NAME:$VERSION + - docker push $HUB_IMAGE_NAME:$GENERATED_VERSION