From 3fdceef9f59c543c18ca5521597d3a7247512414 Mon Sep 17 00:00:00 2001
From: Jimmi Dyson <jimmidyson@gmail.com>
Date: Thu, 20 Jun 2024 16:36:10 +0100
Subject: [PATCH] ci: Update release process for mesosphere fork

---
 .github/workflows/release.yaml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f7d9fb83e7ca..3b3a790a3ad9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -48,7 +48,7 @@ jobs:
               echo "RELEASE_BRANCH=$RELEASE_BRANCH" >> $GITHUB_ENV
               echo "This is a beta or alpha release, will use release branch $RELEASE_BRANCH"
             else
-              export RELEASE_BRANCH=release-$(echo $RELEASE_VERSION | sed -E 's/^v([0-9]+)\.([0-9]+)\..*$/\1.\2/')
+              export RELEASE_BRANCH=d2iq/release-$(echo $RELEASE_VERSION | sed -E 's/^v([0-9]+)\.([0-9]+)\..*$/\1.\2/')
               echo "RELEASE_BRANCH=$RELEASE_BRANCH" >> $GITHUB_ENV
               echo "This is not a beta or alpha release, will use release branch $RELEASE_BRANCH"
             fi
@@ -83,9 +83,15 @@ jobs:
     needs: push_release_tags
     steps:
       - name: Set env
-        run:  echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV
+        run: |
+          echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV
+          echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
+          echo "PROD_REGISTRY=${REGISTRY}" >> $GITHUB_ENV
+          echo "STAGING_REGISTRY=${REGISTRY}" >> $GITHUB_ENV
+          echo "TAG=${RELEASE_TAG}" >> $GITHUB_ENV
         env:
           RELEASE_TAG: ${{needs.push_release_tags.outputs.release_tag}}
+          REGISTRY: docker.io/mesosphere
       - name: checkout code
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
         with:
@@ -111,3 +117,11 @@ jobs:
           files: out/*
           body_path: ${{ env.RELEASE_TAG }}.md
           tag_name: ${{ env.RELEASE_TAG }}
+      - name: Login to Dockerhub Registry
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push docker images
+        run: |
+          make ALL_ARCH="amd64 arm64" release-staging