Merge pull request #436 from infosiftr/alpine3.7

tianon · web-flow · commit 81a7cf454df3 · 2018-04-23T15:38:58.000-07:00
Update to Alpine 3.7
diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile
@@ -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 \
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
@@ -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 \
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
@@ -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 \
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -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 \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -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 \
diff --git a/update.sh b/update.sh
@@ -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' \
