From 6a763b0f413257f272caf9b1701edbf77207cde4 Mon Sep 17 00:00:00 2001
From: Manish Gupta <manish@mgupta.me>
Date: Fri, 28 Jun 2024 10:54:51 +0530
Subject: [PATCH] wip

---
 .github/workflows/build-aio-base.yml   |  4 ++--
 .github/workflows/build-aio-branch.yml | 12 ++++++------
 aio/Dockerfile-app                     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-aio-base.yml b/.github/workflows/build-aio-base.yml
index 828993cc286..f403cbe620d 100644
--- a/.github/workflows/build-aio-base.yml
+++ b/.github/workflows/build-aio-base.yml
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [base_build_setup]
     env:
-      BASE_IMG_TAG: makeplane/plane-aio-base-full:${{ needs.base_build_setup.outputs.image_tag }}
+      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
       TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
@@ -95,7 +95,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [base_build_setup]
     env:
-      BASE_IMG_TAG: makeplane/plane-aio-base-slim:${{ needs.base_build_setup.outputs.image_tag }}
+      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
       TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
diff --git a/.github/workflows/build-aio-branch.yml b/.github/workflows/build-aio-branch.yml
index f864ada408f..120258917f2 100644
--- a/.github/workflows/build-aio-branch.yml
+++ b/.github/workflows/build-aio-branch.yml
@@ -83,7 +83,7 @@ jobs:
     env:
       BUILD_TYPE: full
       AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio-full:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -93,9 +93,9 @@ jobs:
       - name: Set Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio-${{env.BUILD_TYPE}}:stable,makeplane/plane-aio-${{env.BUILD_TYPE}}:${{ github.event.release.tag_name }}
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-${{env.BUILD_TYPE}}:latest
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
           else
             TAG=${{ env.AIO_IMAGE_TAGS }}
           fi
@@ -143,7 +143,7 @@ jobs:
     env:
       BUILD_TYPE: slim
       AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio-slim:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -153,9 +153,9 @@ jobs:
       - name: Set Docker Tag
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            TAG=makeplane/plane-aio-${{env.BUILD_TYPE}}:stable,makeplane/plane-aio-${{env.BUILD_TYPE}}:${{ github.event.release.tag_name }}
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-stable,makeplane/plane-aio:${{env.BUILD_TYPE}}-${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=makeplane/plane-aio-${{env.BUILD_TYPE}}:latest
+            TAG=makeplane/plane-aio:${{env.BUILD_TYPE}}-latest
           else
             TAG=${{ env.AIO_IMAGE_TAGS }}
           fi
diff --git a/aio/Dockerfile-app b/aio/Dockerfile-app
index cf7ee21fa26..54b5269e348 100644
--- a/aio/Dockerfile-app
+++ b/aio/Dockerfile-app
@@ -58,7 +58,7 @@ RUN yarn turbo run build --filter=web --filter=space --filter=admin
 # *****************************************************************************
 # STAGE 3: Copy the project and start it
 # *****************************************************************************
-FROM makeplane/plane-aio-base-${BUILD_TYPE}:${BASE_TAG} AS runner
+FROM makeplane/plane-aio-base:${BUILD_TYPE}-${BASE_TAG} AS runner
 
 WORKDIR /app