Add alpine version aliases to postgres #10523
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also, a temporary one-time backfill of `alpine3.13` aliases.
Diff for 737fb49:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 445369e..9e4b0c1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,65 +3,90 @@ GitRepo: https://github.com/docker-library/postgres.git
Tags: 9.6.22, 9.6, 9, 9.6.22-stretch, 9.6-stretch, 9-stretch
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 9.6/stretch
-Tags: 9.6.22-alpine, 9.6-alpine, 9-alpine
+Tags: 9.6.22-alpine, 9.6-alpine, 9-alpine, 9.6.22-alpine3.14, 9.6-alpine3.14, 9-alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
Directory: 9.6/alpine
+Tags: 9.6.22-alpine3.13, 9.6-alpine3.13, 9-alpine3.13
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4a82bbde194ff4d32e90629b0a50b9398d374c12
+Directory: 9.6/alpine
+
Tags: 9.6.22-buster, 9.6-buster, 9-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 9.6/buster
Tags: 10.17, 10, 10.17-stretch, 10-stretch
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 10/stretch
-Tags: 10.17-alpine, 10-alpine
+Tags: 10.17-alpine, 10-alpine, 10.17-alpine3.14, 10-alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
Directory: 10/alpine
+Tags: 10.17-alpine3.13, 10-alpine3.13
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4a82bbde194ff4d32e90629b0a50b9398d374c12
+Directory: 10/alpine
+
Tags: 10.17-buster, 10-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 10/buster
Tags: 11.12, 11, 11.12-stretch, 11-stretch
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 11/stretch
-Tags: 11.12-alpine, 11-alpine
+Tags: 11.12-alpine, 11-alpine, 11.12-alpine3.14, 11-alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
Directory: 11/alpine
+Tags: 11.12-alpine3.13, 11-alpine3.13
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4a82bbde194ff4d32e90629b0a50b9398d374c12
+Directory: 11/alpine
+
Tags: 11.12-buster, 11-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 11/buster
Tags: 12.7, 12, 12.7-buster, 12-buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 12/buster
-Tags: 12.7-alpine, 12-alpine
+Tags: 12.7-alpine, 12-alpine, 12.7-alpine3.14, 12-alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
Directory: 12/alpine
+Tags: 12.7-alpine3.13, 12-alpine3.13
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4a82bbde194ff4d32e90629b0a50b9398d374c12
+Directory: 12/alpine
+
Tags: 13.3, 13, latest, 13.3-buster, 13-buster, buster
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
+GitCommit: 5c0e796bb660f0ae42ae8bf084470f13417b8d63
Directory: 13/buster
-Tags: 13.3-alpine, 13-alpine, alpine
+Tags: 13.3-alpine, 13-alpine, alpine, 13.3-alpine3.14, 13-alpine3.14, alpine3.14
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 517c64f87e6661366b415df3f2273c76cea428b0
Directory: 13/alpine
+
+Tags: 13.3-alpine3.13, 13-alpine3.13, alpine3.13
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 4a82bbde194ff4d32e90629b0a50b9398d374c12
+Directory: 13/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index ddc95ac..bb9ce7e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,43 +1,67 @@
postgres:9
postgres:9-alpine
+postgres:9-alpine3.13
+postgres:9-alpine3.14
postgres:9-buster
postgres:9-stretch
postgres:9.6
postgres:9.6-alpine
+postgres:9.6-alpine3.13
+postgres:9.6-alpine3.14
postgres:9.6-buster
postgres:9.6-stretch
postgres:9.6.22
postgres:9.6.22-alpine
+postgres:9.6.22-alpine3.13
+postgres:9.6.22-alpine3.14
postgres:9.6.22-buster
postgres:9.6.22-stretch
postgres:10
postgres:10-alpine
+postgres:10-alpine3.13
+postgres:10-alpine3.14
postgres:10-buster
postgres:10-stretch
postgres:10.17
postgres:10.17-alpine
+postgres:10.17-alpine3.13
+postgres:10.17-alpine3.14
postgres:10.17-buster
postgres:10.17-stretch
postgres:11
postgres:11-alpine
+postgres:11-alpine3.13
+postgres:11-alpine3.14
postgres:11-buster
postgres:11-stretch
postgres:11.12
postgres:11.12-alpine
+postgres:11.12-alpine3.13
+postgres:11.12-alpine3.14
postgres:11.12-buster
postgres:11.12-stretch
postgres:12
postgres:12-alpine
+postgres:12-alpine3.13
+postgres:12-alpine3.14
postgres:12-buster
postgres:12.7
postgres:12.7-alpine
+postgres:12.7-alpine3.13
+postgres:12.7-alpine3.14
postgres:12.7-buster
postgres:13
postgres:13-alpine
+postgres:13-alpine3.13
+postgres:13-alpine3.14
postgres:13-buster
postgres:13.3
postgres:13.3-alpine
+postgres:13.3-alpine3.13
+postgres:13.3-alpine3.14
postgres:13.3-buster
postgres:alpine
+postgres:alpine3.13
+postgres:alpine3.14
postgres:buster
postgres:latest
diff --git a/postgres_10-alpine/Dockerfile b/postgres_10-alpine3.13/Dockerfile
similarity index 92%
copy from postgres_10-alpine/Dockerfile
copy to postgres_10-alpine3.13/Dockerfile
index 8131b4a..ba63018 100644
--- a/postgres_10-alpine/Dockerfile
+++ b/postgres_10-alpine3.13/Dockerfile
@@ -1,10 +1,5 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.14
+# vim:set ft=dockerfile:
+FROM alpine:3.13
# 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
@@ -64,7 +59,6 @@ RUN set -eux; \
# tcl-dev \
util-linux-dev \
zlib-dev \
-# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \
; \
\
@@ -140,10 +134,7 @@ RUN set -eux; \
postgres --version
# make the sample config easier to munge (and "correct by default")
-RUN set -eux; \
- cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \
- sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample; \
- grep -F "listen_addresses = '*'" /usr/local/share/postgresql/postgresql.conf.sample
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_10-alpine3.13/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_10-alpine3.13/docker-entrypoint.sh
diff --git a/postgres_10-alpine/Dockerfile b/postgres_10-alpine3.14/Dockerfile
similarity index 100%
rename from postgres_10-alpine/Dockerfile
rename to postgres_10-alpine3.14/Dockerfile
diff --git a/postgres_11-alpine/docker-entrypoint.sh b/postgres_10-alpine3.14/docker-entrypoint.sh
similarity index 100%
rename from postgres_11-alpine/docker-entrypoint.sh
rename to postgres_10-alpine3.14/docker-entrypoint.sh
diff --git a/postgres_10-buster/Dockerfile b/postgres_10-buster/Dockerfile
index 795143f..965fdce 100644
--- a/postgres_10-buster/Dockerfile
+++ b/postgres_10-buster/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_10-stretch/Dockerfile b/postgres_10-stretch/Dockerfile
index 2b7eb9c..d757fc9 100644
--- a/postgres_10-stretch/Dockerfile
+++ b/postgres_10-stretch/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_11-alpine/Dockerfile b/postgres_11-alpine3.13/Dockerfile
similarity index 92%
copy from postgres_11-alpine/Dockerfile
copy to postgres_11-alpine3.13/Dockerfile
index acf676c..934d9b9 100644
--- a/postgres_11-alpine/Dockerfile
+++ b/postgres_11-alpine3.13/Dockerfile
@@ -1,10 +1,5 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.14
+# vim:set ft=dockerfile:
+FROM alpine:3.13
# 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
@@ -51,7 +46,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm11-dev clang g++ \
+ llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \
@@ -65,7 +60,6 @@ RUN set -eux; \
# tcl-dev \
util-linux-dev \
zlib-dev \
-# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \
; \
\
@@ -142,10 +136,7 @@ RUN set -eux; \
postgres --version
# make the sample config easier to munge (and "correct by default")
-RUN set -eux; \
- cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \
- sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample; \
- grep -F "listen_addresses = '*'" /usr/local/share/postgresql/postgresql.conf.sample
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
@@ -155,6 +146,7 @@ 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"]
# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
diff --git a/postgres_12-alpine/docker-entrypoint.sh b/postgres_11-alpine3.13/docker-entrypoint.sh
similarity index 100%
rename from postgres_12-alpine/docker-entrypoint.sh
rename to postgres_11-alpine3.13/docker-entrypoint.sh
diff --git a/postgres_11-alpine/Dockerfile b/postgres_11-alpine3.14/Dockerfile
similarity index 100%
rename from postgres_11-alpine/Dockerfile
rename to postgres_11-alpine3.14/Dockerfile
diff --git a/postgres_alpine/docker-entrypoint.sh b/postgres_11-alpine3.14/docker-entrypoint.sh
similarity index 100%
rename from postgres_alpine/docker-entrypoint.sh
rename to postgres_11-alpine3.14/docker-entrypoint.sh
diff --git a/postgres_11-buster/Dockerfile b/postgres_11-buster/Dockerfile
index 527456c..5c8dd5e 100644
--- a/postgres_11-buster/Dockerfile
+++ b/postgres_11-buster/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_11-stretch/Dockerfile b/postgres_11-stretch/Dockerfile
index a3f4610..da1b9e5 100644
--- a/postgres_11-stretch/Dockerfile
+++ b/postgres_11-stretch/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_9-alpine/Dockerfile b/postgres_12-alpine3.13/Dockerfile
similarity index 90%
copy from postgres_9-alpine/Dockerfile
copy to postgres_12-alpine3.13/Dockerfile
index 187747a..28c6839 100644
--- a/postgres_9-alpine/Dockerfile
+++ b/postgres_12-alpine3.13/Dockerfile
@@ -1,10 +1,5 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.14
+# vim:set ft=dockerfile:
+FROM alpine:3.13
# 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
@@ -22,9 +17,9 @@ ENV LANG en_US.utf8
RUN mkdir /docker-entrypoint-initdb.d
-ENV PG_MAJOR 9.6
-ENV PG_VERSION 9.6.22
-ENV PG_SHA256 3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930
+ENV PG_MAJOR 12
+ENV PG_VERSION 12.6
+ENV PG_SHA256 df7dd98d5ccaf1f693c7e1d0d084e9fed7017ee248bba5be0167c42ad2d70a09
RUN set -eux; \
\
@@ -51,6 +46,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
+ llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \
@@ -64,6 +60,7 @@ RUN set -eux; \
# tcl-dev \
util-linux-dev \
zlib-dev \
+ icu-dev \
; \
\
cd /usr/src/postgresql; \
@@ -107,6 +104,8 @@ RUN set -eux; \
--with-openssl \
--with-libxml \
--with-libxslt \
+ --with-icu \
+ --with-llvm \
; \
make -j "$(nproc)" world; \
make install-world; \
@@ -137,10 +136,7 @@ RUN set -eux; \
postgres --version
# make the sample config easier to munge (and "correct by default")
-RUN set -eux; \
- cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \
- sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample; \
- grep -F "listen_addresses = '*'" /usr/local/share/postgresql/postgresql.conf.sample
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
@@ -150,7 +146,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"]
# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_12-alpine3.13/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_12-alpine3.13/docker-entrypoint.sh
diff --git a/postgres_12-alpine/Dockerfile b/postgres_12-alpine3.14/Dockerfile
similarity index 100%
rename from postgres_12-alpine/Dockerfile
rename to postgres_12-alpine3.14/Dockerfile
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_12-alpine3.14/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_12-alpine3.14/docker-entrypoint.sh
diff --git a/postgres_12-buster/Dockerfile b/postgres_12-buster/Dockerfile
index 6dafa8a..bebaf22 100644
--- a/postgres_12-buster/Dockerfile
+++ b/postgres_12-buster/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_9-alpine/Dockerfile b/postgres_9-alpine3.13/Dockerfile
similarity index 93%
copy from postgres_9-alpine/Dockerfile
copy to postgres_9-alpine3.13/Dockerfile
index 187747a..9aaeb22 100644
--- a/postgres_9-alpine/Dockerfile
+++ b/postgres_9-alpine3.13/Dockerfile
@@ -1,10 +1,5 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.14
+# vim:set ft=dockerfile:
+FROM alpine:3.13
# 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
@@ -137,10 +132,7 @@ RUN set -eux; \
postgres --version
# make the sample config easier to munge (and "correct by default")
-RUN set -eux; \
- cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \
- sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample; \
- grep -F "listen_addresses = '*'" /usr/local/share/postgresql/postgresql.conf.sample
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
diff --git a/postgres_9-alpine/docker-entrypoint.sh b/postgres_9-alpine3.13/docker-entrypoint.sh
similarity index 100%
copy from postgres_9-alpine/docker-entrypoint.sh
copy to postgres_9-alpine3.13/docker-entrypoint.sh
diff --git a/postgres_9-alpine/Dockerfile b/postgres_9-alpine3.14/Dockerfile
similarity index 100%
rename from postgres_9-alpine/Dockerfile
rename to postgres_9-alpine3.14/Dockerfile
diff --git a/postgres_9-alpine/docker-entrypoint.sh b/postgres_9-alpine3.14/docker-entrypoint.sh
similarity index 100%
rename from postgres_9-alpine/docker-entrypoint.sh
rename to postgres_9-alpine3.14/docker-entrypoint.sh
diff --git a/postgres_9-buster/Dockerfile b/postgres_9-buster/Dockerfile
index 5c7a42f..e83eb2f 100644
--- a/postgres_9-buster/Dockerfile
+++ b/postgres_9-buster/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_9-stretch/Dockerfile b/postgres_9-stretch/Dockerfile
index ddd03bb..0cf9384 100644
--- a/postgres_9-stretch/Dockerfile
+++ b/postgres_9-stretch/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine3.13/Dockerfile
similarity index 92%
copy from postgres_alpine/Dockerfile
copy to postgres_alpine3.13/Dockerfile
index 2148b06..dfed309 100644
--- a/postgres_alpine/Dockerfile
+++ b/postgres_alpine3.13/Dockerfile
@@ -1,10 +1,5 @@
-#
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
-#
-# PLEASE DO NOT EDIT IT DIRECTLY.
-#
-
-FROM alpine:3.14
+# vim:set ft=dockerfile:
+FROM alpine:3.13
# 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
@@ -51,7 +46,7 @@ RUN set -eux; \
libxml2-dev \
libxslt-dev \
linux-headers \
- llvm11-dev clang g++ \
+ llvm10-dev clang g++ \
make \
# openldap-dev \
openssl-dev \
@@ -65,7 +60,6 @@ RUN set -eux; \
# tcl-dev \
util-linux-dev \
zlib-dev \
-# https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13
icu-dev \
; \
\
@@ -142,10 +136,7 @@ RUN set -eux; \
postgres --version
# make the sample config easier to munge (and "correct by default")
-RUN set -eux; \
- cp -v /usr/local/share/postgresql/postgresql.conf.sample /usr/local/share/postgresql/postgresql.conf.sample.orig; \
- sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample; \
- grep -F "listen_addresses = '*'" /usr/local/share/postgresql/postgresql.conf.sample
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_alpine3.13/docker-entrypoint.sh
similarity index 100%
copy from postgres_10-alpine/docker-entrypoint.sh
copy to postgres_alpine3.13/docker-entrypoint.sh
diff --git a/postgres_alpine/Dockerfile b/postgres_alpine3.14/Dockerfile
similarity index 100%
rename from postgres_alpine/Dockerfile
rename to postgres_alpine3.14/Dockerfile
diff --git a/postgres_10-alpine/docker-entrypoint.sh b/postgres_alpine3.14/docker-entrypoint.sh
similarity index 100%
rename from postgres_10-alpine/docker-entrypoint.sh
rename to postgres_alpine3.14/docker-entrypoint.sh
diff --git a/postgres_buster/Dockerfile b/postgres_buster/Dockerfile
index 6ce45fa..98e3048 100644
--- a/postgres_buster/Dockerfile
+++ b/postgres_buster/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex; \
# uid PostgreSQL Debian Repository
key='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8'; \
export GNUPGHOME="$(mktemp -d)"; \
- gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
gpg --batch --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
command -v gpgconf > /dev/null && gpgconf --kill all; \
rm -rf "$GNUPGHOME"; \
|
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also, a temporary one-time backfill of
alpine3.13aliases.