Update ruby #18238

yosifkit · 2025-01-14T22:11:13Z

Changes:

docker-library/ruby@2ba928a: Merge pull request Revert "Remove runtime dependencies from slim and alpine variants" ruby#497 from Earlopain/revert-slim-trim
docker-library/ruby@1ea0c59: Remove packages again at next minor release of each series
docker-library/ruby@6f84caa: Revert "Remove runtime dependencies from slim and alpine variants"

Changes: - docker-library/ruby@2ba928a: Merge pull request docker-library/ruby#497 from Earlopain/revert-slim-trim - docker-library/ruby@1ea0c59: Remove packages again at next minor release of each series - docker-library/ruby@6f84caa: Revert "Remove runtime dependencies from slim and alpine variants"

github-actions · 2025-01-14T22:12:36Z

Diff for 9b9207b:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 61aea2f..f11795d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,120 +3,120 @@ GitRepo: /~https://github.com/docker-library/ruby.git
 
 Tags: 3.1.6-alpine3.20, 3.1-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 7f078b1b01338e19130eb8b01cb7f35153ba6b04
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/alpine3.20
 
 Tags: 3.1.6-alpine3.21, 3.1-alpine3.21, 3.1.6-alpine, 3.1-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 7f078b1b01338e19130eb8b01cb7f35153ba6b04
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/alpine3.21
 
 Tags: 3.1.6-bookworm, 3.1-bookworm, 3.1.6, 3.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/bookworm
 
 Tags: 3.1.6-bullseye, 3.1-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 780654067ddce418269e6710c13b75de288c3c0d
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/bullseye
 
 Tags: 3.1.6-slim-bookworm, 3.1-slim-bookworm, 3.1.6-slim, 3.1-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7f078b1b01338e19130eb8b01cb7f35153ba6b04
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/slim-bookworm
 
 Tags: 3.1.6-slim-bullseye, 3.1-slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 7f078b1b01338e19130eb8b01cb7f35153ba6b04
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.1/slim-bullseye
 
 Tags: 3.2.6-alpine3.20, 3.2-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/alpine3.20
 
 Tags: 3.2.6-alpine3.21, 3.2-alpine3.21, 3.2.6-alpine, 3.2-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/alpine3.21
 
 Tags: 3.2.6-bookworm, 3.2-bookworm, 3.2.6, 3.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/bookworm
 
 Tags: 3.2.6-bullseye, 3.2-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/bullseye
 
 Tags: 3.2.6-slim-bookworm, 3.2-slim-bookworm, 3.2.6-slim, 3.2-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/slim-bookworm
 
 Tags: 3.2.6-slim-bullseye, 3.2-slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.2/slim-bullseye
 
 Tags: 3.3.6-alpine3.20, 3.3-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/alpine3.20
 
 Tags: 3.3.6-alpine3.21, 3.3-alpine3.21, 3.3.6-alpine, 3.3-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/alpine3.21
 
 Tags: 3.3.6-bookworm, 3.3-bookworm, 3.3.6, 3.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/bookworm
 
 Tags: 3.3.6-bullseye, 3.3-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/bullseye
 
 Tags: 3.3.6-slim-bookworm, 3.3-slim-bookworm, 3.3.6-slim, 3.3-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/slim-bookworm
 
 Tags: 3.3.6-slim-bullseye, 3.3-slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.3/slim-bullseye
 
 Tags: 3.4.1-alpine3.20, 3.4-alpine3.20, 3-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/alpine3.20
 
 Tags: 3.4.1-alpine3.21, 3.4-alpine3.21, 3-alpine3.21, alpine3.21, 3.4.1-alpine, 3.4-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/alpine3.21
 
 Tags: 3.4.1-bookworm, 3.4-bookworm, 3-bookworm, bookworm, 3.4.1, 3.4, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/bookworm
 
 Tags: 3.4.1-bullseye, 3.4-bullseye, 3-bullseye, bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/bullseye
 
 Tags: 3.4.1-slim-bookworm, 3.4-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.4.1-slim, 3.4-slim, 3-slim, slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/slim-bookworm
 
 Tags: 3.4.1-slim-bullseye, 3.4-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9b6a2e2c9155e3cd23adc263e35cbb5940aad91a
+GitCommit: 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a
 Directory: 3.4/slim-bullseye
diff --git a/ruby_3.1-alpine/Dockerfile b/ruby_3.1-alpine/Dockerfile
index 0082054..9707f97 100644
--- a/ruby_3.1-alpine/Dockerfile
+++ b/ruby_3.1-alpine/Dockerfile
@@ -92,6 +92,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
 			| tr ',' '\n' \
@@ -106,7 +119,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.1-alpine3.20/Dockerfile b/ruby_3.1-alpine3.20/Dockerfile
index c245216..79df489 100644
--- a/ruby_3.1-alpine3.20/Dockerfile
+++ b/ruby_3.1-alpine3.20/Dockerfile
@@ -92,6 +92,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
 			| tr ',' '\n' \
