Merge pull request #284 from infosiftr/verify-no-distro-ruby

yosifkit · web-flow · commit 21864e72d8b5 · 2019-06-25T21:34:00.000-07:00
Add some verification that we have no "distro ruby" packages
diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile
@@ -110,6 +110,12 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile
@@ -110,6 +110,12 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile
@@ -72,6 +72,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile
@@ -97,6 +97,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile
@@ -72,6 +72,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile
@@ -97,6 +97,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile
@@ -110,6 +110,12 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile
@@ -110,6 +110,12 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile
@@ -72,6 +72,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile
@@ -97,6 +97,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile
@@ -106,6 +106,12 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile
@@ -106,6 +106,12 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile
@@ -68,6 +68,9 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile
@@ -93,6 +93,9 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile
@@ -106,6 +106,12 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile
@@ -68,6 +68,9 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile
@@ -94,6 +94,9 @@ RUN set -eux; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -110,6 +110,12 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! apk --no-network list --installed \
+		| grep -v '^[.]ruby-rundeps' \
+		| grep -i ruby \
+	; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -72,6 +72,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -98,6 +98,9 @@ RUN set -eux; \
 # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246)
 	ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \
 	gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \
+# verify we have no "ruby" packages installed
+	! dpkg -l | grep -i ruby; \
+	[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \
 # rough smoke test
 	ruby --version; \
 	gem --version; \
