sankalp/umami
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert docker base build

Browse Source
This commit is contained in:
Francis Cao committed 2026-03-10 09:58:59 -07:00
1 parent 746f7e8779
commit ee823acf8a
2 files changed
+20 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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