Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update postgres #16813

Merged
merged 1 commit into from
May 22, 2024
Merged

Update postgres #16813

merged 1 commit into from
May 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 22, 2024

Changes:

@docker-library-bot
Update postgres
29e2d2e 
Changes:

- docker-library/postgres@bdd4270: Merge pull request docker-library/postgres#1240 from Earlopain/alpine-3.20
- docker-library/postgres@930acaf: Update to alpine 3.20
@tianon tianon requested a review from a team as a code owner May 22, 2024 21:10
@github-actions GitHub Actions
Copy link

Diff for 29e2d2e: 
diff --git a/_bashbrew-arches b/_bashbrew-arches
index bedcccb..3616e93 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,4 +6,5 @@ arm64v8
 i386
 mips64le
 ppc64le
+riscv64
 s390x
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2b2d0ec..810c130 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,16 +6,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: ccf4f2289a1e59ddf74a5d1e6eb7693b7f464b54
 Directory: 12/bookworm
 
-Tags: 12.19-alpine3.18, 12-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ccf4f2289a1e59ddf74a5d1e6eb7693b7f464b54
-Directory: 12/alpine3.18
-
-Tags: 12.19-alpine3.19, 12-alpine3.19, 12.19-alpine, 12-alpine
+Tags: 12.19-alpine3.19, 12-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: ccf4f2289a1e59ddf74a5d1e6eb7693b7f464b54
 Directory: 12/alpine3.19
 
+Tags: 12.19-alpine3.20, 12-alpine3.20, 12.19-alpine, 12-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+Directory: 12/alpine3.20
+
 Tags: 12.19-bullseye, 12-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: ccf4f2289a1e59ddf74a5d1e6eb7693b7f464b54
@@ -26,16 +26,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f3ab8c6db63e2986453e0a4fae2c5f372dd4f05e
 Directory: 13/bookworm
 
-Tags: 13.15-alpine3.18, 13-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f3ab8c6db63e2986453e0a4fae2c5f372dd4f05e
-Directory: 13/alpine3.18
-
-Tags: 13.15-alpine3.19, 13-alpine3.19, 13.15-alpine, 13-alpine
+Tags: 13.15-alpine3.19, 13-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f3ab8c6db63e2986453e0a4fae2c5f372dd4f05e
 Directory: 13/alpine3.19
 
+Tags: 13.15-alpine3.20, 13-alpine3.20, 13.15-alpine, 13-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+Directory: 13/alpine3.20
+
 Tags: 13.15-bullseye, 13-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f3ab8c6db63e2986453e0a4fae2c5f372dd4f05e
@@ -46,16 +46,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 662dbe5225f4d404364bdcf5e49dd5d88357ed31
 Directory: 14/bookworm
 
-Tags: 14.12-alpine3.18, 14-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 662dbe5225f4d404364bdcf5e49dd5d88357ed31
-Directory: 14/alpine3.18
-
-Tags: 14.12-alpine3.19, 14-alpine3.19, 14.12-alpine, 14-alpine
+Tags: 14.12-alpine3.19, 14-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 662dbe5225f4d404364bdcf5e49dd5d88357ed31
 Directory: 14/alpine3.19
 
+Tags: 14.12-alpine3.20, 14-alpine3.20, 14.12-alpine, 14-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+Directory: 14/alpine3.20
+
 Tags: 14.12-bullseye, 14-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 662dbe5225f4d404364bdcf5e49dd5d88357ed31
@@ -66,16 +66,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 8a0b96710d917d1c3b32a5fe5b66687ad83827da
 Directory: 15/bookworm
 
-Tags: 15.7-alpine3.18, 15-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8a0b96710d917d1c3b32a5fe5b66687ad83827da
-Directory: 15/alpine3.18
-
-Tags: 15.7-alpine3.19, 15-alpine3.19, 15.7-alpine, 15-alpine
+Tags: 15.7-alpine3.19, 15-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8a0b96710d917d1c3b32a5fe5b66687ad83827da
 Directory: 15/alpine3.19
 
