From 861bc5256c530ae50f5ace0b6e1a3c158dd2a784 Mon Sep 17 00:00:00 2001
From: Frode Aannevik <frode@dintero.com>
Date: Wed, 1 Jul 2026 00:10:30 +0200
Subject: [PATCH] Publish more tags

---
 .github/workflows/publish.yml | 2 +-
 Dockerfile                    | 4 +++-
 Makefile                      | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 975f5cd..ac5463d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,5 +20,5 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
       - run: make publish
         env:
-          TAG: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/${{ secrets.DOCKER_HUB_REPOSITORY }}:latest
+          REPOSITORY: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/${{ secrets.DOCKER_HUB_REPOSITORY }}
           BUILDX_CACHE_ARGS: --cache-from type=gha --cache-to type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index fd170c8..4fc0ce3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 ARG DOCKER_REGISTRY=registry-1.docker.io
-FROM ${DOCKER_REGISTRY}/library/postgres:16.13-alpine3.23@sha256:4e6e670bb069649261c9c18031f0aded7bb249a5b6664ddec29c013a89310d50
+ARG POSTGRES_VERSION=16.13-alpine3.23
+ARG POSTGRES_SHA256=sha256:4e6e670bb069649261c9c18031f0aded7bb249a5b6664ddec29c013a89310d50
+FROM ${DOCKER_REGISTRY}/library/postgres:${POSTGRES_VERSION}@${POSTGRES_SHA256}
 
 ARG PGAUDIT_VERSION=16.1
 ARG PGAUDIT_SHA256_HASH=01343a72d7eff31e40c8e646dd17f236dc07389205f57ab13000298f38f0a9fd
diff --git a/Makefile b/Makefile
index b3410e7..b147250 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,7 @@
-TAG ?= dintero/docker-postgres-pgaudit
+REPOSITORY ?= dintero/docker-postgres-pgaudit
+TAG ?= $(REPOSITORY):latest
+POSTGRES_VERSION := $(shell grep -oE 'POSTGRES_VERSION=[^ ]+' Dockerfile | cut -d= -f2)
+PUBLISH_TAGS ?= $(REPOSITORY):latest $(REPOSITORY):$(POSTGRES_VERSION)
 DOCKER_BUILDKIT ?= 1
 PLATFORMS ?= linux/amd64,linux/arm64
 BUILDX_CACHE_ARGS ?=
@@ -7,7 +10,7 @@ build:
 	docker buildx build --platform $(PLATFORMS) --tag $(TAG) $(BUILDX_CACHE_ARGS) .
 
 publish:
-	docker buildx build --platform $(PLATFORMS) --tag $(TAG) $(BUILDX_CACHE_ARGS) --push .
+	docker buildx build --platform $(PLATFORMS) $(addprefix --tag ,$(PUBLISH_TAGS)) $(BUILDX_CACHE_ARGS) --push .
 
 test:
 	docker rm -f pgaudit-test >/dev/null 2>&1 || true