From e1656b7f57dad7d3bb83c6c240288b42927d20e8 Mon Sep 17 00:00:00 2001 From: Jake Gold Date: Wed, 21 Feb 2024 08:59:21 -0800 Subject: [PATCH 1/4] add semver container tag --- .github/workflows/build-and-push-ghcr.yaml | 1 + compose.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push-ghcr.yaml b/.github/workflows/build-and-push-ghcr.yaml index cef704b..c6c5ef2 100644 --- a/.github/workflows/build-and-push-ghcr.yaml +++ b/.github/workflows/build-and-push-ghcr.yaml @@ -40,6 +40,7 @@ jobs: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | + type=semver,enable=true,priority=90,pattern={{major}}.{{minor}} type=sha,enable=true,priority=100,suffix=,format=long - name: Build and push Docker image diff --git a/compose.yaml b/compose.yaml index d54ebef..749c034 100644 --- a/compose.yaml +++ b/compose.yaml @@ -16,7 +16,7 @@ services: target: /etc/caddy pds: container_name: pds - image: ghcr.io/bluesky-social/pds:latest + image: ghcr.io/bluesky-social/pds:0.2 network_mode: host restart: unless-stopped volumes: From 45b1a0fefd00925f218beaeed04744bebae74107 Mon Sep 17 00:00:00 2001 From: Jake Gold Date: Wed, 21 Feb 2024 08:59:57 -0800 Subject: [PATCH 2/4] add semver container tag --- .github/workflows/build-and-push-ghcr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-push-ghcr.yaml b/.github/workflows/build-and-push-ghcr.yaml index c6c5ef2..3c9e141 100644 --- a/.github/workflows/build-and-push-ghcr.yaml +++ b/.github/workflows/build-and-push-ghcr.yaml @@ -3,6 +3,7 @@ on: push: branches: - main + - update-versions env: REGISTRY: ghcr.io USERNAME: ${{ github.actor }} From 84939aff19ac06ad672d94932faec3dd7621eaa5 Mon Sep 17 00:00:00 2001 From: Jake Gold Date: Wed, 21 Feb 2024 15:14:28 -0800 Subject: [PATCH 3/4] github action semver --- .github/workflows/build-and-push-ghcr.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-push-ghcr.yaml b/.github/workflows/build-and-push-ghcr.yaml index 3c9e141..d69f2e9 100644 --- a/.github/workflows/build-and-push-ghcr.yaml +++ b/.github/workflows/build-and-push-ghcr.yaml @@ -36,13 +36,14 @@ jobs: - name: Extract Docker metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=semver,enable=true,priority=90,pattern={{major}}.{{minor}} - type=sha,enable=true,priority=100,suffix=,format=long + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=sha,format=long - name: Build and push Docker image id: build-and-push @@ -52,9 +53,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64,linux/arm64 file: ./Dockerfile - tags: | - ghcr.io/bluesky-social/pds:latest - ${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max From 9874055f593a52a79076b6043c56acafecf0bc1f Mon Sep 17 00:00:00 2001 From: Jake Gold Date: Wed, 21 Feb 2024 15:17:06 -0800 Subject: [PATCH 4/4] github action semver --- .github/workflows/build-and-push-ghcr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-push-ghcr.yaml b/.github/workflows/build-and-push-ghcr.yaml index d69f2e9..b67f0ce 100644 --- a/.github/workflows/build-and-push-ghcr.yaml +++ b/.github/workflows/build-and-push-ghcr.yaml @@ -4,6 +4,8 @@ on: branches: - main - update-versions + tags: + - v* env: REGISTRY: ghcr.io USERNAME: ${{ github.actor }}