Skip to content

Update postgres #6011

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
Merged
merged 1 commit into from
Jun 4, 2019
Merged

Update postgres #6011

merged 1 commit into from
Jun 4, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 3, 2019

Changes:

@docker-library-bot
Update postgres
f288dfc 
Changes:

- docker-library/postgres@6274e4c: Merge pull request docker-library/postgres#586 from piotrbrzuska/master
- docker-library/postgres@966d1ba: Update 12+ to buster
- docker-library/postgres@5992d8b: Update "Dockerfile-alpine.template" and apply "update.sh" (after verifying that 12 still builds and works properly without the added "-testing" repository)
- docker-library/postgres@e3d200e: Add 12~beta1 into Travis config
- docker-library/postgres@6f7881a: Add 12~beta1
@yosifkit
Copy link
Member

yosifkit commented Jun 3, 2019

Diff: 
diff --git a/_bashbrew-arches b/_bashbrew-arches
index fa0e23a..5d3f8ab 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -54,6 +54,20 @@ postgres:10-alpine @ arm64v8
 postgres:10-alpine @ i386
 postgres:10-alpine @ ppc64le
 postgres:10-alpine @ s390x
+postgres:12 @ amd64
+postgres:12 @ arm32v5
+postgres:12 @ arm32v7
+postgres:12 @ arm64v8
+postgres:12 @ i386
+postgres:12 @ ppc64le
+postgres:12 @ s390x
+postgres:12-alpine @ amd64
+postgres:12-alpine @ arm32v6
+postgres:12-alpine @ arm32v7
+postgres:12-alpine @ arm64v8
+postgres:12-alpine @ i386
+postgres:12-alpine @ ppc64le
+postgres:12-alpine @ s390x
 postgres:alpine @ amd64
 postgres:alpine @ arm32v6
 postgres:alpine @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 70d7997..be0bdf7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -20,5 +20,9 @@ postgres:11
 postgres:11-alpine
 postgres:11.3
 postgres:11.3-alpine
+postgres:12
+postgres:12-alpine
+postgres:12-beta1
+postgres:12-beta1-alpine
 postgres:alpine
 postgres:latest
diff --git a/postgres_10-alpine/Dockerfile b/postgres_10-alpine/Dockerfile
index 126b1e8..ab42d30 100644
--- a/postgres_10-alpine/Dockerfile
+++ b/postgres_10-alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/postgres_alpine/Dockerfile b/postgres_12-alpine/Dockerfile
similarity index 96%
copy from postgres_alpine/Dockerfile
copy to postgres_12-alpine/Dockerfile
index ffc8614..b01912e 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_12-alpine/Dockerfile
@@ -21,9 +21,9 @@ ENV LANG en_US.utf8
 
 RUN mkdir /docker-entrypoint-initdb.d
 
-ENV PG_MAJOR 11
-ENV PG_VERSION 11.3
-ENV PG_SHA256 2a85e082fc225944821dfd23990e32dfcd2284c19060864b0ad4ca537d30522d
+ENV PG_MAJOR 12
+ENV PG_VERSION 12beta1
+ENV PG_SHA256 203e2d0151d75e3328a6b6b85eae88e50168ae27423b39787cea595365da9fad
 
 RUN set -ex \
 	\
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \
@@ -146,7 +147,6 @@ RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PG
 VOLUME /var/lib/postgresql/data
 
 COPY docker-entrypoint.sh /usr/local/bin/
-RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 5432
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_12-alpine/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_12-alpine/docker-entrypoint.sh
diff --git a/postgres_latest/Dockerfile b/postgres_12/Dockerfile
similarity index 94%
copy from postgres_latest/Dockerfile
copy to postgres_12/Dockerfile
index b81a5f9..57db5f9 100644
--- a/postgres_latest/Dockerfile
+++ b/postgres_12/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -70,8 +70,8 @@ RUN set -ex; \
 	rm -rf "$GNUPGHOME"; \
 	apt-key list
 
-ENV PG_MAJOR 11
-ENV PG_VERSION 11.3-1.pgdg90+1
+ENV PG_MAJOR 12
+ENV PG_VERSION 12~beta1-1.pgdg100+1
 
 RUN set -ex; \
 	\
@@ -82,20 +82,20 @@ RUN set -ex; \
 	case "$dpkgArch" in \
 		amd64|i386|ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			case "$PG_MAJOR" in \
 				9.* | 10 ) ;; \
 				*) \
 # https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
 # TODO remove this once we hit buster+
-					echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
+					echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
 					;; \
 			esac; \
 			\
diff --git a/postgres_10/docker-entrypoint.sh b/postgres_12/docker-entrypoint.sh
similarity index 100%
copy from postgres_10/docker-entrypoint.sh
copy to postgres_12/docker-entrypoint.sh
diff --git a/postgres_9-alpine/Dockerfile b/postgres_9-alpine/Dockerfile
index f6fe91d..6dbf8b8 100644
--- a/postgres_9-alpine/Dockerfile
+++ b/postgres_9-alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/postgres_9.4-alpine/Dockerfile b/postgres_9.4-alpine/Dockerfile
index e2d77a1..ca66a98 100644
--- a/postgres_9.4-alpine/Dockerfile
+++ b/postgres_9.4-alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/postgres_9.5-alpine/Dockerfile b/postgres_9.5-alpine/Dockerfile
index 905d69f..7128018 100644
--- a/postgres_9.5-alpine/Dockerfile
+++ b/postgres_9.5-alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine/Dockerfile
index ffc8614..f792826 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -ex \
 		libedit-dev \
 		libxml2-dev \
 		libxslt-dev \
