From b837a3b79bea6855cec44e265734faaa12fd4fbd Mon Sep 17 00:00:00 2001
From: Radovan Zivkovic <r.zivkovic@rasa.com>
Date: Tue, 12 Sep 2023 15:00:59 +0200
Subject: [PATCH] Set IMAGE_TAG when tagging the image for GA version

---
 .github/workflows/continous-integration.yml | 12 ++++++------
 3.7.0b1/main_plain/.config/rasa/global.yml  |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 3.7.0b1/main_plain/.config/rasa/global.yml

diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
index 13fc9bd19b27..8813c17b9006 100644
--- a/.github/workflows/continous-integration.yml
+++ b/.github/workflows/continous-integration.yml
@@ -906,7 +906,7 @@ jobs:
           # Base MITIE image
           BASE_MITIE_IMAGE_HASH=${{ hashFiles('docker/Dockerfile.base-mitie') }}
           MAKEFILE_MITIE_HASH=${{ hashFiles('Makefile') }}
-          echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50}" >> $GITHUB_OUTPUT
+          echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH}" >> $GITHUB_OUTPUT
 
           BASE_IMAGE_MITIE_EXISTS=$((docker manifest inspect rasa/rasa:base-mitie-${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50} &> /dev/null && echo true || echo false) || true)
           echo "base_mitie_exists=${BASE_IMAGE_MITIE_EXISTS}" >> $GITHUB_OUTPUT
@@ -1095,8 +1095,6 @@ jobs:
           IS_NEWEST_VERSION=${{ needs.build_docker_base_images_and_set_env.outputs.is_newest_version }}
 
           docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push
-          docker buildx bake --set *.platform=linux/amd64 -f docker/docker-bake.hcl ${{ matrix.image }} --load
-          docker buildx bake --set *.platform=linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --load
 
           # Tag the image as latest
           if [[ "${IS_NEWEST_VERSION}" == "true" ]]; then
@@ -1107,9 +1105,11 @@ jobs:
             fi
 
             LATEST_TAG=$(echo $RELEASE_TAG | sed 's/'$IMAGE_TAG'/latest/g')
-
-            docker tag rasa/rasa:${RELEASE_TAG} rasa/rasa:${LATEST_TAG}
-            docker push rasa/rasa:${LATEST_TAG}
+            
+            # This will not build the image from ground up, but will only tag the existing image with LATEST_TAG
+            IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }}
+            # Push tagged image
+            IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push
           fi
 
   deploy:
diff --git a/3.7.0b1/main_plain/.config/rasa/global.yml b/3.7.0b1/main_plain/.config/rasa/global.yml
new file mode 100644
index 000000000000..c5dcee2da8c9
--- /dev/null
+++ b/3.7.0b1/main_plain/.config/rasa/global.yml
@@ -0,0 +1,4 @@
+metrics:
+  enabled: true
+  rasa_user_id: 003ff8fbd6e04031b5597b37356022d4
+  date: 2023-09-12 13:20:59.423434