Hide the slim from the folder; reflect order preference from generate to update and travis

.travis.yml

@@ -2,34 +2,34 @@ language: bash
 services: docker
 
 env:
+  - VERSION=7.2-rc VARIANT=stretch/cli
+  - VERSION=7.2-rc VARIANT=stretch/apache
+  - VERSION=7.2-rc VARIANT=stretch/fpm
+  - VERSION=7.2-rc VARIANT=stretch/zts
   - VERSION=7.2-rc VARIANT=alpine3.6/cli
   - VERSION=7.2-rc VARIANT=alpine3.6/fpm
   - VERSION=7.2-rc VARIANT=alpine3.6/zts
-  - VERSION=7.2-rc VARIANT=stretch-slim/apache
-  - VERSION=7.2-rc VARIANT=stretch-slim/cli
-  - VERSION=7.2-rc VARIANT=stretch-slim/fpm
-  - VERSION=7.2-rc VARIANT=stretch-slim/zts
+  - VERSION=7.1 VARIANT=jessie/cli
+  - VERSION=7.1 VARIANT=jessie/apache
+  - VERSION=7.1 VARIANT=jessie/fpm
+  - VERSION=7.1 VARIANT=jessie/zts
   - VERSION=7.1 VARIANT=alpine3.4/cli
   - VERSION=7.1 VARIANT=alpine3.4/fpm
   - VERSION=7.1 VARIANT=alpine3.4/zts
-  - VERSION=7.1 VARIANT=jessie/apache
-  - VERSION=7.1 VARIANT=jessie/cli
-  - VERSION=7.1 VARIANT=jessie/fpm
-  - VERSION=7.1 VARIANT=jessie/zts
+  - VERSION=7.0 VARIANT=jessie/cli
+  - VERSION=7.0 VARIANT=jessie/apache
+  - VERSION=7.0 VARIANT=jessie/fpm
+  - VERSION=7.0 VARIANT=jessie/zts
   - VERSION=7.0 VARIANT=alpine3.4/cli
   - VERSION=7.0 VARIANT=alpine3.4/fpm
   - VERSION=7.0 VARIANT=alpine3.4/zts
-  - VERSION=7.0 VARIANT=jessie/apache
-  - VERSION=7.0 VARIANT=jessie/cli
-  - VERSION=7.0 VARIANT=jessie/fpm
-  - VERSION=7.0 VARIANT=jessie/zts
+  - VERSION=5.6 VARIANT=jessie/cli
+  - VERSION=5.6 VARIANT=jessie/apache
+  - VERSION=5.6 VARIANT=jessie/fpm
+  - VERSION=5.6 VARIANT=jessie/zts
   - VERSION=5.6 VARIANT=alpine3.4/cli
   - VERSION=5.6 VARIANT=alpine3.4/fpm
   - VERSION=5.6 VARIANT=alpine3.4/zts
-  - VERSION=5.6 VARIANT=jessie/apache
-  - VERSION=5.6 VARIANT=jessie/cli
-  - VERSION=5.6 VARIANT=jessie/fpm
-  - VERSION=5.6 VARIANT=jessie/zts
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

generate-stackbrew-library.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-defaultDebianSuite='stretch-slim'
+defaultDebianSuite='stretch'
 declare -A debianSuite=(
 	[5.6]='jessie'
 	[7.0]='jessie'
@@ -91,7 +91,7 @@ for version in "${versions[@]}"; do
 
 	# order here controls the order of the library/ file
 	for suite in \
-		stretch-slim \
+		stretch \
 		jessie \
 		alpine3.6 \
 		alpine3.4 \
@@ -116,13 +116,14 @@ for version in "${versions[@]}"; do
 			if [ "$variant" = 'cli' ]; then
 				variantAliases+=( "${baseAliases[@]}" )
 			fi
-			if [ "$suite" = "$versionSuite" ]; then
-				variantAliases=( "${variantAliases[@]/%/-${suite%-slim}}" "${variantAliases[@]}" )
-			elif [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then
-				variantAliases=( "${variantAliases[@]/%/-$suite}" "${variantAliases[@]/%/-alpine}" )
-			else
-				variantAliases=( "${variantAliases[@]/%/-$suite}" )
+
+			suiteVariantAliases=( "${variantAliases[@]/%/-$suite}" )
+			if [ "${suite#alpine}" = "${alpineVersion[$version]:-$defaultAlpineVersion}" ] ; then
+				variantAliases=( "${variantAliases[@]/%/-alpine}" )
+			elif [ "$suite" != "$versionSuite" ]; then
+				variantAliases=()
 			fi
+			variantAliases=( "${suiteVariantAliases[@]}" "${variantAliases[@]}" )
 			variantAliases=( "${variantAliases[@]//latest-/}" )
 
 			variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"

update.sh

@@ -118,7 +118,7 @@ for version in "${versions[@]}"; do
 
 	dockerfiles=()
 
-	for suite in alpine3.4 alpine3.6 jessie stretch-slim; do
+	for suite in stretch jessie alpine3.6 alpine3.4; do
 		[ -d "$version/$suite" ] || continue
 		alpineVer="${suite#alpine}"
 
@@ -127,7 +127,7 @@ for version in "${versions[@]}"; do
 			baseDockerfile=Dockerfile-alpine.template
 		fi
 
-		for variant in apache cli fpm zts; do
+		for variant in cli apache fpm zts; do
 			[ -d "$version/$suite/$variant" ] || continue
 			{ generated_warning; cat "$baseDockerfile"; } > "$version/$suite/$variant/Dockerfile"
 			if [ -f "$variant-Dockerfile-block-1" ]; then
@@ -151,8 +151,10 @@ for version in "${versions[@]}"; do
 				sed -ri 's!libressl!openssl!g' "$version/$suite/$variant/Dockerfile"
 			fi
 
+			# automatic `-slim` for stretch
+			# TODO always add slim once jessie is removed
 			sed -ri \
-				-e 's!%%DEBIAN_SUITE%%!'"$suite"'!' \
+				-e 's!%%DEBIAN_SUITE%%!'"${suite/stretch/stretch-slim}"'!' \
 				-e 's!%%ALPINE_VERSION%%!'"$alpineVer"'!' \
 				"$version/$suite/$variant/Dockerfile"
 			dockerfiles+=( "$version/$suite/$variant/Dockerfile" )