Merge pull request #257 from infosiftr/the-real-slim-shady

Adjust "slim" variants to use "slim" Debian bases
docker-library · Jan 8, 2019 · 4d29dda · 4d29dda
2 parents 6a08386 + da4b249
commit 4d29dda
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:jessie-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:stretch-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:jessie-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:stretch-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:stretch-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:stretch-slim
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/update.sh b/update.sh
@@ -85,6 +85,10 @@ for version in "${versions[@]}"; do
 		esac
 		template="Dockerfile-${template}.template"
 
+		if [ "$variant" = 'slim' ]; then
+			tag+='-slim'
+		fi
+
 		sed -r \
 			-e 's!%%VERSION%%!'"$version"'!g' \
 			-e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \