Update slim variants to use slim Debian variants

tianon · tianon · commit 28490a60c628 · 2017-10-20T16:46:19.000-07:00
diff --git a/2.7/jessie/slim/Dockerfile b/2.7/jessie/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:jessie-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:jessie-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:jessie-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:jessie
+FROM debian:jessie-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/3.7-rc/stretch/slim/Dockerfile b/3.7-rc/stretch/slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:stretch
+FROM debian:stretch-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/update.sh b/update.sh
@@ -111,6 +111,10 @@ for version in "${versions[@]}"; do
 			alpine*) template='alpine'; tag="${variant#alpine}" ;;
 			*) template='debian'; tag="$variant" ;;
 		esac
+		if [ "$variant" = 'slim' ]; then
+			# use "debian:*-slim" variants for "python:*-slim" variants
+			tag+='-slim'
+		fi
 		template="Dockerfile-${template}.template"
 
 		if [[ "$version" == 2.* ]]; then

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM debian:jessie`
	`1`	`+FROM debian:jessie-slim`
`2`	`2`
`3`	`3`	`# ensure local python is preferred over distribution python`
`4`	`4`	`ENV PATH /usr/local/bin:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM debian:jessie`
	`7`	`+FROM debian:jessie-slim`
`8`	`8`
`9`	`9`	`# ensure local python is preferred over distribution python`
`10`	`10`	`ENV PATH /usr/local/bin:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`
`7`		`-FROM debian:stretch`
	`7`	`+FROM debian:stretch-slim`
`8`	`8`
`9`	`9`	`# ensure local python is preferred over distribution python`
`10`	`10`	`ENV PATH /usr/local/bin:$PATH`