From 6459c3f598c4b6b42ec8eed9e38b950ae334d037 Mon Sep 17 00:00:00 2001
From: Jono Hill <jonathan@hillnz.com>
Date: Wed, 24 Jul 2019 10:36:31 +1200
Subject: [PATCH] Move version into docker build

---
 .gitlab-ci.yml | 6 ++----
 Dockerfile     | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dba94e..bca30f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 3868fe2..a04ffe1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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