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 #15869

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Update postgres #15869

merged 1 commit into from
Dec 8, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 8, 2023

Changes:

@docker-library-bot
Update postgres
7ea434e 
Changes:

- docker-library/postgres@ef9747f: Merge pull request docker-library/postgres#1160 from Earlopain/alpine3.19
- docker-library/postgres@25f6ba5: Add alpine 3.19
- docker-library/postgres@018d576: Merge pull request docker-library/postgres#1159 from lfittl/use-locale-gen
- docker-library/postgres@a42b684: Debian packages: Add explicit check for locale-gen creating locales
- docker-library/postgres@55e45ba: Debian images: Use locale-gen instead of localdef
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 8, 2023

Diff for 7ea434e: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bd53328..3506a33 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,122 +1,122 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/postgres.git
 
-Tags: 11.22-alpine3.17, 11-alpine3.17
+Tags: 11.22-alpine3.18, 11-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 11/alpine3.17
+Directory: 11/alpine3.18
 
-Tags: 11.22-alpine3.18, 11-alpine3.18, 11.22-alpine, 11-alpine
+Tags: 11.22-alpine3.19, 11-alpine3.19, 11.22-alpine, 11-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 11/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 11/alpine3.19
 
 Tags: 11.22-bookworm, 11-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 11/bookworm
 
 Tags: 11.22-bullseye, 11-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 11/bullseye
 
 Tags: 12.17, 12, 12.17-bookworm, 12-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 12/bookworm
 
-Tags: 12.17-alpine3.17, 12-alpine3.17
+Tags: 12.17-alpine3.18, 12-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 12/alpine3.17
+Directory: 12/alpine3.18
 
-Tags: 12.17-alpine3.18, 12-alpine3.18, 12.17-alpine, 12-alpine
+Tags: 12.17-alpine3.19, 12-alpine3.19, 12.17-alpine, 12-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 12/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 12/alpine3.19
 
 Tags: 12.17-bullseye, 12-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 12/bullseye
 
 Tags: 13.13, 13, 13.13-bookworm, 13-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 13/bookworm
 
-Tags: 13.13-alpine3.17, 13-alpine3.17
+Tags: 13.13-alpine3.18, 13-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 13/alpine3.17
+Directory: 13/alpine3.18
 
-Tags: 13.13-alpine3.18, 13-alpine3.18, 13.13-alpine, 13-alpine
+Tags: 13.13-alpine3.19, 13-alpine3.19, 13.13-alpine, 13-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 13/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 13/alpine3.19
 
 Tags: 13.13-bullseye, 13-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 13/bullseye
 
 Tags: 14.10, 14, 14.10-bookworm, 14-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 14/bookworm
 
-Tags: 14.10-alpine3.17, 14-alpine3.17
+Tags: 14.10-alpine3.18, 14-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 14/alpine3.17
+Directory: 14/alpine3.18
 
-Tags: 14.10-alpine3.18, 14-alpine3.18, 14.10-alpine, 14-alpine
+Tags: 14.10-alpine3.19, 14-alpine3.19, 14.10-alpine, 14-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 14/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 14/alpine3.19
 
 Tags: 14.10-bullseye, 14-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 14/bullseye
 
 Tags: 15.5, 15, 15.5-bookworm, 15-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 15/bookworm
 
-Tags: 15.5-alpine3.17, 15-alpine3.17
+Tags: 15.5-alpine3.18, 15-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 15/alpine3.17
+Directory: 15/alpine3.18
 
-Tags: 15.5-alpine3.18, 15-alpine3.18, 15.5-alpine, 15-alpine
+Tags: 15.5-alpine3.19, 15-alpine3.19, 15.5-alpine, 15-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 15/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 15/alpine3.19
 
 Tags: 15.5-bullseye, 15-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 15/bullseye
 
 Tags: 16.1, 16, latest, 16.1-bookworm, 16-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 16/bookworm
 
-Tags: 16.1-alpine3.17, 16-alpine3.17, alpine3.17
+Tags: 16.1-alpine3.18, 16-alpine3.18, alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 16/alpine3.17
+Directory: 16/alpine3.18
 