@@ -106,7 +119,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.1-bullseye/Dockerfile b/ruby_3.1-bullseye/Dockerfile
index 627cd46..dc1f558 100644
--- a/ruby_3.1-bullseye/Dockerfile
+++ b/ruby_3.1-bullseye/Dockerfile
@@ -30,7 +30,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -71,6 +70,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.1-slim-bullseye/Dockerfile b/ruby_3.1-slim-bullseye/Dockerfile
index e0cfccd..81bcbd0 100644
--- a/ruby_3.1-slim-bullseye/Dockerfile
+++ b/ruby_3.1-slim-bullseye/Dockerfile
@@ -56,7 +56,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -86,6 +85,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -97,6 +110,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.1-slim/Dockerfile b/ruby_3.1-slim/Dockerfile
index 0ca7f68..dfd7792 100644
--- a/ruby_3.1-slim/Dockerfile
+++ b/ruby_3.1-slim/Dockerfile
@@ -56,7 +56,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -86,6 +85,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
@@ -97,6 +110,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.1/Dockerfile b/ruby_3.1/Dockerfile
index a2b97e9..f9394ef 100644
--- a/ruby_3.1/Dockerfile
+++ b/ruby_3.1/Dockerfile
@@ -30,7 +30,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \
 	echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \
@@ -71,6 +70,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.2-alpine/Dockerfile b/ruby_3.2-alpine/Dockerfile
index b93c951..9e3b079 100644
--- a/ruby_3.2-alpine/Dockerfile
+++ b/ruby_3.2-alpine/Dockerfile
@@ -115,6 +115,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -130,7 +143,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.2-alpine3.20/Dockerfile b/ruby_3.2-alpine3.20/Dockerfile
index 2938a88..f8148ff 100644
--- a/ruby_3.2-alpine3.20/Dockerfile
+++ b/ruby_3.2-alpine3.20/Dockerfile
@@ -115,6 +115,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -130,7 +143,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.2-bullseye/Dockerfile b/ruby_3.2-bullseye/Dockerfile
index 8a55a96..8c1b3ba 100644
--- a/ruby_3.2-bullseye/Dockerfile
+++ b/ruby_3.2-bullseye/Dockerfile
@@ -30,7 +30,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -95,6 +94,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.2-slim-bullseye/Dockerfile b/ruby_3.2-slim-bullseye/Dockerfile
index 8b134b0..fc12063 100644
--- a/ruby_3.2-slim-bullseye/Dockerfile
+++ b/ruby_3.2-slim-bullseye/Dockerfile
@@ -56,7 +56,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -109,6 +108,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -121,6 +134,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.2-slim/Dockerfile b/ruby_3.2-slim/Dockerfile
index 146d50f..0c3aeb3 100644
--- a/ruby_3.2-slim/Dockerfile
+++ b/ruby_3.2-slim/Dockerfile
@@ -56,7 +56,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -109,6 +108,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -121,6 +134,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.2/Dockerfile b/ruby_3.2/Dockerfile
index 5f83a1d..d6b96fc 100644
--- a/ruby_3.2/Dockerfile
+++ b/ruby_3.2/Dockerfile
@@ -30,7 +30,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -95,6 +94,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.3-alpine/Dockerfile b/ruby_3.3-alpine/Dockerfile
index 6bd871d..5677ccf 100644
--- a/ruby_3.3-alpine/Dockerfile
+++ b/ruby_3.3-alpine/Dockerfile
@@ -113,6 +113,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -128,7 +141,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.3-alpine3.20/Dockerfile b/ruby_3.3-alpine3.20/Dockerfile
index cfb7603..d29ad2e 100644
--- a/ruby_3.3-alpine3.20/Dockerfile
+++ b/ruby_3.3-alpine3.20/Dockerfile
@@ -113,6 +113,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -128,7 +141,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_3.3-bullseye/Dockerfile b/ruby_3.3-bullseye/Dockerfile
index 62a747c..808e9e2 100644
--- a/ruby_3.3-bullseye/Dockerfile
+++ b/ruby_3.3-bullseye/Dockerfile
@@ -29,7 +29,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -94,6 +93,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.3-slim-bullseye/Dockerfile b/ruby_3.3-slim-bullseye/Dockerfile
index b95a1b2..2969f9b 100644
--- a/ruby_3.3-slim-bullseye/Dockerfile
+++ b/ruby_3.3-slim-bullseye/Dockerfile
@@ -54,7 +54,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -107,6 +106,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -119,6 +132,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.3-slim/Dockerfile b/ruby_3.3-slim/Dockerfile
index baa8bd6..c3f0e9d 100644
--- a/ruby_3.3-slim/Dockerfile
+++ b/ruby_3.3-slim/Dockerfile
@@ -54,7 +54,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -107,6 +106,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -119,6 +132,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_3.3/Dockerfile b/ruby_3.3/Dockerfile
index 7965037..4d0d7d7 100644
--- a/ruby_3.3/Dockerfile
+++ b/ruby_3.3/Dockerfile
@@ -29,7 +29,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -94,6 +93,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_alpine/Dockerfile b/ruby_alpine/Dockerfile
index 1d6234f..ab5ede4 100644
--- a/ruby_alpine/Dockerfile
+++ b/ruby_alpine/Dockerfile
@@ -113,6 +113,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -128,7 +141,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_alpine3.20/Dockerfile b/ruby_alpine3.20/Dockerfile
index f458507..8eab139 100644
--- a/ruby_alpine3.20/Dockerfile
+++ b/ruby_alpine3.20/Dockerfile
@@ -113,6 +113,19 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	apk add --no-cache --virtual .ruby-493-backcompat \
+		bzip2 \
+		ca-certificates \
+		gmp-dev \
+		libffi-dev \
+		procps \
+		yaml-dev \
+		zlib-dev \
+	; \
+	\
 	rm -rf /tmp/rust; \
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
@@ -128,7 +141,7 @@ RUN set -eux; \
 # verify we have no "ruby" packages installed
 	if \
 		apk --no-network list --installed \
