Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
feat: Add BASE_PATH support with -base image variant
Yash2e10ceee0ebc
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.ymlindex 24761faf4..5ec4abcb9 100644--- a/.github/workflows/cd.yml+++ b/.github/workflows/cd.yml@@ -23,6 +23,15 @@ jobs:permissions:contents: readpackages: write+ strategy:+ matrix:+ include:+ - type: standard+ base_path: ""+ suffix: ""+ - type: base+ base_path: "/umami"+ suffix: "-base"steps:- uses: actions/checkout@v5@@ -55,6 +64,7 @@ jobs:REF_TYPE="${{ github.ref_type }}"REF_NAME="${{ github.ref_name }}"INCLUDE_LATEST="${{ github.event.inputs.include_latest }}"+ SUFFIX="${{ matrix.suffix }}"# Determine version sourceif [[ -n "$INPUT" ]]; then@@ -74,30 +84,30 @@ jobs:if [[ "$VERSION" == *-* ]]; then# prerelease: only version tag- GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION"- DOCKER_TAGS="umamisoftware/umami:$VERSION"+ GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION$SUFFIX"+ DOCKER_TAGS="umamisoftware/umami:$VERSION$SUFFIX"else# stable release: version + hierarchy- 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"+ 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"- 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"+ 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"# Add latest tag based on trigger and inputif [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then- GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:latest"- DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:latest"+ GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:latest$SUFFIX"+ DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:latest$SUFFIX"fifielse# Non-tag build (e.g. from main branch)- GHCR_TAGS="ghcr.io/${{ github.repository }}:${REF_NAME}"- DOCKER_TAGS="umamisoftware/umami:${REF_NAME}"+ GHCR_TAGS="ghcr.io/${{ github.repository }}:${REF_NAME}$SUFFIX"+ DOCKER_TAGS="umamisoftware/umami:${REF_NAME}$SUFFIX"fiecho "ghcr_tags=$GHCR_TAGS" >> $GITHUB_OUTPUT@@ -112,6 +122,8 @@ jobs:platforms: linux/amd64,linux/arm64push: truetags: ${{ steps.compute.outputs.ghcr_tags }}+ build-args: |+ BASE_PATH=${{ matrix.base_path }}cache-from: type=ghacache-to: type=gha,mode=max@@ -123,5 +135,7 @@ jobs:platforms: linux/amd64,linux/arm64push: truetags: ${{ steps.compute.outputs.docker_tags }}+ build-args: |+ BASE_PATH=${{ matrix.base_path }}cache-from: type=ghacache-to: type=gha,mode=maxdiff --git a/Dockerfile b/Dockerfileindex 1282fd86d..a193f143b 100644--- a/Dockerfile+++ b/Dockerfile@@ -16,7 +16,7 @@ COPY --from=deps /app/node_modules ./node_modulesCOPY . .COPY docker/middleware.ts ./src-ARG BASE_PATH+ARG BASE_PATH=""ENV BASE_PATH=$BASE_PATHENV NEXT_TELEMETRY_DISABLED=1@@ -30,10 +30,12 @@ WORKDIR /appARG PRISMA_VERSION="6.19.0"ARG NODE_OPTIONS+ARG BASE_PATH=""ENV NODE_ENV=productionENV NEXT_TELEMETRY_DISABLED=1ENV NODE_OPTIONS=$NODE_OPTIONS+ENV BASE_PATH=$BASE_PATHRUN addgroup --system --gid 1001 nodejsRUN adduser --system --uid 1001 nextjs