+		linux-headers \
 		make \
 #		openldap-dev \
 		openssl-dev \

@yosifkit
Copy link
Member

yosifkit commented Jun 4, 2019

Build test of #6011; f288dfc; amd64 (postgres):

$ bashbrew build postgres:12-beta1
Building bashbrew/cache:e703197a9f7f2b420c31f7ff16b3e37efd88544fb78f4dc6f699ead18381ed72 (postgres:12-beta1)
Tagging postgres:12-beta1
Tagging postgres:12

$ test/run.sh postgres:12-beta1
testing postgres:12-beta1
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:12-beta1-alpine
Building bashbrew/cache:ace680c88a30afd170576b2ee3d3502faf68fdfa9b6d362d417c13674262983b (postgres:12-beta1-alpine)
Tagging postgres:12-beta1-alpine
Tagging postgres:12-alpine

$ test/run.sh postgres:12-beta1-alpine
testing postgres:12-beta1-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:11.3
Using bashbrew/cache:387ebc26378073ffd16e08498939a1d5acf95c120a9bac66dfaaee0ca41c05f8 (postgres:11.3)
Tagging postgres:11.3
Tagging postgres:11
Tagging postgres:latest

$ test/run.sh postgres:11.3
testing postgres:11.3
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:11.3-alpine
Building bashbrew/cache:6edd7318b0d17da4eea389541301a759d18f0698136b101b376ac237ce762343 (postgres:11.3-alpine)
Tagging postgres:11.3-alpine
Tagging postgres:11-alpine
Tagging postgres:alpine

$ test/run.sh postgres:11.3-alpine
testing postgres:11.3-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:10.8
Using bashbrew/cache:08e4a298f94894930773b0baef1772eda041570e0dec300805b3e3c48bf075b3 (postgres:10.8)
Tagging postgres:10.8
Tagging postgres:10

$ test/run.sh postgres:10.8
testing postgres:10.8
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:10.8-alpine
Building bashbrew/cache:ff49b9c197c589e465726712a50f982b278ed1e673c9e57e6448a8ee3e701e3d (postgres:10.8-alpine)
Tagging postgres:10.8-alpine
Tagging postgres:10-alpine

$ test/run.sh postgres:10.8-alpine
testing postgres:10.8-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:9.6.13
Using bashbrew/cache:9eccdf92fa591b9c1393bfb465239ef197a7dd1ef513a38acf6352c5281ef83d (postgres:9.6.13)
Tagging postgres:9.6.13
Tagging postgres:9.6
Tagging postgres:9

$ test/run.sh postgres:9.6.13
testing postgres:9.6.13
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6].....passed
	'postgres-initdb' [6/6].....passed


$ bashbrew build postgres:9.6.13-alpine
Building bashbrew/cache:0e4b59ba8a94de1cdc88d261469d9a7e9f71e79a47932ac14999694b77ae7e3b (postgres:9.6.13-alpine)
Tagging postgres:9.6.13-alpine
Tagging postgres:9.6-alpine
Tagging postgres:9-alpine

$ test/run.sh postgres:9.6.13-alpine
testing postgres:9.6.13-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6]....passed


$ bashbrew build postgres:9.5.17
Using bashbrew/cache:8995474065541e46deefe410d40adf0b7d550d0494cc4d36d25229bbf7e7d961 (postgres:9.5.17)
Tagging postgres:9.5.17
Tagging postgres:9.5

$ test/run.sh postgres:9.5.17
testing postgres:9.5.17
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6].....passed
	'postgres-initdb' [6/6].....passed


$ bashbrew build postgres:9.5.17-alpine
Building bashbrew/cache:bac0c281ee5003e5fb5e9518eb6d785cda4603fc358b3f8b357edbd7652be11f (postgres:9.5.17-alpine)
Tagging postgres:9.5.17-alpine
Tagging postgres:9.5-alpine

$ test/run.sh postgres:9.5.17-alpine
testing postgres:9.5.17-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6]....passed
	'postgres-initdb' [6/6].....passed


$ bashbrew build postgres:9.4.22
Using bashbrew/cache:6074d55410beeaf0f58bd06e2d6c305692560133cfa9658ea221993c652cdedb (postgres:9.4.22)
Tagging postgres:9.4.22
Tagging postgres:9.4

$ test/run.sh postgres:9.4.22
testing postgres:9.4.22
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6].....passed
	'postgres-initdb' [6/6].....passed


$ bashbrew build postgres:9.4.22-alpine
Building bashbrew/cache:9809da067389307ba5895935978f20bad6ed5b04f63be69b2fbe92b4b05af8a6 (postgres:9.4.22-alpine)
Tagging postgres:9.4.22-alpine
Tagging postgres:9.4-alpine

$ test/run.sh postgres:9.4.22-alpine
testing postgres:9.4.22-alpine
	'utc' [1/6]...passed
	'cve-2014--shellshock' [2/6]...passed
	'no-hard-coded-passwords' [3/6]...passed
	'override-cmd' [4/6]...passed
	'postgres-basics' [5/6].....passed
	'postgres-initdb' [6/6].....passed

@yosifkit yosifkit merged commit 60058c4 into docker-library:master Jun 4, 2019
@yosifkit yosifkit deleted the postgres branch June 4, 2019 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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