Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slim images #4512

Merged
merged 1 commit into from
Jun 29, 2018
Merged

slim images #4512

merged 1 commit into from
Jun 29, 2018

Conversation

keeganwitt
Copy link
Contributor

No description provided.

@yosifkit

This comment has been minimized.

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 64b1d9f..a8419ff 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -17,6 +17,12 @@ gradle:jdk7-alpine @ arm64v8
 gradle:jdk7-alpine @ i386
 gradle:jdk7-alpine @ ppc64le
 gradle:jdk7-alpine @ s390x
+gradle:jdk7-slim @ amd64
+gradle:jdk7-slim @ arm32v6
+gradle:jdk7-slim @ arm64v8
+gradle:jdk7-slim @ i386
+gradle:jdk7-slim @ ppc64le
+gradle:jdk7-slim @ s390x
 gradle:jdk10 @ amd64
 gradle:jdk10 @ arm32v5
 gradle:jdk10 @ arm32v7
@@ -24,6 +30,12 @@ gradle:jdk10 @ arm64v8
 gradle:jdk10 @ i386
 gradle:jdk10 @ ppc64le
 gradle:jdk10 @ s390x
+gradle:jdk10-slim @ amd64
+gradle:jdk10-slim @ arm32v6
+gradle:jdk10-slim @ arm64v8
+gradle:jdk10-slim @ i386
+gradle:jdk10-slim @ ppc64le
+gradle:jdk10-slim @ s390x
 gradle:jre7 @ amd64
 gradle:jre7 @ arm32v5
 gradle:jre7 @ arm32v7
@@ -37,6 +49,12 @@ gradle:jre7-alpine @ arm64v8
 gradle:jre7-alpine @ i386
 gradle:jre7-alpine @ ppc64le
 gradle:jre7-alpine @ s390x
+gradle:jre7-slim @ amd64
+gradle:jre7-slim @ arm32v6
+gradle:jre7-slim @ arm64v8
+gradle:jre7-slim @ i386
+gradle:jre7-slim @ ppc64le
+gradle:jre7-slim @ s390x
 gradle:jre10 @ amd64
 gradle:jre10 @ arm32v5
 gradle:jre10 @ arm32v7
@@ -44,6 +62,12 @@ gradle:jre10 @ arm64v8
 gradle:jre10 @ i386
 gradle:jre10 @ ppc64le
 gradle:jre10 @ s390x
+gradle:jre10-slim @ amd64
+gradle:jre10-slim @ arm32v6
+gradle:jre10-slim @ arm64v8
+gradle:jre10-slim @ i386
+gradle:jre10-slim @ ppc64le
+gradle:jre10-slim @ s390x
 gradle:jre @ amd64
 gradle:jre @ arm32v5
 gradle:jre @ arm32v7
@@ -57,6 +81,12 @@ gradle:jre-alpine @ arm64v8
 gradle:jre-alpine @ i386
 gradle:jre-alpine @ ppc64le
 gradle:jre-alpine @ s390x
+gradle:jre-slim @ amd64
+gradle:jre-slim @ arm32v6
+gradle:jre-slim @ arm64v8
+gradle:jre-slim @ i386
+gradle:jre-slim @ ppc64le
+gradle:jre-slim @ s390x
 gradle:latest @ amd64
 gradle:latest @ arm32v5
 gradle:latest @ arm32v7
@@ -64,3 +94,9 @@ gradle:latest @ arm64v8
 gradle:latest @ i386
 gradle:latest @ ppc64le
 gradle:latest @ s390x
+gradle:slim @ amd64
+gradle:slim @ arm32v6
+gradle:slim @ arm64v8
+gradle:slim @ i386
+gradle:slim @ ppc64le
+gradle:slim @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 98c6fcf..e40f5f5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,46 +3,73 @@ gradle:4.8-alpine
 gradle:4.8-jdk
 gradle:4.8-jdk7
 gradle:4.8-jdk7-alpine
+gradle:4.8-jdk7-slim
 gradle:4.8-jdk8
 gradle:4.8-jdk8-alpine
+gradle:4.8-jdk8-slim
 gradle:4.8-jdk10