+Tags: 15.7-alpine3.20, 15-alpine3.20, 15.7-alpine, 15-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+Directory: 15/alpine3.20
+
 Tags: 15.7-bullseye, 15-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 8a0b96710d917d1c3b32a5fe5b66687ad83827da
@@ -86,16 +86,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
 Directory: 16/bookworm
 
-Tags: 16.3-alpine3.18, 16-alpine3.18, alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
-Directory: 16/alpine3.18
-
-Tags: 16.3-alpine3.19, 16-alpine3.19, alpine3.19, 16.3-alpine, 16-alpine, alpine
+Tags: 16.3-alpine3.19, 16-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
 Directory: 16/alpine3.19
 
+Tags: 16.3-alpine3.20, 16-alpine3.20, alpine3.20, 16.3-alpine, 16-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 930acaf01ff536090a3bb304cf823a8cc777b658
+Directory: 16/alpine3.20
+
 Tags: 16.3-bullseye, 16-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: d08757ccb56ee047efd76c41dbc148e2e2c4f68f
diff --git a/_bashbrew-list b/_bashbrew-list
index 5fddc55..6aa38cc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,66 +1,66 @@
 postgres:12
 postgres:12-alpine
-postgres:12-alpine3.18
 postgres:12-alpine3.19
+postgres:12-alpine3.20
 postgres:12-bookworm
 postgres:12-bullseye
 postgres:12.19
 postgres:12.19-alpine
-postgres:12.19-alpine3.18
 postgres:12.19-alpine3.19
+postgres:12.19-alpine3.20
 postgres:12.19-bookworm
 postgres:12.19-bullseye
 postgres:13
 postgres:13-alpine
-postgres:13-alpine3.18
 postgres:13-alpine3.19
+postgres:13-alpine3.20
 postgres:13-bookworm
 postgres:13-bullseye
 postgres:13.15
 postgres:13.15-alpine
-postgres:13.15-alpine3.18
 postgres:13.15-alpine3.19
+postgres:13.15-alpine3.20
 postgres:13.15-bookworm
 postgres:13.15-bullseye
 postgres:14
 postgres:14-alpine
-postgres:14-alpine3.18
 postgres:14-alpine3.19
+postgres:14-alpine3.20
 postgres:14-bookworm
 postgres:14-bullseye
 postgres:14.12
 postgres:14.12-alpine
-postgres:14.12-alpine3.18
 postgres:14.12-alpine3.19
+postgres:14.12-alpine3.20
 postgres:14.12-bookworm
 postgres:14.12-bullseye
 postgres:15
 postgres:15-alpine
-postgres:15-alpine3.18
 postgres:15-alpine3.19
+postgres:15-alpine3.20
 postgres:15-bookworm
 postgres:15-bullseye
 postgres:15.7
 postgres:15.7-alpine
-postgres:15.7-alpine3.18
 postgres:15.7-alpine3.19
+postgres:15.7-alpine3.20
 postgres:15.7-bookworm
 postgres:15.7-bullseye
 postgres:16
 postgres:16-alpine
-postgres:16-alpine3.18
 postgres:16-alpine3.19
+postgres:16-alpine3.20
 postgres:16-bookworm
 postgres:16-bullseye
 postgres:16.3
 postgres:16.3-alpine
-postgres:16.3-alpine3.18
 postgres:16.3-alpine3.19
+postgres:16.3-alpine3.20
 postgres:16.3-bookworm
 postgres:16.3-bullseye
 postgres:alpine
-postgres:alpine3.18
 postgres:alpine3.19
