Apply a few minor update.sh consistency tweaks and use it to update 3.6/stretch to 3.6.2

tianon · tianon · commit c9954b06c8b1 · 2017-07-17T15:39:27.000-07:00
diff --git a/2.7/stretch/Dockerfile b/2.7/stretch/Dockerfile
@@ -48,9 +48,9 @@ RUN set -ex \
 	\
 	&& find /usr/local -depth \
 		\( \
-			\( -type d -a -name test -o -name tests \) \
+			\( -type d -a \( -name test -o -name tests \) \) \
 			-o \
-			\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python
 
@@ -70,9 +70,9 @@ RUN set -ex; \
 	\
 	find /usr/local -depth \
 		\( \
-			\( -type d -a -name test -o -name tests \) \
+			\( -type d -a \( -name test -o -name tests \) \) \
 			-o \
-			\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' +; \
 	rm -f get-pip.py
 
diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.1
+ENV PYTHON_VERSION 3.6.2
 
 RUN set -ex \
 	&& buildDeps=' \
@@ -57,9 +57,9 @@ RUN set -ex \
 	\
 	&& find /usr/local -depth \
 		\( \
-			\( -type d -a -name test -o -name tests \) \
+			\( -type d -a \( -name test -o -name tests \) \) \
 			-o \
-			\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' + \
 	&& rm -rf /usr/src/python
 
@@ -86,9 +86,9 @@ RUN set -ex; \
 	\
 	find /usr/local -depth \
 		\( \
-			\( -type d -a -name test -o -name tests \) \
+			\( -type d -a \( -name test -o -name tests \) \) \
 			-o \
-			\( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+			\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
 		\) -exec rm -rf '{}' +; \
 	rm -f get-pip.py
 
diff --git a/update.sh b/update.sh
@@ -99,14 +99,6 @@ for version in "${versions[@]}"; do
 				template="Dockerfile-$variant.template"
 				{ generated_warning; cat "$template"; } > "$dir/Dockerfile"
 			done
-			if [ -d "$version/wheezy" ]; then
-				cp "$version/Dockerfile" "$version/wheezy/Dockerfile"
-				# wheezy-only: dpkg-architecture: unknown option `--query'
-				sed -ri \
-					-e 's/:jessie/:wheezy/g' \
-					-e 's/dpkg-architecture --query /dpkg-architecture -q/g' \
-					"$version/wheezy/Dockerfile"
-			fi
 		fi
 		(
 			set -x
@@ -119,21 +111,27 @@ for version in "${versions[@]}"; do
 				"$version"/{,*/,*/*/}Dockerfile
 		)
 	fi
-	if [ -d "$version/alpine3.6" ]; then
-		cp "$version/alpine/Dockerfile" "$version/alpine3.6/Dockerfile"
-		sed -ri \
-			-e 's/(alpine):3.4/\1:3.6/g' \
-			-e 's/openssl/libressl/g' \
-			"$version/alpine3.6/Dockerfile"
-	fi
-	if [ -d "$version/stretch" ]; then
-		cp "$version/Dockerfile" "$version/stretch/Dockerfile"
-		sed -ri \
-			-e 's/:jessie/:stretch/g' \
-			"$version/stretch/Dockerfile"
-	fi
 	for variant in wheezy stretch alpine3.6 alpine slim ''; do
 		[ -d "$version/$variant" ] || continue
+
+		case "$variant" in
+			alpine3.6)
+				sed -r \
+					-e 's!(alpine):3.4!\1:3.6!g' \
+					-e 's!openssl!libressl!g' \
+					"$version/alpine/Dockerfile" > "$version/$variant/Dockerfile"
+				;;
+
+			wheezy|stretch)
+				sed -r \
+					-e "s!(buildpack-deps|debian):jessie!\1:${variant}!g" \
+					"$version/Dockerfile" > "$version/$variant/Dockerfile"
+				if [ "$variant" = 'wheezy' ]; then
+					sed -ri -e 's/dpkg-architecture --query /dpkg-architecture -q/g' "$version/$variant/Dockerfile"
+				fi
+				;;
+		esac
+
 		travisEnv='\n  - VERSION='"$version VARIANT=$variant$travisEnv"
 	done
 	for winVariant in windowsservercore nanoserver; do
