Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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 ?=
Expand All @@ -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
Expand Down