Move version into docker build

This commit is contained in:
Jono Hill
2019-07-24 10:36:31 +12:00
parent 3b9f66d8b4
commit 6459c3f598
2 changed files with 5 additions and 4 deletions

View File

@ -8,13 +8,11 @@ variables:
dockerhub-push:
stage: deploy
image: "$CI_REGISTRY_IMAGE"
script:
- echo "$DOCKERHUB_PASSWORD" | base64 -d | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
- export DOCKER_VERSION=$(docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.+),.*$/\1/')
- export BUILDX_VERSION=$(docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')
- export IMAGE_TAG=$(docker run --rm "$CI_REGISTRY_IMAGE" cat /version)
- docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:latest"
- docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:${DOCKER_VERSION}_${BUILDX_VERSION}"
- docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:$IMAGE_TAG"
- docker push "$DOCKERHUB_REPO"
only:
- master

View File

@ -21,3 +21,6 @@ RUN mkdir -p ~/.docker/cli-plugins && \
grep "browser_download_url.*linux-arm64" | cut -d : -f 2,3 | tr -d \" | \
xargs curl -L -o ~/.docker/cli-plugins/docker-buildx && \
chmod a+x ~/.docker/cli-plugins/docker-buildx
# Write version file
RUN printf "$(docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.+),.*$/\1/')_$(docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')" > /version