+gradle:4.8-jdk10-slim
 gradle:4.8-jdk-alpine
+gradle:4.8-jdk-slim
 gradle:4.8-jre
 gradle:4.8-jre7
 gradle:4.8-jre7-alpine
+gradle:4.8-jre7-slim
 gradle:4.8-jre8
 gradle:4.8-jre8-alpine
+gradle:4.8-jre8-slim
 gradle:4.8-jre10
+gradle:4.8-jre10-slim
 gradle:4.8-jre-alpine
+gradle:4.8-jre-slim
+gradle:4.8-slim
 gradle:4.8.1
 gradle:4.8.1-alpine
 gradle:4.8.1-jdk
 gradle:4.8.1-jdk7
 gradle:4.8.1-jdk7-alpine
+gradle:4.8.1-jdk7-slim
 gradle:4.8.1-jdk8
 gradle:4.8.1-jdk8-alpine
+gradle:4.8.1-jdk8-slim
 gradle:4.8.1-jdk10
+gradle:4.8.1-jdk10-slim
 gradle:4.8.1-jdk-alpine
+gradle:4.8.1-jdk-slim
 gradle:4.8.1-jre
 gradle:4.8.1-jre7
 gradle:4.8.1-jre7-alpine
+gradle:4.8.1-jre7-slim
 gradle:4.8.1-jre8
 gradle:4.8.1-jre8-alpine
+gradle:4.8.1-jre8-slim
 gradle:4.8.1-jre10
+gradle:4.8.1-jre10-slim
 gradle:4.8.1-jre-alpine
+gradle:4.8.1-jre-slim
+gradle:4.8.1-slim
 gradle:alpine
 gradle:jdk
 gradle:jdk7
 gradle:jdk7-alpine
+gradle:jdk7-slim
 gradle:jdk8
 gradle:jdk8-alpine
+gradle:jdk8-slim
 gradle:jdk10
+gradle:jdk10-slim
 gradle:jdk-alpine
+gradle:jdk-slim
 gradle:jre
 gradle:jre7
 gradle:jre7-alpine
+gradle:jre7-slim
 gradle:jre8
 gradle:jre8-alpine
+gradle:jre8-slim
 gradle:jre10
+gradle:jre10-slim
 gradle:jre-alpine
+gradle:jre-slim
 gradle:latest