-Tags: 16.1-alpine3.18, 16-alpine3.18, alpine3.18, 16.1-alpine, 16-alpine, alpine
+Tags: 16.1-alpine3.19, 16-alpine3.19, alpine3.19, 16.1-alpine, 16-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
-Directory: 16/alpine3.18
+GitCommit: 25f6ba56f915bb41b2e2def0ed3acc5ae5439f44
+Directory: 16/alpine3.19
 
 Tags: 16.1-bullseye, 16-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2468c9d91a2ef4055411e09c42cd054732ebf579
+GitCommit: a42b68455866552c2ad2fc9a8e18d46b50712139
 Directory: 16/bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index 16db0b1..bf8f14b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,76 +1,76 @@
 postgres:11-alpine
-postgres:11-alpine3.17
 postgres:11-alpine3.18
+postgres:11-alpine3.19
 postgres:11-bookworm
 postgres:11-bullseye
 postgres:11.22-alpine
-postgres:11.22-alpine3.17
 postgres:11.22-alpine3.18
+postgres:11.22-alpine3.19
 postgres:11.22-bookworm
 postgres:11.22-bullseye
 postgres:12
 postgres:12-alpine
-postgres:12-alpine3.17
 postgres:12-alpine3.18
+postgres:12-alpine3.19
 postgres:12-bookworm
 postgres:12-bullseye
 postgres:12.17
 postgres:12.17-alpine
-postgres:12.17-alpine3.17
 postgres:12.17-alpine3.18
+postgres:12.17-alpine3.19
 postgres:12.17-bookworm
 postgres:12.17-bullseye
 postgres:13
 postgres:13-alpine
-postgres:13-alpine3.17
 postgres:13-alpine3.18
+postgres:13-alpine3.19
 postgres:13-bookworm
 postgres:13-bullseye
 postgres:13.13
 postgres:13.13-alpine
-postgres:13.13-alpine3.17
 postgres:13.13-alpine3.18
+postgres:13.13-alpine3.19
 postgres:13.13-bookworm
 postgres:13.13-bullseye
 postgres:14
 postgres:14-alpine
-postgres:14-alpine3.17
 postgres:14-alpine3.18
+postgres:14-alpine3.19
 postgres:14-bookworm
 postgres:14-bullseye
 postgres:14.10
 postgres:14.10-alpine
-postgres:14.10-alpine3.17
 postgres:14.10-alpine3.18
+postgres:14.10-alpine3.19
 postgres:14.10-bookworm
 postgres:14.10-bullseye
 postgres:15
 postgres:15-alpine
-postgres:15-alpine3.17
 postgres:15-alpine3.18
+postgres:15-alpine3.19
 postgres:15-bookworm
 postgres:15-bullseye
 postgres:15.5
 postgres:15.5-alpine
-postgres:15.5-alpine3.17
 postgres:15.5-alpine3.18
+postgres:15.5-alpine3.19
 postgres:15.5-bookworm
 postgres:15.5-bullseye
 postgres:16
 postgres:16-alpine
-postgres:16-alpine3.17
 postgres:16-alpine3.18
+postgres:16-alpine3.19
 postgres:16-bookworm
 postgres:16-bullseye
 postgres:16.1
 postgres:16.1-alpine
-postgres:16.1-alpine3.17
 postgres:16.1-alpine3.18
+postgres:16.1-alpine3.19
 postgres:16.1-bookworm
 postgres:16.1-bullseye
 postgres:alpine
-postgres:alpine3.17
 postgres:alpine3.18
+postgres:alpine3.19
 postgres:bookworm
 postgres:bullseye
 postgres:latest
