Skip to content

Commit a2c19fc

Browse files
committed
Postgres 9.6
1 parent ba7c13f commit a2c19fc

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
all: build
44

5-
IMAGE_NAME:=2017-q2
5+
IMAGE_NAME:=9.6
66

77
build:
88
docker build -t metabrainz/postgres-base:$(IMAGE_NAME) postgres-base/

postgres-base/install_extensions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BUILD_DEPS=" \
1010
libc6-dev \
1111
libicu-dev \
1212
make \
13-
postgresql-server-dev-9.5"
13+
postgresql-server-dev-9.6"
1414

1515
ICU_PKG=$(apt-cache search --names-only '^libicu5[0-9]$' | awk '{print $1}')
1616

postgres-base/install_postgres.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ set -e
44

55
RUN_DEPS=" \
66
locales \
7-
postgresql-9.5 \
8-
postgresql-contrib-9.5 \
9-
postgresql-plperl-9.5 \
7+
postgresql-9.6 \
8+
postgresql-contrib-9.6 \
9+
postgresql-plperl-9.6 \
1010
rsync"
1111

12+
add-apt-repository 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main'
13+
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
1214
apt-get update
1315

1416
apt-get install \
@@ -34,7 +36,7 @@ mkdir -p $PGDATA
3436
chown -R postgres:postgres $PGDATA
3537

3638
chpst -u postgres:postgres \
37-
/usr/lib/postgresql/9.5/bin/initdb \
39+
/usr/lib/postgresql/9.6/bin/initdb \
3840
--data-checksums \
3941
--encoding utf8 \
4042
--no-locale \

postgres-base/run-postgres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
exec chpst -u postgres:postgres \
4-
/usr/lib/postgresql/9.5/bin/postgres \
4+
/usr/lib/postgresql/9.6/bin/postgres \
55
-D /var/lib/postgresql/data \
66
-c config_file=/etc/postgresql/postgresql.conf \
77
-c hba_file=/etc/postgresql/pg_hba.conf

postgres-master/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM metabrainz/postgres-base:2017-q2
1+
FROM metabrainz/postgres-base:9.6
22

33
COPY \
44
consul-template-postgres.conf \

postgres-slave/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM metabrainz/postgres-base:2017-q2
1+
FROM metabrainz/postgres-base:9.6
22

33
# These services should not be started until data is copied from the master.
44
RUN touch \

postgres-slave/pg_restore_command.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ if [ -e "$ARCHIVE_FILE" ]; then
1414
else
1515
# "The command will be asked for file names that are not present in the
1616
# archive; it must return nonzero when so asked."
17-
# https://www.postgresql.org/docs/9.5/static/archive-recovery-settings.html
17+
# https://www.postgresql.org/docs/9.6/static/archive-recovery-settings.html
1818
exit 1
1919
fi

0 commit comments

Comments
 (0)