diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index c24521655..79df48905 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/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/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index 008205481..9707f9727 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/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/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index a2b97e9f3..f9394ef22 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/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/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 627cd46b6..dc1f55808 100644 --- a/3.1/bullseye/Dockerfile +++ b/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/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 0ca7f68ca..dfd77923e 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/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/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index e0cfccd50..81bcbd0ee 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/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/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 2938a880a..f8148ff66 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/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/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index b93c9512f..9e3b07964 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/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/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 5f83a1d7b..d6b96fc48 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/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/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 8a55a96d7..8c1b3baad 100644 --- a/3.2/bullseye/Dockerfile +++ b/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/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 146d50f07..0c3aeb3e5 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/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/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 8b134b036..fc120633e 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/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/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index cfb7603a0..d29ad2ed2 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/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/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 6bd871dc8..5677ccfac 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/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/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 7965037b9..4d0d7d792 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/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/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 62a747ccf..808e9e2ce 100644 --- a/3.3/bullseye/Dockerfile +++ b/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/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index baa8bd6d8..c3f0e9dae 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/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/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index b95a1b2b0..2969f9b92 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/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/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index f458507f2..8eab13943 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/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/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 1d6234fd0..ab5ede449 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/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/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index bfb3ccc03..a46fff501 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/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/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 3e96669f5..0280de385 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/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/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index d99457ca2..fa2928427 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/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/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 49f290cfe..1033a5b43 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/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/Dockerfile.template b/Dockerfile.template index 821dd3f38..4a3fc4aee 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -112,7 +112,6 @@ RUN set -eux; \ zlib1g-dev \ {{ ) else "" end -}} ; \ - rm -rf /var/lib/apt/lists/*; \ {{ ) end -}} {{ if .rust.version then ( -}} \ @@ -225,6 +224,34 @@ RUN set -eux; \ make -j "$(nproc)"; \ make install; \ \ +{{ if (is_alpine or is_slim) and (.version | IN("3.1.6", "3.2.6", "3.3.6", "3.4.1")) then ( -}} +# 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 +{{ if is_alpine then ( -}} + apk add --no-cache --virtual .ruby-493-backcompat \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; \ +{{ ) else ( -}} + savedAptMark="$savedAptMark \ + bzip2 \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + "; \ + apt-get install -y --no-install-recommends $savedAptMark; \ +{{ ) end -}} + \ +{{ ) else "" end -}} {{ if .rust.version then ( -}} rm -rf /tmp/rust; \ {{ ) else "" end -}} @@ -249,6 +276,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/*; \ {{ ) end -}} \ cd /; \ @@ -257,7 +285,7 @@ RUN set -eux; \ {{ if is_alpine then ( -}} if \ apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ + | grep -v '^[.]ruby-' \ | grep -i ruby \ ; then \ exit 1; \