File tree Expand file tree Collapse file tree 6 files changed +12
-20
lines changed Expand file tree Collapse file tree 6 files changed +12
-20
lines changed Original file line number Diff line number Diff line change 11# vim:set ft=dockerfile:
2- FROM alpine:3.5
2+ FROM alpine:3.7
33
44# alpine includes "postgres" user/group in base install
55# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@@ -60,7 +60,7 @@ RUN set -ex \
6060# openldap-dev \
6161 openssl-dev \
6262# configure: error: prove not found
63- perl \
63+ perl-utils \
6464# configure: error: Perl module IPC::Run is required to run TAP tests
6565 perl-ipc-run \
6666# perl-dev \
Original file line number Diff line number Diff line change 11# vim:set ft=dockerfile:
2- FROM alpine:3.5
2+ FROM alpine:3.7
33
44# alpine includes "postgres" user/group in base install
55# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@@ -57,7 +57,7 @@ RUN set -ex \
5757# openldap-dev \
5858 openssl-dev \
5959# configure: error: prove not found
60- perl \
60+ perl-utils \
6161# configure: error: Perl module IPC::Run is required to run TAP tests
6262 perl-ipc-run \
6363# perl-dev \
Original file line number Diff line number Diff line change 11# vim:set ft=dockerfile:
2- FROM alpine:3.5
2+ FROM alpine:3.7
33
44# alpine includes "postgres" user/group in base install
55# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@@ -57,7 +57,7 @@ RUN set -ex \
5757# openldap-dev \
5858 openssl-dev \
5959# configure: error: prove not found
60- perl \
60+ perl-utils \
6161# configure: error: Perl module IPC::Run is required to run TAP tests
6262 perl-ipc-run \
6363# perl-dev \
Original file line number Diff line number Diff line change 11# vim:set ft=dockerfile:
2- FROM alpine:3.5
2+ FROM alpine:3.7
33
44# alpine includes "postgres" user/group in base install
55# /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh
@@ -57,7 +57,7 @@ RUN set -ex \
5757# openldap-dev \
5858 openssl-dev \
5959# configure: error: prove not found
60- perl \
60+ perl-utils \
6161# configure: error: Perl module IPC::Run is required to run TAP tests
6262 perl-ipc-run \
6363# perl-dev \
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ RUN set -ex \
5858# openldap-dev \
5959 openssl-dev \
6060# configure: error: prove not found
61- perl \
61+ perl-utils \
6262# configure: error: Perl module IPC::Run is required to run TAP tests
6363 perl-ipc-run \
6464# perl-dev \
Original file line number Diff line number Diff line change @@ -16,12 +16,9 @@ declare -A debianSuite=(
1616 [9.6]=' jessie'
1717 [10]=' stretch'
1818)
19+ defaultAlpineVersion=' 3.7'
1920declare -A alpineVersion=(
20- [9.3]=' 3.5'
21- [9.4]=' 3.5'
22- [9.5]=' 3.5'
23- [9.6]=' 3.5'
24- [10]=' 3.7'
21+ # [9.6]='3.5'
2522)
2623
2724packagesBase=' http://apt.postgresql.org/pub/repos/apt/dists/'
@@ -83,13 +80,8 @@ for version in "${versions[@]}"; do
8380 sed -e ' s/%%PG_MAJOR%%/' " $version " ' /g' \
8481 -e ' s/%%PG_VERSION%%/' " $srcVersion " ' /g' \
8582 -e ' s/%%PG_SHA256%%/' " $srcSha256 " ' /g' \
86- -e ' s/%%ALPINE-VERSION%%/' " ${alpineVersion[$version]} " ' /g' \
83+ -e ' s/%%ALPINE-VERSION%%/' " ${alpineVersion[$version]:- $defaultAlpineVersion } " ' /g' \
8784 " Dockerfile-$variant .template" > " $version /$variant /Dockerfile"
88- if [ " ${alpineVersion[$version]} " != ' 3.5' ]; then
89- # prove was moved out of the perl package and into perl-utils in 3.6
90- # https://pkgs.alpinelinux.org/contents?file=prove&path=&name=&branch=&repo=&arch=x86_64
91- sed -ri ' s/(\s+perl)(\s+)/\1-utils\2/' " $version /$variant /Dockerfile"
92- fi
9385 if [ " $majorVersion " = ' 9' ]; then
9486 sed -i -e ' s/WALDIR/XLOGDIR/g' \
9587 -e ' s/waldir/xlogdir/g' \
You can’t perform that action at this time.
0 commit comments