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.

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

Update postgres #8053

Merged
merged 1 commit into from May 22, 2020
Merged

Update postgres #8053

merged 1 commit into from May 22, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented May 21, 2020

Changes:

Changes:

- docker-library/postgres@9c5ca99: Merge pull request docker-library/postgres#736 from simi/13beta1
- docker-library/postgres@682ff83: Add workaround for https://bugs.debian.org/929417 when building 13 from source
- docker-library/postgres@8c3f661: Adjust "update.sh" to work for 13/pre-release builds again
- docker-library/postgres@b966594: Add 13 beta 1.
@github-actions
Copy link

Diff for c88117e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cb90e56..ac4c86c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -50,3 +50,13 @@ Tags: 12.3-alpine, 12-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 4edbda205c684c861e6fbf964de5d00845864d42
 Directory: 12/alpine
+
+Tags: 13-beta1, 13
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 682ff83c5c83f1b6f2b02caf7aa3e17a491b403a
+Directory: 13
+
+Tags: 13-beta1-alpine, 13-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: b96659493b841100dc75ed777bff01913d9fe9e1
+Directory: 13/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 15ca040..cf250b8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -20,5 +20,9 @@ postgres:12
 postgres:12-alpine
 postgres:12.3
 postgres:12.3-alpine
+postgres:13
+postgres:13-alpine
+postgres:13-beta1
+postgres:13-beta1-alpine
 postgres:alpine
 postgres:latest
diff --git a/postgres_alpine/Dockerfile b/postgres_13-alpine/Dockerfile
similarity index 97%
copy from postgres_alpine/Dockerfile
copy to postgres_13-alpine/Dockerfile
index 05487ef..5cc92c0 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_13-alpine/Dockerfile
@@ -17,9 +17,9 @@ ENV LANG en_US.utf8
 
 RUN mkdir /docker-entrypoint-initdb.d
 
-ENV PG_MAJOR 12
-ENV PG_VERSION 12.3
-ENV PG_SHA256 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41
+ENV PG_MAJOR 13
+ENV PG_VERSION 13beta1
+ENV PG_SHA256 249ba0d0227d5393b83d397f2543354bfee579276cb1e821e9b7d904a42039e1
 
 RUN set -ex \
 	\
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_13-alpine/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_13-alpine/docker-entrypoint.sh
diff --git a/postgres_latest/Dockerfile b/postgres_13/Dockerfile
similarity index 97%
copy from postgres_latest/Dockerfile
copy to postgres_13/Dockerfile
index e3f4a7b..5af4325 100644
--- a/postgres_latest/Dockerfile
+++ b/postgres_13/Dockerfile
@@ -82,8 +82,8 @@ RUN set -ex; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list
 
-ENV PG_MAJOR 12
-ENV PG_VERSION 12.3-1.pgdg100+1
+ENV PG_MAJOR 13
+ENV PG_VERSION 13~beta1-1.pgdg100+1
 
 RUN set -ex; \
 	\
@@ -118,6 +118,8 @@ RUN set -ex; \
 			\
 # build .deb files from upstream's source packages (which are verified by apt-get)
 			apt-get update; \
+# we need DEBIAN_FRONTEND on postgresql-13 for slapd ("Please enter the password for the admin entry in your LDAP directory."); see https://bugs.debian.org/929417
+			DEBIAN_FRONTEND=noninteractive \
 			apt-get build-dep -y \
 				postgresql-common pgdg-keyring \
 				"postgresql-$PG_MAJOR=$PG_VERSION" \
diff --git a/postgres_10/docker-entrypoint.sh b/postgres_13/docker-entrypoint.sh
similarity index 100%
copy from postgres_10/docker-entrypoint.sh
copy to postgres_13/docker-entrypoint.sh

@tianon tianon merged commit ef9ff33 into docker-library:master May 22, 2020
@tianon tianon deleted the postgres branch May 22, 2020 00:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants