Build slim images

.travis.yml

@@ -2,6 +2,7 @@ language: bash
 services: docker
 
 env:
+  - VERSION=1.25.0 VARIANT=stretch/slim
   - VERSION=1.25.0 VARIANT=stretch
   - VERSION=1.25.0 VARIANT=jessie
 
@@ -10,11 +11,11 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
-  - image="rust:$VERSION${VARIANT:+-$VARIANT}"
+  - cd "$VERSION/$VARIANT"
+  - slash='/'; image="rust:${VERSION}-${VARIANT//$slash/-}"
 
 script:
-  - travis_retry docker build -t "$image" "${VARIANT:-.}"
+  - travis_retry docker build -t "$image" .
   - ~/official-images/test/run.sh "$image"
 
 after_script:

1.25.0/jessie/Dockerfile

@@ -8,13 +8,13 @@ RUN set -eux; \
     \
 # this "case" statement is generated via "update.sh"
     dpkgArch="$(dpkg --print-architecture)"; \
-	case "${dpkgArch##*-}" in \
-		amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
-		armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
-		arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
-		i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
-		*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-	esac; \
+    case "${dpkgArch##*-}" in \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
     \
     url="https://static.rust-lang.org/rustup/archive/1.11.0/${rustArch}/rustup-init"; \
     wget "$url"; \

1.25.0/stretch/Dockerfile

@@ -8,13 +8,13 @@ RUN set -eux; \
     \
 # this "case" statement is generated via "update.sh"
     dpkgArch="$(dpkg --print-architecture)"; \
-	case "${dpkgArch##*-}" in \
-		amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
-		armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
-		arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
-		i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
-		*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
-	esac; \
+    case "${dpkgArch##*-}" in \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
     \
     url="https://static.rust-lang.org/rustup/archive/1.11.0/${rustArch}/rustup-init"; \
     wget "$url"; \

1.25.0/stretch/slim/Dockerfile