diff --git a/postgres_11-alpine/Dockerfile b/postgres_11-alpine/Dockerfile
index 8e5d701..a76eb7b 100644
--- a/postgres_11-alpine/Dockerfile
+++ b/postgres_11-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -152,7 +152,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"11.22","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"11.22","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_11-alpine3.17/Dockerfile b/postgres_11-alpine3.17/Dockerfile
deleted file mode 100644
index 6675a1c..0000000
diff --git a/postgres_11-alpine/Dockerfile b/postgres_11-alpine3.18/Dockerfile
similarity index 100%
copy from postgres_11-alpine/Dockerfile
copy to postgres_11-alpine3.18/Dockerfile
diff --git a/postgres_11-alpine3.17/docker-entrypoint.sh b/postgres_11-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_11-alpine3.17/docker-entrypoint.sh
rename to postgres_11-alpine3.18/docker-entrypoint.sh
diff --git a/postgres_11-bookworm/Dockerfile b/postgres_11-bookworm/Dockerfile
index 69f863b..4406b7a 100644
--- a/postgres_11-bookworm/Dockerfile
+++ b/postgres_11-bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_11-bullseye/Dockerfile b/postgres_11-bullseye/Dockerfile
index f7bb865..ce3e8bb 100644
--- a/postgres_11-bullseye/Dockerfile
+++ b/postgres_11-bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine/Dockerfile
index fde4049..6f3347c 100644
--- a/postgres_12-alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -152,7 +152,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"12.17","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"12.17","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_12-alpine3.17/Dockerfile b/postgres_12-alpine3.17/Dockerfile
deleted file mode 100644
index f7f9284..0000000
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine3.18/Dockerfile
similarity index 100%
copy from postgres_12-alpine/Dockerfile
copy to postgres_12-alpine3.18/Dockerfile
diff --git a/postgres_12-alpine3.17/docker-entrypoint.sh b/postgres_12-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_12-alpine3.17/docker-entrypoint.sh
rename to postgres_12-alpine3.18/docker-entrypoint.sh
diff --git a/postgres_12-bookworm/Dockerfile b/postgres_12-bookworm/Dockerfile
index 4203c22..165a966 100644
--- a/postgres_12-bookworm/Dockerfile
+++ b/postgres_12-bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_12-bullseye/Dockerfile b/postgres_12-bullseye/Dockerfile
index ad25a55..6a6dd9e 100644
--- a/postgres_12-bullseye/Dockerfile
+++ b/postgres_12-bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine/Dockerfile
index cd9936c..e82d1b9 100644
--- a/postgres_13-alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -152,7 +152,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"13.13","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"13.13","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_13-alpine3.17/Dockerfile b/postgres_13-alpine3.17/Dockerfile
deleted file mode 100644
index ab7ceab..0000000
diff --git a/postgres_13-alpine/Dockerfile b/postgres_13-alpine3.18/Dockerfile
similarity index 100%
copy from postgres_13-alpine/Dockerfile
copy to postgres_13-alpine3.18/Dockerfile
diff --git a/postgres_13-alpine3.17/docker-entrypoint.sh b/postgres_13-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_13-alpine3.17/docker-entrypoint.sh
rename to postgres_13-alpine3.18/docker-entrypoint.sh
diff --git a/postgres_13-bookworm/Dockerfile b/postgres_13-bookworm/Dockerfile
index 9b1dab9..d97ed42 100644
--- a/postgres_13-bookworm/Dockerfile
+++ b/postgres_13-bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_13-bullseye/Dockerfile b/postgres_13-bullseye/Dockerfile
index be787cf..d88766f 100644
--- a/postgres_13-bullseye/Dockerfile
+++ b/postgres_13-bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine/Dockerfile
index 9856dcc..20ac720 100644
--- a/postgres_14-alpine/Dockerfile
+++ b/postgres_14-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -155,7 +155,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"14.10","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"14.10","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_14-alpine3.17/Dockerfile b/postgres_14-alpine3.17/Dockerfile
deleted file mode 100644
index 4283c5f..0000000
diff --git a/postgres_14-alpine/Dockerfile b/postgres_14-alpine3.18/Dockerfile
similarity index 100%
copy from postgres_14-alpine/Dockerfile
copy to postgres_14-alpine3.18/Dockerfile
diff --git a/postgres_14-alpine3.17/docker-entrypoint.sh b/postgres_14-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_14-alpine3.17/docker-entrypoint.sh
rename to postgres_14-alpine3.18/docker-entrypoint.sh
diff --git a/postgres_14-bookworm/Dockerfile b/postgres_14-bookworm/Dockerfile
index 36a84c8..e99b242 100644
--- a/postgres_14-bookworm/Dockerfile
+++ b/postgres_14-bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_14-bullseye/Dockerfile b/postgres_14-bullseye/Dockerfile
index 798ca63..d8d3461 100644
--- a/postgres_14-bullseye/Dockerfile
+++ b/postgres_14-bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine/Dockerfile
index 8fda3e0..d419a42 100644
--- a/postgres_15-alpine/Dockerfile
+++ b/postgres_15-alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -158,7 +158,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"15.5","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"15.5","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_15-alpine3.17/Dockerfile b/postgres_15-alpine3.17/Dockerfile
deleted file mode 100644
index 324f745..0000000
diff --git a/postgres_15-alpine/Dockerfile b/postgres_15-alpine3.18/Dockerfile
similarity index 100%
copy from postgres_15-alpine/Dockerfile
copy to postgres_15-alpine3.18/Dockerfile
diff --git a/postgres_15-alpine3.17/docker-entrypoint.sh b/postgres_15-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_15-alpine3.17/docker-entrypoint.sh
rename to postgres_15-alpine3.18/docker-entrypoint.sh
diff --git a/postgres_15-bookworm/Dockerfile b/postgres_15-bookworm/Dockerfile
index 3f9eff6..e51062e 100644
--- a/postgres_15-bookworm/Dockerfile
+++ b/postgres_15-bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_15-bullseye/Dockerfile b/postgres_15-bullseye/Dockerfile
index f93842e..2bde901 100644
--- a/postgres_15-bullseye/Dockerfile
+++ b/postgres_15-bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index c93ecdb..0f98b44 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 # 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
@@ -157,7 +157,7 @@ RUN set -eux; \
 		/usr/local/share/doc \
 		/usr/local/share/man \
 	; \
