docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-29 21:41:20 +03:00
Code Activity

Update to Alpine 3.7

Browse Source
This commit is contained in:
Tianon Gravi
2018-04-23 15:06:17 -07:00
parent aeae1436cd
commit c66fc738ed
6 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
9.3/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7
# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@ -60,7 +60,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \

4
9.4/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7
# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \

4
9.5/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7
# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \

4
9.6/alpine/Dockerfile
View File

@ -1,5 +1,5 @@
# vim:set ft=dockerfile:
FROM alpine:3.5
FROM alpine:3.7
# alpine includes "postgres" user/group in base install
# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@ -57,7 +57,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \

2
Dockerfile-alpine.template
View File

@ -58,7 +58,7 @@ RUN set -ex \
# openldap-dev \
openssl-dev \
# configure: error: prove not found
perl \
perl-utils \
# configure: error: Perl module IPC::Run is required to run TAP tests
perl-ipc-run \
# perl-dev \

14
update.sh
View File

@ -16,12 +16,9 @@ declare -A debianSuite=(
[9.6]='jessie'
[10]='stretch'
)
defaultAlpineVersion='3.7'
declare -A alpineVersion=(
[9.3]='3.5'
[9.4]='3.5'
[9.5]='3.5'
[9.6]='3.5'
[10]='3.7'
#[9.6]='3.5'
)
packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
@ -83,13 +80,8 @@ for version in "${versions[@]}"; do
sed -e 's/%%PG_MAJOR%%/'"$version"'/g' \
-e 's/%%PG_VERSION%%/'"$srcVersion"'/g' \
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]}"'/g' \
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]:-$defaultAlpineVersion}"'/g' \
"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
if [ "${alpineVersion[$version]}" != '3.5' ]; then
# prove was moved out of the perl package and into perl-utils in 3.6
# https://pkgs.alpinelinux.org/contents?file=prove&path=&name=&branch=&repo=&arch=x86_64
sed -ri 's/(\s+perl)(\s+)/\1-utils\2/' "$version/$variant/Dockerfile"
fi
if [ "$majorVersion" = '9' ]; then
sed -i -e 's/WALDIR/XLOGDIR/g' \
-e 's/waldir/xlogdir/g' \