From a6acd5e0990d4d5864c93ad095206bc045742df1 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:01:38 -0800 Subject: [PATCH 1/3] Added Docker labels to manual build. --- .github/workflows/cd-manual.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index ac701fcc..6fefd16c 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -8,6 +8,20 @@ on: description: Version required: true +env: + # set Docker OCI Labels + DOCKER_LABELS: > + org.opencontainers.image.title=${{github.event.repository.name}}, + org.opencontainers.image.description="Umami is a simple, fast, privacy-focused alternative to Google Analytics", + org.opencontainers.image.vendor=${{github.repository_owner}}, + org.opencontainers.image.licenses="MIT", + org.opencontainers.image.version=${{github.ref_name}}, + org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}, + org.opencontainers.image.revision=${{github.sha}}, + org.opencontainers.image.url="https://umami.is/", + org.opencontainers.image.documentation="https://umami.is/docs", + org.opencontainers.image.base.name="docker.io/library/node:18-alpine" + jobs: build: name: Build, push, and deploy @@ -25,6 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest + labels: $DOCKER_LABELS buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true From 0bae517677f655d99025cf9f5ab1248c338fb69e Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:19:56 -0800 Subject: [PATCH 2/3] Updated var reference. --- .github/workflows/cd-manual.yml | 2 +- .github/workflows/cd.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index 6fefd16c..b3f2f2a0 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -39,7 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 920542b7..105b76fe 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,7 +39,7 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true @@ -53,7 +53,7 @@ jobs: with: image: umamisoftware/umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: $DOCKER_LABELS + labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: docker.io username: ${{ secrets.DOCKER_USERNAME }} From 75d2e3af41d2ec29d862043182981e9a21ad4b37 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 29 Feb 2024 20:21:51 -0800 Subject: [PATCH 3/3] Removed docker labels. --- .github/workflows/cd-manual.yml | 15 --------------- .github/workflows/cd.yml | 16 ---------------- 2 files changed, 31 deletions(-) diff --git a/.github/workflows/cd-manual.yml b/.github/workflows/cd-manual.yml index b3f2f2a0..ac701fcc 100644 --- a/.github/workflows/cd-manual.yml +++ b/.github/workflows/cd-manual.yml @@ -8,20 +8,6 @@ on: description: Version required: true -env: - # set Docker OCI Labels - DOCKER_LABELS: > - org.opencontainers.image.title=${{github.event.repository.name}}, - org.opencontainers.image.description="Umami is a simple, fast, privacy-focused alternative to Google Analytics", - org.opencontainers.image.vendor=${{github.repository_owner}}, - org.opencontainers.image.licenses="MIT", - org.opencontainers.image.version=${{github.ref_name}}, - org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}, - org.opencontainers.image.revision=${{github.sha}}, - org.opencontainers.image.url="https://umami.is/", - org.opencontainers.image.documentation="https://umami.is/docs", - org.opencontainers.image.base.name="docker.io/library/node:18-alpine" - jobs: build: name: Build, push, and deploy @@ -39,7 +25,6 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ inputs.version }}, ${{ matrix.db-type }}-latest - labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 105b76fe..b4de5499 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,20 +2,6 @@ name: Create docker images on: [create] -env: - # set Docker OCI Labels - DOCKER_LABELS: > - org.opencontainers.image.title=${{github.event.repository.name}}, - org.opencontainers.image.description="Umami is a simple, fast, privacy-focused alternative to Google Analytics", - org.opencontainers.image.vendor=${{github.repository_owner}}, - org.opencontainers.image.licenses="MIT", - org.opencontainers.image.version=${{github.ref_name}}, - org.opencontainers.image.source=${{github.server_url}}/${{github.repository}}, - org.opencontainers.image.revision=${{github.sha}}, - org.opencontainers.image.url="https://umami.is/", - org.opencontainers.image.documentation="https://umami.is/docs", - org.opencontainers.image.base.name="docker.io/library/node:18-alpine" - jobs: build: name: Build, push, and deploy @@ -39,7 +25,6 @@ jobs: with: image: umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io multiPlatform: true @@ -53,7 +38,6 @@ jobs: with: image: umamisoftware/umami tags: ${{ matrix.db-type }}-${{ env.RELEASE_VERSION }}, ${{ matrix.db-type }}-latest - labels: ${{ DOCKER_LABELS }} buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: docker.io username: ${{ secrets.DOCKER_USERNAME }}