Merge pull request #210 from infosiftr/alpine3.7

Add 2.3-alpine3.7, remove all Alpine 3.4 variants

Author: yosifkit

.travis.yml

@@ -14,12 +14,11 @@ env:
   - VERSION=2.4 VARIANT=jessie/slim
   - VERSION=2.4 VARIANT=alpine3.7
   - VERSION=2.4 VARIANT=alpine3.6
-  - VERSION=2.4 VARIANT=alpine3.4
   - VERSION=2.3 VARIANT=stretch
   - VERSION=2.3 VARIANT=stretch/slim
   - VERSION=2.3 VARIANT=jessie
   - VERSION=2.3 VARIANT=jessie/slim
-  - VERSION=2.3 VARIANT=alpine3.4
+  - VERSION=2.3 VARIANT=alpine3.7
 
 install:
   - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images

2.3/alpine3.4/Dockerfile renamed to 2.3/alpine3.7/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.7
 
 # skip installing gem documentation
 RUN mkdir -p /usr/local/etc \
@@ -31,8 +31,8 @@ RUN set -ex \
 		glib-dev \
 		libc-dev \
 		libffi-dev \
-		openssl \
-		openssl-dev \
+		libressl \
+		libressl-dev \
 		libxml2-dev \
 		libxslt-dev \
 		linux-headers \
@@ -85,7 +85,7 @@ RUN set -ex \
 		bzip2 \
 		ca-certificates \
 		libffi-dev \
-		openssl-dev \
+		libressl-dev \
 		procps \
 		yaml-dev \
 		zlib-dev \

2.4/alpine3.4/Dockerfile

@@ -7,16 +7,7 @@ declare -A aliases=(
 )
 
 defaultDebianSuite='stretch'
-declare -A debianSuites=(
-	[2.2]='jessie'
-	[2.3]='jessie'
-	[2.4]='jessie'
-)
 defaultAlpineVersion='3.7'
-declare -A alpineVersions=(
-	[2.2]='3.4'
-	[2.3]='3.4'
-)
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -81,12 +72,9 @@ join() {
 }
 
 for version in "${versions[@]}"; do
-	debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
-	alpineVersion="${alpineVersions[$version]:-$defaultAlpineVersion}"
-
 	for v in \
 		{stretch,jessie}{,/slim,/onbuild} \
-		alpine{3.7,3.6,3.4} \
+		alpine{3.7,3.6} \
 	; do
 		dir="$version/$v"
 		variant="$(basename "$v")"
@@ -117,13 +105,13 @@ for version in "${versions[@]}"; do
 
 		variantAliases=( "${versionAliases[@]/%/-$variant}" )
 		case "$variant" in
-			"$debianSuite")
+			"$defaultDebianSuite")
 				variantAliases+=( "${versionAliases[@]}" )
 				;;
-			*-"$debianSuite")
-				variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" )
+			*-"$defaultDebianSuite")
+				variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianSuite}}" )
 				;;
-			"alpine${alpineVersion}")
+			"alpine${defaultAlpineVersion}")
 				variantAliases+=( "${versionAliases[@]/%/-alpine}" )
 				;;
 		esac

generate-stackbrew-library.sh

@@ -66,7 +66,7 @@ for version in "${versions[@]}"; do
 	echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal"
 
 	for v in \
-		alpine{3.4,3.6,3.7} \
+		alpine{3.6,3.7} \
 		{jessie,stretch}{/slim,/onbuild,} \
 	; do
 		dir="$version/$v"
@@ -97,10 +97,6 @@ for version in "${versions[@]}"; do
 			-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
 			"$template" > "$dir/Dockerfile"
 
-		if [ "$variant" = 'alpine3.4' ]; then
-			sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile"
-		fi
-
 		case "$v" in
 			*/onbuild) ;;
 			*)