+postgres:alpine3.20
 postgres:bookworm
 postgres:bullseye
 postgres:latest
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine/Dockerfile
index b146ec3..e68037b 100644
--- a/postgres_12-alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/postgres_12-alpine3.18/Dockerfile b/postgres_12-alpine3.18/Dockerfile
deleted file mode 100644
index ca48d22..0000000
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine3.19/Dockerfile
similarity index 100%
copy from postgres_12-alpine/Dockerfile
copy to postgres_12-alpine3.19/Dockerfile
diff --git a/postgres_12-alpine3.18/docker-ensure-initdb.sh b/postgres_12-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_12-alpine3.18/docker-ensure-initdb.sh
rename to postgres_12-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_12-alpine3.18/docker-entrypoint.sh b/postgres_12-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_12-alpine3.18/docker-entrypoint.sh
rename to postgres_12-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index 2320c0b..43fa0ea 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/postgres_13-alpine3.18/Dockerfile b/postgres_13-alpine3.18/Dockerfile
deleted file mode 100644
index 465b514..0000000
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine3.19/Dockerfile
similarity index 100%
copy from postgres_13-alpine/Dockerfile
copy to postgres_13-alpine3.19/Dockerfile
diff --git a/postgres_13-alpine3.18/docker-ensure-initdb.sh b/postgres_13-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_13-alpine3.18/docker-ensure-initdb.sh
rename to postgres_13-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_13-alpine3.18/docker-entrypoint.sh b/postgres_13-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_13-alpine3.18/docker-entrypoint.sh
rename to postgres_13-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 3666022..0ea12b0 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/postgres_14-alpine3.18/Dockerfile b/postgres_14-alpine3.18/Dockerfile
deleted file mode 100644
index b1fbd8d..0000000
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine3.19/Dockerfile
similarity index 100%
copy from postgres_14-alpine/Dockerfile
copy to postgres_14-alpine3.19/Dockerfile
diff --git a/postgres_14-alpine3.18/docker-ensure-initdb.sh b/postgres_14-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_14-alpine3.18/docker-ensure-initdb.sh
rename to postgres_14-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_14-alpine3.18/docker-entrypoint.sh b/postgres_14-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_14-alpine3.18/docker-entrypoint.sh
rename to postgres_14-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index 37a1034..8c67066 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/postgres_15-alpine3.18/Dockerfile b/postgres_15-alpine3.18/Dockerfile
deleted file mode 100644
index 87a2ce7..0000000
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine3.19/Dockerfile
similarity index 100%
copy from postgres_15-alpine/Dockerfile
copy to postgres_15-alpine3.19/Dockerfile
diff --git a/postgres_15-alpine3.18/docker-ensure-initdb.sh b/postgres_15-alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_15-alpine3.18/docker-ensure-initdb.sh
rename to postgres_15-alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_15-alpine3.18/docker-entrypoint.sh b/postgres_15-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_15-alpine3.18/docker-entrypoint.sh
rename to postgres_15-alpine3.19/docker-entrypoint.sh
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index 89aab48..d07b848 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
diff --git a/postgres_alpine3.18/Dockerfile b/postgres_alpine3.18/Dockerfile
deleted file mode 100644
index 17b0859..0000000
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine3.19/Dockerfile
similarity index 100%
copy from postgres_alpine/Dockerfile
copy to postgres_alpine3.19/Dockerfile
diff --git a/postgres_alpine3.18/docker-ensure-initdb.sh b/postgres_alpine3.19/docker-ensure-initdb.sh
similarity index 100%
rename from postgres_alpine3.18/docker-ensure-initdb.sh
rename to postgres_alpine3.19/docker-ensure-initdb.sh
diff --git a/postgres_alpine3.18/docker-entrypoint.sh b/postgres_alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from postgres_alpine3.18/docker-entrypoint.sh
rename to postgres_alpine3.19/docker-entrypoint.sh

Relevant Maintainers:

@tianon tianon merged commit a6fd9f1 into docker-library:master May 22, 2024
25 checks passed
@tianon tianon deleted the postgres branch May 22, 2024 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/postgres
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot