Skip to content

Commit 966d1ba

Browse files
committed
Update 12+ to buster
This is an initial attempt to get ahead of #582 at least for newer PostgreSQL releases.
1 parent 5992d8b commit 966d1ba

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Diff for: 12/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# vim:set ft=dockerfile:
2-
FROM debian:stretch-slim
2+
FROM debian:buster-slim
33

44
RUN set -ex; \
55
if ! command -v gpg > /dev/null; then \
@@ -71,7 +71,7 @@ RUN set -ex; \
7171
apt-key list
7272

7373
ENV PG_MAJOR 12
74-
ENV PG_VERSION 12~beta1-1.pgdg90+1
74+
ENV PG_VERSION 12~beta1-1.pgdg100+1
7575

7676
RUN set -ex; \
7777
\
@@ -82,20 +82,20 @@ RUN set -ex; \
8282
case "$dpkgArch" in \
8383
amd64|i386|ppc64el) \
8484
# arches officialy built by upstream
85-
echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
85+
echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
8686
apt-get update; \
8787
;; \
8888
*) \
8989
# we're on an architecture upstream doesn't officially build for
9090
# let's build binaries from their published source packages
91-
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
91+
echo "deb-src http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
9292
\
9393
case "$PG_MAJOR" in \
9494
9.* | 10 ) ;; \
9595
*) \
9696
# https://github.com/docker-library/postgres/issues/484 (clang-6.0 required, only available in stretch-backports)
9797
# TODO remove this once we hit buster+
98-
echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
98+
echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list.d/pgdg.list; \
9999
;; \
100100
esac; \
101101
\

Diff for: update.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ versions=( "${versions[@]%/}" )
1212
# sort version numbers with highest last (so it goes first in .travis.yml)
1313
IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS
1414

15-
defaultDebianSuite='stretch-slim'
15+
defaultDebianSuite='buster-slim'
1616
declare -A debianSuite=(
17-
#[9.6]='jessie'
17+
# https://github.com/docker-library/postgres/issues/582
18+
[9.4]='stretch-slim'
19+
[9.5]='stretch-slim'
20+
[9.6]='stretch-slim'
21+
[10]='stretch-slim'
22+
[11]='stretch-slim'
1823
)
1924
defaultAlpineVersion='3.9'
2025
declare -A alpineVersion=(

0 commit comments

Comments
 (0)