fix image tagging scheme
This commit is contained in:
parent
84263bc686
commit
46b44496fb
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user