@@ -0,0 +1,40 @@
+FROM debian:stretch-slim
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        gcc \
+        libc6-dev \
+        wget \
+        ; \
+    \
+# this "case" statement is generated via "update.sh"
+    dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='297661e121048db3906f8c964999f765b4f6848632c0c2cfb6a1e93d99440732' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='a68ac2d400409f485cb22756f0b3217b95449884e1ea6fd9b70522b3c0a929b2' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27e6109c7b537b92a6c2d45ac941d959606ca26ec501d86085d651892a55d849' ;; \
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
+    \
+    url="https://static.rust-lang.org/rustup/archive/1.11.0/${rustArch}/rustup-init"; \
+    wget "$url"; \
+    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    chmod +x rustup-init; \
+    ./rustup-init -y --no-modify-path --default-toolchain 1.25.0; \
+    rm rustup-init; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    rustup --version; \
+    cargo --version; \
+    rustc --version; \
+    \
+    apt-get remove -y --auto-remove \
+        wget \
+        ; \
+    rm -rf /var/lib/apt/lists/*;

Dockerfile-slim.template

@@ -0,0 +1,33 @@
+FROM debian:%%DEBIAN-SUITE%%-slim
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        gcc \
+        libc6-dev \
+        wget \
+        ; \
+    \
+# this "case" statement is generated via "update.sh"
+    %%ARCH-CASE%%; \
+    \
+    url="https://static.rust-lang.org/rustup/archive/%%RUSTUP-VERSION%%/${rustArch}/rustup-init"; \
+    wget "$url"; \
+    echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
+    chmod +x rustup-init; \
+    ./rustup-init -y --no-modify-path --default-toolchain %%RUST-VERSION%%; \
+    rm rustup-init; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    rustup --version; \
+    cargo --version; \
+    rustc --version; \
+    \
+    apt-get remove -y --auto-remove \
+        wget \
+        ; \
+    rm -rf /var/lib/apt/lists/*;

generate-stackbrew-library.sh

@@ -6,7 +6,7 @@ declare -A aliases=(
 )
 
 defaultDebianSuite='stretch'
-declare -A debianSuite=(
+declare -A debianSuites=(
 )
 
 self="$(basename "$BASH_SOURCE")"
@@ -57,44 +57,53 @@ join() {
 }
 
 for version in "${versions[@]}"; do
-	versionAliases=(
-		$version
-	)
-	versionAliases+=(
-		${aliases[$version]:-}
-	)
+	debianSuite="${debianSuites[$version]:-$defaultDebianSuite}"
 
 	for v in \
-			stretch jessie \
+			{stretch,jessie}{,/slim} \
 	; do
 		dir="$version/$v"
+		variant="$(basename "$v")"
 
-		[ -f "$dir/Dockerfile" ] || continue
+		if [ "$variant" = 'slim' ]; then
+			# convert "slim" into "slim-jessie"
+			# https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
+			variant="$variant-$(basename "$(dirname "$v")")"
+		fi
 
-		variant="$(basename "$v")"
-		versionSuite="${debianSuite[$version]:-$defaultDebianSuite}"
+		[ -f "$dir/Dockerfile" ] || continue
 
 		commit="$(dirCommit "$dir")"
 
-		baseAliases=( "${versionAliases[@]}" )
-		variantAliases=( "${baseAliases[@]/%/-$variant}" )
+		versionAliases=(
+			$version
+			${aliases[$version]:-}
+		)
+
+		variantAliases=( "${versionAliases[@]/%/-$variant}" )
+		case "$variant" in
+			*-"$debianSuite") # "slim-stretch", etc need slim
+				variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" )
+				;;
+		esac
 		variantAliases=( "${variantAliases[@]//latest-/}" )
 
-		if [ "$variant" = "$versionSuite" ]; then
-			variantAliases+=( "${baseAliases[@]}" )
-		fi
+		versionSuite="${debianSuites[$version]:-$defaultDebianSuite}"
 
 		case "$v" in
 			*)  variantArches="$(variantArches "$version" "$v")" ;;
 		esac
 
+		if [ "$variant" = "$debianSuite" ]; then
+			variantAliases+=( "${versionAliases[@]}" )
+		fi
+
 		echo
 		cat <<-EOE
 			Tags: $(join ', ' "${variantAliases[@]}")
 			Architectures: $(join ', ' $variantArches)
 			GitCommit: $commit
 			Directory: $dir
 		EOE
-        [ "$variant" = "$v" ] || echo "Constraints: $variant"
 	done
 done

update.sh

@@ -20,14 +20,14 @@ travisEnv=
 for version in "${versions[@]}"; do
     rustupVersion=$(rustupVersion "$version")
     linuxArchCase='dpkgArch="$(dpkg --print-architecture)"; '$'\\\n'
-    linuxArchCase+=$'\t''case "${dpkgArch##*-}" in '$'\\\n'
+    linuxArchCase+=$'    ''case "${dpkgArch##*-}" in '$'\\\n'
     for dpkgArch in $(dpkgArches "$version"); do
         rustArch="$(dpkgToRustArch "$version" "$dpkgArch")"
         sha256="$(curl -fsSL "https://static.rust-lang.org/rustup/archive/${rustupVersion}/${rustArch}/rustup-init.sha256" | awk '{ print $1 }')"
-        linuxArchCase+=$'\t\t'"$dpkgArch) rustArch='$rustArch'; rustupSha256='$sha256' ;; "$'\\\n'
+        linuxArchCase+=$'        '"$dpkgArch) rustArch='$rustArch'; rustupSha256='$sha256' ;; "$'\\\n'
     done
-    linuxArchCase+=$'\t\t''*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; '$'\\\n'
-    linuxArchCase+=$'\t''esac'
+    linuxArchCase+=$'        ''*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; '$'\\\n'
+    linuxArchCase+=$'    ''esac'
 
     for variant in jessie stretch; do
         if [ -d "$version/$variant" ]; then
@@ -39,6 +39,16 @@ for version in "${versions[@]}"; do
                 Dockerfile-debian.template > "$version/$variant/Dockerfile"
                 travisEnv='\n  - VERSION='"$version VARIANT=$variant$travisEnv"
         fi
+
+        if [ -d "$version/$variant/slim" ]; then
+            sed -r \
+                -e 's!%%RUST-VERSION%%!'"$version"'!g' \
+                -e 's!%%RUSTUP-VERSION%%!'"$rustupVersion"'!g' \
+                -e 's!%%DEBIAN-SUITE%%!'"$variant"'!g' \
+                -e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$linuxArchCase")"'!g' \
+                Dockerfile-slim.template > "$version/$variant/slim/Dockerfile"
+                travisEnv='\n  - VERSION='"$version VARIANT=$variant/slim$travisEnv"
+        fi
     done
 done