Append repo version to Docker image

logicalclocks · Oct 20, 2023 · 5358a1a · 5358a1a
1 parent b199993
commit 5358a1a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -83,20 +83,22 @@ 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
 
  - 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
@@ -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