From 6a58281ff015b4cc9039d6ae40b27b066f1c0527 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Wed, 17 Jul 2024 02:18:25 +1000 Subject: [PATCH] Start updating the Makefile for both Alpine and Bookworm Still needs a bit more thinking about and testing, but this seems like a reasonable start --- Makefile | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5a169b9..7f8b95d 100644 --- a/Makefile +++ b/Makefile @@ -5,23 +5,28 @@ all: 12dev 13dev 14dev 15dev 16dev prod dev: 16dev 12dev: - docker build --build-arg PGTARGET=12 -t pgautoupgrade/pgautoupgrade:12-dev . + docker build -f Dockerfile.alpine --build-arg PGTARGET=12 -t pgautoupgrade/pgautoupgrade:12-dev . && \ + docker build -f Dockerfile.bookworm --build-arg PGTARGET=12 -t pgautoupgrade/pgautoupgrade:12-dev-bookworm . 13dev: - docker build --build-arg PGTARGET=13 -t pgautoupgrade/pgautoupgrade:13-dev . + docker build -f Dockerfile.alpine --build-arg PGTARGET=13 -t pgautoupgrade/pgautoupgrade:13-dev . && \ + docker build -f Dockerfile.bookworm --build-arg PGTARGET=13 -t pgautoupgrade/pgautoupgrade:13-dev-bookworm . 14dev: - docker build --build-arg PGTARGET=14 -t pgautoupgrade/pgautoupgrade:14-dev . + docker build -f Dockerfile.alpine --build-arg PGTARGET=14 -t pgautoupgrade/pgautoupgrade:14-dev . && \ + docker build -f Dockerfile.bookworm --build-arg PGTARGET=14 -t pgautoupgrade/pgautoupgrade:14-dev-bookworm . 15dev: - docker build --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-dev . + docker build -f Dockerfile.alpine --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-dev . && \ + docker build -f Dockerfile.bookworm --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-dev-bookworm . 16dev: - docker build -t pgautoupgrade/pgautoupgrade:16-dev -t pgautoupgrade/pgautoupgrade:dev . + docker build -f Dockerfile.alpine -t pgautoupgrade/pgautoupgrade:16-dev -t pgautoupgrade/pgautoupgrade:dev . && \ + docker build -f Dockerfile.bookworm -t pgautoupgrade/pgautoupgrade:16-dev-bookworm -t pgautoupgrade/pgautoupgrade:dev-bookworm . prod: - docker build --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-alpine3.20 -t pgautoupgrade/pgautoupgrade:15-alpine . && \ - docker build -t pgautoupgrade/pgautoupgrade:16-alpine3.20 -t pgautoupgrade/pgautoupgrade:16-alpine -t pgautoupgrade/pgautoupgrade:latest . + docker build -f Dockerfile.alpine --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-alpine3.20 -t pgautoupgrade/pgautoupgrade:15-alpine . && \ + docker build -f Dockerfile.alpine -t pgautoupgrade/pgautoupgrade:16-alpine3.20 -t pgautoupgrade/pgautoupgrade:16-alpine -t pgautoupgrade/pgautoupgrade:latest . attach: docker exec -it pgauto /bin/bash @@ -37,10 +42,25 @@ before: pgautoupgrade/pgautoupgrade:dev clean: - docker image rm --force pgautoupgrade/pgautoupgrade:dev pgautoupgrade/pgautoupgrade:12-dev pgautoupgrade/pgautoupgrade:13-dev \ - pgautoupgrade/pgautoupgrade:14-dev pgautoupgrade/pgautoupgrade:15-dev pgautoupgrade/pgautoupgrade:16-dev \ - pgautoupgrade/pgautoupgrade:15-alpine pgautoupgrade/pgautoupgrade:16-alpine \ - pgautoupgrade/pgautoupgrade:15-alpine3.20 pgautoupgrade/pgautoupgrade:16-alpine3.20 pgautoupgrade/pgautoupgrade:latest && \ + docker image rm --force pgautoupgrade/pgautoupgrade:dev \ + pgautoupgrade/pgautoupgrade:dev-bookworm \ + pgautoupgrade/pgautoupgrade:12-dev \ + pgautoupgrade/pgautoupgrade:12-dev-bookworm \ + pgautoupgrade/pgautoupgrade:13-dev \ + pgautoupgrade/pgautoupgrade:13-dev-bookworm \ + pgautoupgrade/pgautoupgrade:14-dev \ + pgautoupgrade/pgautoupgrade:14-dev-bookworm \ + pgautoupgrade/pgautoupgrade:15-dev \ + pgautoupgrade/pgautoupgrade:15-dev-bookworm \ + pgautoupgrade/pgautoupgrade:16-dev \ + pgautoupgrade/pgautoupgrade:16-dev-bookworm \ + pgautoupgrade/pgautoupgrade:15-alpine \ + pgautoupgrade/pgautoupgrade:15-bookworm \ + pgautoupgrade/pgautoupgrade:16-alpine \ + pgautoupgrade/pgautoupgrade:16-bookworm \ + pgautoupgrade/pgautoupgrade:15-alpine3.20 \ + pgautoupgrade/pgautoupgrade:16-alpine3.20 \ + pgautoupgrade/pgautoupgrade:latest && \ docker image prune -f && \ docker volume prune -f @@ -70,11 +90,17 @@ up: pushdev: docker push pgautoupgrade/pgautoupgrade:12-dev && \ + docker push pgautoupgrade/pgautoupgrade:12-dev-bookworm && \ docker push pgautoupgrade/pgautoupgrade:13-dev && \ + docker push pgautoupgrade/pgautoupgrade:13-dev-bookworm && \ docker push pgautoupgrade/pgautoupgrade:14-dev && \ + docker push pgautoupgrade/pgautoupgrade:14-dev-bookworm && \ docker push pgautoupgrade/pgautoupgrade:15-dev && \ + docker push pgautoupgrade/pgautoupgrade:15-dev-bookworm && \ docker push pgautoupgrade/pgautoupgrade:16-dev && \ - docker push pgautoupgrade/pgautoupgrade:dev + docker push pgautoupgrade/pgautoupgrade:16-dev-bookworm && \ + docker push pgautoupgrade/pgautoupgrade:dev && \ + docker push pgautoupgrade/pgautoupgrade:dev-bookworm pushprod: docker push pgautoupgrade/pgautoupgrade:15-alpine3.20 && \