+gradle:slim
diff --git a/gradle_jdk10/Dockerfile b/gradle_jdk10-slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_jdk10-slim/Dockerfile
index a0ba93b..647f283 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_jdk10-slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:10-jdk-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \
diff --git a/gradle_jdk10/Dockerfile b/gradle_jdk7-slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_jdk7-slim/Dockerfile
index a0ba93b..4b11547 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_jdk7-slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:7-jdk-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \
diff --git a/gradle_jdk10/Dockerfile b/gradle_jre-slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_jre-slim/Dockerfile
index a0ba93b..ac4744e 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_jre-slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:8-jre-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \
diff --git a/gradle_jdk10/Dockerfile b/gradle_jre10-slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_jre10-slim/Dockerfile
index a0ba93b..d1790d6 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_jre10-slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:10-jre-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \
diff --git a/gradle_jdk10/Dockerfile b/gradle_jre7-slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_jre7-slim/Dockerfile
index a0ba93b..b67d012 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_jre7-slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:7-jre-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \
diff --git a/gradle_jdk10/Dockerfile b/gradle_slim/Dockerfile
similarity index 89%
copy from gradle_jdk10/Dockerfile
copy to gradle_slim/Dockerfile
index a0ba93b..98c9085 100644
--- a/gradle_jdk10/Dockerfile
+++ b/gradle_slim/Dockerfile
@@ -1,10 +1,16 @@
-FROM openjdk:10-jdk
+FROM openjdk:8-jdk-slim
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME /opt/gradle
 ENV GRADLE_VERSION 4.8.1
 
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends \
+		unzip \
+		wget && \
+	rm -rf /var/lib/apt/lists/*
+
 ARG GRADLE_DOWNLOAD_SHA256=af334d994b5e69e439ab55b5d2b7d086da5ea6763d78054f49f147b06370ed71
 RUN set -o errexit -o nounset \
 	&& echo "Downloading Gradle" \

@yosifkit
Copy link
Member

Build test of #4512; 3620d8a; amd64 (gradle):

$ bashbrew build gradle:4.8.1-jdk7
Building bashbrew/cache:38f87a78b36ec342d82e75e1b3b776d42b7460ca8105164463ba8633efb21e49 (gradle:4.8.1-jdk7)
Tagging gradle:4.8.1-jdk7
Tagging gradle:4.8-jdk7
Tagging gradle:jdk7

$ test/run.sh gradle:4.8.1-jdk7
testing gradle:4.8.1-jdk7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre7
Building bashbrew/cache:f5adf9dbdf2e872b0e07e17308bc4817f04fcf816c59901245ed82c34656300d (gradle:4.8.1-jre7)
Tagging gradle:4.8.1-jre7
Tagging gradle:4.8-jre7
Tagging gradle:jre7

$ test/run.sh gradle:4.8.1-jre7
testing gradle:4.8.1-jre7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk7-alpine
Building bashbrew/cache:c9661dc86296f38261071663ba1b40f63d89b177b9809c9f756d5c18ba8fc9b0 (gradle:4.8.1-jdk7-alpine)
Tagging gradle:4.8.1-jdk7-alpine
Tagging gradle:4.8-jdk7-alpine
Tagging gradle:jdk7-alpine

$ test/run.sh gradle:4.8.1-jdk7-alpine
testing gradle:4.8.1-jdk7-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk7-slim
Building bashbrew/cache:2ca1d856133082b48d5e5e849b48dd3ed387f6d9f660895e32bf8173183b3461 (gradle:4.8.1-jdk7-slim)
Tagging gradle:4.8.1-jdk7-slim
Tagging gradle:4.8-jdk7-slim
Tagging gradle:jdk7-slim

$ test/run.sh gradle:4.8.1-jdk7-slim
testing gradle:4.8.1-jdk7-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre7-alpine
Building bashbrew/cache:cd0fb00c8930d8e5c7da606dc502370ac6a15595a2974e94943d21d4816e6536 (gradle:4.8.1-jre7-alpine)
Tagging gradle:4.8.1-jre7-alpine
Tagging gradle:4.8-jre7-alpine
Tagging gradle:jre7-alpine

$ test/run.sh gradle:4.8.1-jre7-alpine
testing gradle:4.8.1-jre7-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre7-slim
Building bashbrew/cache:4326eb2ed4a46bbe19701bf4111f02bcdc66265022a8a476eb34948a7eec71da (gradle:4.8.1-jre7-slim)
Tagging gradle:4.8.1-jre7-slim
Tagging gradle:4.8-jre7-slim
Tagging gradle:jre7-slim

$ test/run.sh gradle:4.8.1-jre7-slim
testing gradle:4.8.1-jre7-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk8
Building bashbrew/cache:89741125bafd191c89fd271f0fd3e9525de8c19ba0bee80e700aa5712adfac31 (gradle:4.8.1-jdk8)
Tagging gradle:4.8.1-jdk8
Tagging gradle:4.8-jdk8
Tagging gradle:jdk8
Tagging gradle:4.8.1-jdk
Tagging gradle:4.8-jdk
Tagging gradle:jdk
Tagging gradle:4.8.1
Tagging gradle:4.8
Tagging gradle:latest

$ test/run.sh gradle:4.8.1-jdk8
testing gradle:4.8.1-jdk8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre8
Building bashbrew/cache:d0740ec9d46f9d977553379e7f6e059a40ac9adeae3b3ffa01b42334cdab02f3 (gradle:4.8.1-jre8)
Tagging gradle:4.8.1-jre8
Tagging gradle:4.8-jre8
Tagging gradle:jre8
Tagging gradle:4.8.1-jre
Tagging gradle:4.8-jre
Tagging gradle:jre

$ test/run.sh gradle:4.8.1-jre8
testing gradle:4.8.1-jre8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk8-alpine
Building bashbrew/cache:889e4da424029323ba823b0745110c3290d8e811592b64913308defadf2317f2 (gradle:4.8.1-jdk8-alpine)
Tagging gradle:4.8.1-jdk8-alpine
Tagging gradle:4.8-jdk8-alpine
Tagging gradle:jdk8-alpine
Tagging gradle:4.8.1-jdk-alpine
Tagging gradle:4.8-jdk-alpine
Tagging gradle:jdk-alpine
Tagging gradle:4.8.1-alpine
Tagging gradle:4.8-alpine
Tagging gradle:alpine

$ test/run.sh gradle:4.8.1-jdk8-alpine
testing gradle:4.8.1-jdk8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk8-slim
Building bashbrew/cache:e9719b32aa805d38d12745bd050008f3e67634f9f2aa6cc3dae4448e25014bda (gradle:4.8.1-jdk8-slim)
Tagging gradle:4.8.1-jdk8-slim
Tagging gradle:4.8-jdk8-slim
Tagging gradle:jdk8-slim
Tagging gradle:4.8.1-jdk-slim
Tagging gradle:4.8-jdk-slim
Tagging gradle:jdk-slim
Tagging gradle:4.8.1-slim
Tagging gradle:4.8-slim
Tagging gradle:slim

$ test/run.sh gradle:4.8.1-jdk8-slim
testing gradle:4.8.1-jdk8-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre8-alpine
Building bashbrew/cache:f27c22703f25047586f7ff98891a402cca561f98e15bb55b28db6408205734a2 (gradle:4.8.1-jre8-alpine)
Tagging gradle:4.8.1-jre8-alpine
Tagging gradle:4.8-jre8-alpine
Tagging gradle:jre8-alpine
Tagging gradle:4.8.1-jre-alpine
Tagging gradle:4.8-jre-alpine
Tagging gradle:jre-alpine

$ test/run.sh gradle:4.8.1-jre8-alpine
testing gradle:4.8.1-jre8-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre8-slim
Building bashbrew/cache:8935f20b695ce4e1590281e068d30731cac121fa2587aa546dc2e1db363809cc (gradle:4.8.1-jre8-slim)
Tagging gradle:4.8.1-jre8-slim
Tagging gradle:4.8-jre8-slim
Tagging gradle:jre8-slim
Tagging gradle:4.8.1-jre-slim
Tagging gradle:4.8-jre-slim
Tagging gradle:jre-slim

$ test/run.sh gradle:4.8.1-jre8-slim
testing gradle:4.8.1-jre8-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk10
Building bashbrew/cache:d166938ed7c56061025d68db8a09e146130af85f5b72449fedc1f55b0ab23210 (gradle:4.8.1-jdk10)
Tagging gradle:4.8.1-jdk10
Tagging gradle:4.8-jdk10
Tagging gradle:jdk10

$ test/run.sh gradle:4.8.1-jdk10
testing gradle:4.8.1-jdk10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jdk10-slim
Building bashbrew/cache:f355e921468258f8c51a0732fe31b8d5df9b47ec2931fa3c8806b9894e13fc18 (gradle:4.8.1-jdk10-slim)
Tagging gradle:4.8.1-jdk10-slim
Tagging gradle:4.8-jdk10-slim
Tagging gradle:jdk10-slim

$ test/run.sh gradle:4.8.1-jdk10-slim
testing gradle:4.8.1-jdk10-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre10
Building bashbrew/cache:b0dc7302169ee1d8100d21012cc8480afdadd878ede78378655b4889392127b6 (gradle:4.8.1-jre10)
Tagging gradle:4.8.1-jre10
Tagging gradle:4.8-jre10
Tagging gradle:jre10

$ test/run.sh gradle:4.8.1-jre10
testing gradle:4.8.1-jre10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build gradle:4.8.1-jre10-slim
Building bashbrew/cache:6966be1a82b3e60acc570d59e24c1389d115774e3c420eb9894ebae3c3385d55 (gradle:4.8.1-jre10-slim)
Tagging gradle:4.8.1-jre10-slim
Tagging gradle:4.8-jre10-slim
Tagging gradle:jre10-slim

$ test/run.sh gradle:4.8.1-jre10-slim
testing gradle:4.8.1-jre10-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants