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
revert docker base build
Francis Caoee823acf8aab
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.ymlindex 296dda225..199cbe617 100644--- a/.github/workflows/cd.yml+++ b/.github/workflows/cd.yml@@ -23,15 +23,6 @@ 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@@ -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 sourceif [[ -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 inputif [[ "$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"fifielse# 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}"fiecho "ghcr_tags=$GHCR_TAGS" >> $GITHUB_OUTPUT@@ -122,10 +112,8 @@ jobs:platforms: linux/amd64,linux/arm64push: truetags: ${{ 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 Hubif: github.repository == 'umami-software/umami'@@ -135,7 +123,5 @@ jobs:platforms: linux/amd64,linux/arm64push: truetags: ${{ 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 filediff --git a/Dockerfile b/Dockerfileindex eebe24308..d77f6d3ba 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_PATHENV BASE_PATH=$BASE_PATHENV NEXT_TELEMETRY_DISABLED=1@@ -63,4 +63,4 @@ EXPOSE 3000ENV HOSTNAME=0.0.0.0ENV PORT=3000-CMD ["pnpm", "start-docker"]+CMD ["pnpm", "start-docker"]\ No newline at end of file