Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Revert "BASE_PATH build stage only, added label"

Francis Cao31caa0d62e2d
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index f25ab4f58..296dda225 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -24,7 +24,6 @@ jobs:
contents: read
packages: write
strategy:
- fail-fast: false
matrix:
include:
- type: standard
@@ -92,15 +91,12 @@ jobs:
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$SUFFIX"
DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}.${MINOR}$SUFFIX"
DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}$SUFFIX"
-
- if [[ -z "$SUFFIX" ]]; then
- GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest"
- DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest"
- fi
+ DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest$SUFFIX"
# Add latest tag based on trigger and input
if [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then
diff --git a/Dockerfile b/Dockerfile
index 29eddec96..eebe24308 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,6 @@ COPY docker/middleware.ts ./src
ARG BASE_PATH=""
ENV BASE_PATH=$BASE_PATH
-LABEL org.opencontainers.image.base-path="$BASE_PATH"
ENV NEXT_TELEMETRY_DISABLED=1
ENV DATABASE_URL="postgresql://user:pass@localhost:5432/dummy"