diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23870d0..72191b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: matrix: operating_system: - flavor: "alpine" - version: "3.19" + version: "3.20" - flavor: "bookworm" pg_target: - "12" diff --git a/Dockerfile.alpine b/Dockerfile.alpine index db97ec7..dab0933 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,7 @@ ARG PGTARGET=16 ### Things we need in all build containers -FROM alpine:3.19 as base-build +FROM alpine:3.20 as base-build # The versions of PostgreSQL to use ENV PG95=9.5.25 @@ -135,7 +135,7 @@ RUN cd postgresql-16.* && \ rm -rf /usr/local-pg16/include # Use the PostgreSQL Alpine image as our output image base -FROM postgres:${PGTARGET}-alpine3.19 +FROM postgres:${PGTARGET}-alpine3.20 # We need to define this here, to make the above PGTARGET available after the FROM ARG PGTARGET diff --git a/Makefile b/Makefile index 7ba66af..5a169b9 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,8 @@ dev: 16dev docker build -t pgautoupgrade/pgautoupgrade:16-dev -t pgautoupgrade/pgautoupgrade:dev . prod: - docker build --build-arg PGTARGET=15 -t pgautoupgrade/pgautoupgrade:15-alpine3.19 -t pgautoupgrade/pgautoupgrade:15-alpine . && \ - docker build -t pgautoupgrade/pgautoupgrade:16-alpine3.19 -t pgautoupgrade/pgautoupgrade:16-alpine -t pgautoupgrade/pgautoupgrade:latest . + 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 . attach: docker exec -it pgauto /bin/bash @@ -40,7 +40,7 @@ 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.19 pgautoupgrade/pgautoupgrade:16-alpine3.19 pgautoupgrade/pgautoupgrade:latest && \ + pgautoupgrade/pgautoupgrade:15-alpine3.20 pgautoupgrade/pgautoupgrade:16-alpine3.20 pgautoupgrade/pgautoupgrade:latest && \ docker image prune -f && \ docker volume prune -f @@ -77,8 +77,8 @@ pushdev: docker push pgautoupgrade/pgautoupgrade:dev pushprod: - docker push pgautoupgrade/pgautoupgrade:15-alpine3.19 && \ + docker push pgautoupgrade/pgautoupgrade:15-alpine3.20 && \ docker push pgautoupgrade/pgautoupgrade:15-alpine && \ - docker push pgautoupgrade/pgautoupgrade:16-alpine3.19 && \ + docker push pgautoupgrade/pgautoupgrade:16-alpine3.20 && \ docker push pgautoupgrade/pgautoupgrade:16-alpine && \ docker push pgautoupgrade/pgautoupgrade:latest \ No newline at end of file