-	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"16.1","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.18"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
+	echo '{"spdxVersion":"SPDX-2.3","SPDXID":"SPDXRef-DOCUMENT","name":"postgres-sbom","packages":[{"name":"postgres","versionInfo":"16.1","SPDXID":"SPDXRef-Package--postgres","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:generic/[email protected]?os_name=alpine&os_version=3.19"}],"licenseDeclared":"PostgreSQL"}]}' > /usr/local/postgres.spdx.json \
 	; \
 	postgres --version
 
diff --git a/postgres_alpine3.17/Dockerfile b/postgres_alpine3.17/Dockerfile
deleted file mode 100644
index ef93501..0000000
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine3.18/Dockerfile
similarity index 100%
copy from postgres_alpine/Dockerfile
copy to postgres_alpine3.18/Dockerfile
diff --git a/postgres_alpine3.17/docker-entrypoint.sh b/postgres_alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from postgres_alpine3.17/docker-entrypoint.sh
rename to postgres_alpine3.18/docker-entrypoint.sh
diff --git a/postgres_bookworm/Dockerfile b/postgres_bookworm/Dockerfile
index 55e6934..684c6ee 100644
--- a/postgres_bookworm/Dockerfile
+++ b/postgres_bookworm/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \
diff --git a/postgres_bullseye/Dockerfile b/postgres_bullseye/Dockerfile
index 3d650c2..ecc31fc 100644
--- a/postgres_bullseye/Dockerfile
+++ b/postgres_bullseye/Dockerfile
@@ -55,7 +55,9 @@ RUN set -eux; \
 		! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \
 	fi; \
 	apt-get update; apt-get install -y --no-install-recommends locales; rm -rf /var/lib/apt/lists/*; \
-	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+	echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen; \
+	locale-gen; \
+	locale -a | grep 'en_US.utf8'
 ENV LANG en_US.utf8
 
 RUN set -eux; \

Relevant Maintainers:

@yosifkit yosifkit merged commit e048233 into docker-library:master Dec 8, 2023
29 checks passed
@yosifkit yosifkit deleted the postgres branch December 8, 2023 21:11
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