-			| grep -v '^[.]ruby-rundeps' \
+			| grep -v '^[.]ruby-' \
 			| grep -i ruby \
 	; then \
 		exit 1; \
diff --git a/ruby_bullseye/Dockerfile b/ruby_bullseye/Dockerfile
index 3e96669..0280de3 100644
--- a/ruby_bullseye/Dockerfile
+++ b/ruby_bullseye/Dockerfile
@@ -29,7 +29,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -94,6 +93,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_latest/Dockerfile b/ruby_latest/Dockerfile
index bfb3ccc..a46fff5 100644
--- a/ruby_latest/Dockerfile
+++ b/ruby_latest/Dockerfile
@@ -29,7 +29,6 @@ RUN set -eux; \
 		libgdbm-dev \
 		ruby \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -94,6 +93,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_slim-bullseye/Dockerfile b/ruby_slim-bullseye/Dockerfile
index 49f290c..1033a5b 100644
--- a/ruby_slim-bullseye/Dockerfile
+++ b/ruby_slim-bullseye/Dockerfile
@@ -54,7 +54,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -107,6 +106,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -119,6 +132,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \
diff --git a/ruby_slim/Dockerfile b/ruby_slim/Dockerfile
index d99457c..fa29284 100644
--- a/ruby_slim/Dockerfile
+++ b/ruby_slim/Dockerfile
@@ -54,7 +54,6 @@ RUN set -eux; \
 		xz-utils \
 		zlib1g-dev \
 	; \
-	rm -rf /var/lib/apt/lists/*; \
 	\
 	rustArch=; \
 	dpkgArch="$(dpkg --print-architecture)"; \
@@ -107,6 +106,20 @@ RUN set -eux; \
 	make -j "$(nproc)"; \
 	make install; \
 	\
+# temporary backwards compatibility shim (will go away in the next patch release; please update/adjust accordingly); see:
+# - /~https://github.com/docker-library/ruby/pull/493
+# - /~https://github.com/docker-library/ruby/pull/497
+	savedAptMark="$savedAptMark \
+		bzip2 \
+		libffi-dev \
+		libgmp-dev \
+		libssl-dev \
+		libyaml-dev \
+		procps \
+		zlib1g-dev \
+	"; \
+	apt-get install -y --no-install-recommends $savedAptMark; \
+	\
 	rm -rf /tmp/rust; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark > /dev/null; \
@@ -119,6 +132,7 @@ RUN set -eux; \
 		| xargs -r apt-mark manual \
 	; \
 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
 	rm -r /usr/src/ruby; \

Relevant Maintainers:

ruby: @tianon @yosifkit

yosifkit requested review from LaurentGoderre and a team as code owners January 14, 2025 22:11

github-actions bot added the library/ruby label Jan 14, 2025

tianon approved these changes Jan 14, 2025

View reviewed changes

tianon merged commit 5384ee6 into docker-library:master Jan 14, 2025
29 checks passed

tianon deleted the ruby branch January 14, 2025 23:26

tianon mentioned this pull request Jan 15, 2025

directory /usr/local/share/ca-certificates/ and command update-ca-certificates is missing in 3.3-alpine3.21 docker-library/ruby#498

Closed

yosifkit mentioned this pull request Jan 15, 2025

Revert "Remove runtime dependencies from slim and alpine variants" docker-library/ruby#497

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update ruby #18238

Update ruby #18238

yosifkit commented Jan 14, 2025

github-actions bot commented Jan 14, 2025

Update ruby #18238

Update ruby #18238

Conversation

yosifkit commented Jan 14, 2025

github-actions bot commented Jan 14, 2025