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

Add some verification that we have no "distro ruby" packages

Author: yosifkit

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \

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; \