From ee823acf8aab0d4ed3d9c0e92885a35f4c0977f6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 10 Mar 2026 09:58:59 -0700
Subject: [PATCH] revert docker base  build

---
 .github/workflows/cd.yml | 50 +++++++++++++++-------------------------
 Dockerfile               |  4 ++--
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 296dda225..199cbe617 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -23,15 +23,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-    strategy:
-      matrix:
-        include:
-          - type: standard
-            base_path: ""
-            suffix: ""
-          - type: base
-            base_path: "/umami"
-            suffix: "-base"
 
     steps:
       - uses: actions/checkout@v5
@@ -64,7 +55,6 @@ jobs:
           REF_TYPE="${{ github.ref_type }}"
           REF_NAME="${{ github.ref_name }}"
           INCLUDE_LATEST="${{ github.event.inputs.include_latest }}"
-          SUFFIX="${{ matrix.suffix }}"
 
           # Determine version source
           if [[ -n "$INPUT" ]]; then
@@ -84,30 +74,30 @@ jobs:
 
             if [[ "$VERSION" == *-* ]]; then
               # prerelease: only version tag
-              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION$SUFFIX"
-              DOCKER_TAGS="umamisoftware/umami:$VERSION$SUFFIX"
+              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION"
+              DOCKER_TAGS="umamisoftware/umami:$VERSION"
             else
               # stable release: version + hierarchy
-              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION$SUFFIX"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}.${MINOR}$SUFFIX"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}$SUFFIX"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest$SUFFIX"
+              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION"
+              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}.${MINOR}"
+              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}"
+              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest"
           
-              DOCKER_TAGS="umamisoftware/umami:$VERSION$SUFFIX"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}.${MINOR}$SUFFIX"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}$SUFFIX"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest$SUFFIX"
+              DOCKER_TAGS="umamisoftware/umami:$VERSION"
+              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}.${MINOR}"
+              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}"
+              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest"
           
               # Add latest tag based on trigger and input
               if [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then
-                GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:latest$SUFFIX"
-                DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:latest$SUFFIX"
+                GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:latest"
+                DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:latest"
               fi
             fi
           else
             # Non-tag build (e.g. from main branch)
-            GHCR_TAGS="ghcr.io/${{ github.repository }}:${REF_NAME}$SUFFIX"
-            DOCKER_TAGS="umamisoftware/umami:${REF_NAME}$SUFFIX"
+            GHCR_TAGS="ghcr.io/${{ github.repository }}:${REF_NAME}"
+            DOCKER_TAGS="umamisoftware/umami:${REF_NAME}"
           fi
 
           echo "ghcr_tags=$GHCR_TAGS" >> $GITHUB_OUTPUT
@@ -122,10 +112,8 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.compute.outputs.ghcr_tags }}
-          build-args: |
-            BASE_PATH=${{ matrix.base_path }}
-          cache-from: type=gha,scope=${{ matrix.type }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.type }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push to Docker Hub
         if: github.repository == 'umami-software/umami'
@@ -135,7 +123,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.compute.outputs.docker_tags }}
-          build-args: |
-            BASE_PATH=${{ matrix.base_path }}
-          cache-from: type=gha,scope=${{ matrix.type }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.type }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index eebe24308..d77f6d3ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 COPY docker/middleware.ts ./src
 
-ARG BASE_PATH=""
+ARG BASE_PATH
 
 ENV BASE_PATH=$BASE_PATH
 ENV NEXT_TELEMETRY_DISABLED=1
@@ -63,4 +63,4 @@ EXPOSE 3000
 ENV HOSTNAME=0.0.0.0
 ENV PORT=3000
 
-CMD ["pnpm", "start-docker"]
+CMD ["pnpm", "start-docker"]
\ No newline at end of file