From 5358a1a26d0a56eba63fff3c4052b6fc5cf154bf Mon Sep 17 00:00:00 2001
From: Vincent Lohse <vincent.lohse@logicalclocks.com>
Date: Fri, 20 Oct 2023 14:36:19 +0200
Subject: [PATCH] Append repo version to Docker image

---
 .github/workflows/test_and_deploy.yml | 34 ++++++++++++++++-----------
 build_run_docker.sh                   |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index 676cb59dd..22105d59d 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -83,8 +83,9 @@ jobs:
       - name: Build AMD64 image for RONDB_VERSION_STABLE
         if: github.repository == 'logicalclocks/rondb-docker' && github.ref_name == 'main'
         run: |
+          VERSION="$(< "./VERSION" sed -e 's/^[[:space:]]*//')"
           docker buildx build . \
-              --tag rondb-standalone:$RONDB_VERSION_STABLE \
+              --tag rondb-standalone:$RONDB_VERSION_STABLE-$VERSION \
               --build-arg RONDB_VERSION=$RONDB_VERSION_STABLE \
               --build-arg RONDB_TARBALL_LOCAL_REMOTE=remote \
               --build-arg RONDB_TARBALL_URI=https://repo.hops.works/master/rondb-$RONDB_VERSION_STABLE-linux-glibc2.17-x86_64.tar.gz
@@ -92,11 +93,12 @@ jobs:
       - name: Push AMD64 images to Dockerhub
         if: github.repository == 'logicalclocks/rondb-docker' && github.ref_name == 'main'
         run: |
-          docker tag rondb-standalone:$RONDB_VERSION_LTS hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS
-          docker tag rondb-standalone:$RONDB_VERSION_STABLE hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE
-          docker tag rondb-standalone:$RONDB_VERSION_STABLE hopsworks/$AMD_IMAGE_NAME:latest
-          docker push hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS
-          docker push hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE
+          VERSION="$(< "./VERSION" sed -e 's/^[[:space:]]*//')"
+          docker tag rondb-standalone:$RONDB_VERSION_LTS-$VERSION hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS-$VERSION
+          docker tag rondb-standalone:$RONDB_VERSION_STABLE-$VERSION hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE-$VERSION
+          docker tag rondb-standalone:$RONDB_VERSION_STABLE-$VERSION hopsworks/$AMD_IMAGE_NAME:latest
+          docker push hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS-$VERSION
+          docker push hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE-$VERSION
           docker push hopsworks/$AMD_IMAGE_NAME:latest
 
   build-and-push-ARM64:
@@ -122,8 +124,9 @@ jobs:
       # all types of benchmarking to the tests.
       - name: Build and push ARM64 image for RONDB_VERSION_LTS
         run: |
+          VERSION="$(< "./VERSION" sed -e 's/^[[:space:]]*//')"
           docker buildx build . \
-              --tag hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_LTS \
+              --tag hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_LTS-$VERSION \
               --platform=linux/arm64 \
               --output type=registry \
               --build-arg RONDB_VERSION=$RONDB_VERSION_LTS \
@@ -135,7 +138,7 @@ jobs:
       - name: Build and push ARM64 image for RONDB_VERSION_STABLE
         run: |
           docker buildx build . \
-              --tag hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_STABLE \
+              --tag hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_STABLE-$VERSION \
               --tag hopsworks/$ARM_IMAGE_NAME:latest \
               --platform=linux/arm64 \
               --output type=registry \
@@ -150,6 +153,8 @@ jobs:
     if: github.repository == 'logicalclocks/rondb-docker' && github.ref_name == 'main'
     needs: [integration-test-and-package, build-and-push-ARM64]
     steps:
+      - uses: actions/checkout@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -161,12 +166,13 @@ jobs:
 
       - name: Create and push multi-platform image
         run: |
-          docker buildx imagetools create -t hopsworks/rondb-standalone:$RONDB_VERSION_LTS \
-            hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS \
-            hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_LTS
-          docker buildx imagetools create -t hopsworks/rondb-standalone:$RONDB_VERSION_STABLE \
-            hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE \
-            hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_STABLE
+          VERSION="$(< "./VERSION" sed -e 's/^[[:space:]]*//')"
+          docker buildx imagetools create -t hopsworks/rondb-standalone:$RONDB_VERSION_LTS-$VERSION \
+            hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_LTS-$VERSION \
+            hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_LTS-$VERSION
+          docker buildx imagetools create -t hopsworks/rondb-standalone:$RONDB_VERSION_STABLE-$VERSION \
+            hopsworks/$AMD_IMAGE_NAME:$RONDB_VERSION_STABLE-$VERSION \
+            hopsworks/$ARM_IMAGE_NAME:$RONDB_VERSION_STABLE-$VERSION
           docker buildx imagetools create -t hopsworks/rondb-standalone:latest \
             hopsworks/$AMD_IMAGE_NAME:latest \
             hopsworks/$ARM_IMAGE_NAME:latest
diff --git a/build_run_docker.sh b/build_run_docker.sh
index 9d6e41433..268d28c17 100755
--- a/build_run_docker.sh
+++ b/build_run_docker.sh
@@ -357,7 +357,7 @@ BENCH_DIR="/home/mysql/benchmarks"
 #######################
 #######################
 
-RONDB_IMAGE_NAME="rondb-standalone:$RONDB_VERSION"
+RONDB_IMAGE_NAME="rondb-standalone:$RONDB_VERSION-$VERSION"
 if [ ! -n "$RONDB_TARBALL_PATH" ] && [ ! -n "$RONDB_TARBALL_URL" ]; then
     RONDB_IMAGE_NAME="hopsworks/$RONDB_IMAGE_NAME"
     docker pull $RONDB_IMAGE_NAME