From 1cf42bb2654dd07928c0d02dc415350970d0105c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 28 Dec 2016 19:43:54 +0800 Subject: [PATCH 001/462] Set clone depth=1 in Travis CI to speed it up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2630f5c106..0cadda2337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - VERSION=2.1 VARIANT=alpine install: - - git clone https://github.com/docker-library/official-images.git ~/official-images + - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images before_script: - env | sort From bfc7a48724ceb1917ddbcb713b24c835eca584c8 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2017 10:24:40 -0800 Subject: [PATCH 002/462] Revert "Update to Alpine 3.5" --- 2.1/alpine/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index a862639b72..a788f80413 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.4 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index f438cb5e23..965b2b0ff2 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.4 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index ab77b912b3..a8e6c0e408 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.4 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 240b0c5e8f..d9c0ba2787 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.4 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 710a3cf0ed..8880bad536 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.4 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ From c1d5f251adad058eec8bc3b6476ab204f2e6dba1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2017 10:27:03 -0800 Subject: [PATCH 003/462] Stop removing "xz-utils" in non-slim base (inhertied from "buildpack-deps:jessie") --- 2.1/Dockerfile | 1 - 2.2/Dockerfile | 1 - 2.3/Dockerfile | 1 - 2.4/Dockerfile | 1 - Dockerfile.template | 1 - 5 files changed, 5 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 20fdd47032..bfc98262e7 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ - xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 39977ef16e..999fecbd12 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ - xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 8355b81c75..b7fdf6a5ff 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ - xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 0d8ac04e4a..6c6068225b 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -20,7 +20,6 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ - xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/Dockerfile.template b/Dockerfile.template index 6188aab0bc..eb61b87b55 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -20,7 +20,6 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ - xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ From f50096b833539bb6ee45834e9bc12895c1414174 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jan 2017 16:03:24 -0800 Subject: [PATCH 004/462] Update to 2.2.6, bundler 1.14.0, rubygems 2.6.9 --- 2.2/Dockerfile | 4 ++-- 2.2/alpine/Dockerfile | 4 ++-- 2.2/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 999fecbd12..48d247ea54 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 965b2b0ff2..3e310a342d 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 93925021df..2f2e9950c1 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 92183f2fb96f27bac8d4b77ea442f0e3a8532851 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jan 2017 16:03:24 -0800 Subject: [PATCH 005/462] Update to 2.3.3, bundler 1.14.0, rubygems 2.6.9 --- 2.3/Dockerfile | 4 ++-- 2.3/alpine/Dockerfile | 4 ++-- 2.3/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index b7fdf6a5ff..1d6cc161e4 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index a8e6c0e408..1cd770483d 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 512a61952e..d15a4f84f9 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" From eb94fb792bf0ad86e858a0186d8de95b5b359ffd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jan 2017 16:03:24 -0800 Subject: [PATCH 006/462] Update to 2.1.10, bundler 1.14.0, rubygems 2.6.9 --- 2.1/Dockerfile | 4 ++-- 2.1/alpine/Dockerfile | 4 ++-- 2.1/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index bfc98262e7..d901f23ed4 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index a788f80413..4d2ffb980a 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 6565a44baa..2510d5431d 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 4fa95a99ceaae1e3438c97f05232bb2fa7cc5ae7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jan 2017 16:03:24 -0800 Subject: [PATCH 007/462] Update to 2.4.0, bundler 1.14.0, rubygems 2.6.9 --- 2.4/Dockerfile | 4 ++-- 2.4/alpine/Dockerfile | 4 ++-- 2.4/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 6c6068225b..4e99638396 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index d9c0ba2787..a50edf871b 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index bb74aa30e3..cb20ecf64a 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.8 +ENV RUBYGEMS_VERSION 2.6.9 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.13.7 +ENV BUNDLER_VERSION 1.14.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 74a863b2e9e846af00029f9233d337a8a9a25ca4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 21 Jan 2017 16:03:08 -0800 Subject: [PATCH 008/462] Update to 2.4.0, bundler 1.14.1, rubygems 2.6.9 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 4e99638396..070030293d 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index a50edf871b..b1ae84f336 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index cb20ecf64a..dd55168c29 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" From b7cf93593b23e8a636750e7f80516a60e612bdff Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 21 Jan 2017 16:03:09 -0800 Subject: [PATCH 009/462] Update to 2.2.6, bundler 1.14.1, rubygems 2.6.9 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 48d247ea54..7fdad2d7ca 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 3e310a342d..d571afc34b 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 2f2e9950c1..c20dbc3666 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" From cc22046d764b79656da22a89523250b87f741e51 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 21 Jan 2017 16:03:09 -0800 Subject: [PATCH 010/462] Update to 2.1.10, bundler 1.14.1, rubygems 2.6.9 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index d901f23ed4..e4cd521a63 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 4d2ffb980a..45c0ad2a1c 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 2510d5431d..f208576405 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" From 552c83342380fd7287e7c4fe1c752fa8c38b1e76 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 21 Jan 2017 16:03:09 -0800 Subject: [PATCH 011/462] Update to 2.3.3, bundler 1.14.1, rubygems 2.6.9 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 1d6cc161e4..44572fce42 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 1cd770483d..ddaafb14fe 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index d15a4f84f9..510bc6bded 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.0 +ENV BUNDLER_VERSION 1.14.1 RUN gem install bundler --version "$BUNDLER_VERSION" From 35fe076eec1b7c6fb1f462e88fb977ef2ca68b64 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 22 Jan 2017 22:03:43 -0800 Subject: [PATCH 012/462] Update to 2.2.6, bundler 1.14.2, rubygems 2.6.9 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 7fdad2d7ca..fd9224f946 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index d571afc34b..ef0aea0ca5 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index c20dbc3666..f7d32f602e 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" From 6d5468ba40dcc7208f4d567785445f6a2d6d6d61 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 22 Jan 2017 22:03:44 -0800 Subject: [PATCH 013/462] Update to 2.3.3, bundler 1.14.2, rubygems 2.6.9 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 44572fce42..40f0b1feae 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index ddaafb14fe..2440107966 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 510bc6bded..6b02ce21b0 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" From d1f2b81094df1d7e1dc172326d41e6320bfbabe7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 22 Jan 2017 22:03:44 -0800 Subject: [PATCH 014/462] Update to 2.1.10, bundler 1.14.2, rubygems 2.6.9 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index e4cd521a63..fde200ad1b 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 45c0ad2a1c..56417351bd 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index f208576405..c8b55ff63e 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" From fe1bbc3fea52b5543426be32b6bc39cd988927a3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 22 Jan 2017 22:03:44 -0800 Subject: [PATCH 015/462] Update to 2.4.0, bundler 1.14.2, rubygems 2.6.9 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 070030293d..5caecf5847 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index b1ae84f336..0ade4ba5de 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index dd55168c29..2d897b020c 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.1 +ENV BUNDLER_VERSION 1.14.2 RUN gem install bundler --version "$BUNDLER_VERSION" From 76922584fccf7eb3949b2db1950f19bdfe2b50fe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Jan 2017 22:03:47 -0800 Subject: [PATCH 016/462] Update to 2.2.6, bundler 1.14.2, rubygems 2.6.10 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index fd9224f946..ee992cecda 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index ef0aea0ca5..b58007d2db 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index f7d32f602e..8b6ca61ffd 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 09dd5d143e553583b43a4b6946ddb54c13f34c3a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Jan 2017 22:03:47 -0800 Subject: [PATCH 017/462] Update to 2.3.3, bundler 1.14.2, rubygems 2.6.10 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 40f0b1feae..e283a678a5 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 2440107966..65cb69e343 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 6b02ce21b0..b90b1e7c48 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9ed041c233af5fffac106a02fb231bf9fb822443 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Jan 2017 22:03:47 -0800 Subject: [PATCH 018/462] Update to 2.4.0, bundler 1.14.2, rubygems 2.6.10 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 5caecf5847..4ebb3bbc22 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 0ade4ba5de..819ce5670c 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 2d897b020c..6f9a791792 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From fc50823e5e39441de228402217e0f1b3bd5d39e7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Jan 2017 22:03:47 -0800 Subject: [PATCH 019/462] Update to 2.1.10, bundler 1.14.2, rubygems 2.6.10 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index fde200ad1b..6ab5274e7b 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 56417351bd..5b2bd12a06 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index c8b55ff63e..88d932887c 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.9 +ENV RUBYGEMS_VERSION 2.6.10 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From b143db48ef460f4b456c2ca32b12147475a2094f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jan 2017 16:03:23 -0800 Subject: [PATCH 020/462] Update to 2.2.6, bundler 1.14.3, rubygems 2.6.10 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index ee992cecda..f2e9e1c23f 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index b58007d2db..8cf3500631 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 8b6ca61ffd..cd746adc33 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" From e32433a12099d96dc5a1b28a011b73af4f17cfff Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jan 2017 16:03:23 -0800 Subject: [PATCH 021/462] Update to 2.1.10, bundler 1.14.3, rubygems 2.6.10 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 6ab5274e7b..1dc145c37a 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 5b2bd12a06..619d7a0069 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 88d932887c..3a4dfc4c3c 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" From 9c296b2ed4e76d6fd399974545a63d410ade0160 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jan 2017 16:03:23 -0800 Subject: [PATCH 022/462] Update to 2.3.3, bundler 1.14.3, rubygems 2.6.10 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index e283a678a5..f74e0481df 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 65cb69e343..bb91095cfb 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index b90b1e7c48..188bd9c190 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" From bae23407cd2c07756c8f88095a25129bf204efaf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jan 2017 16:03:23 -0800 Subject: [PATCH 023/462] Update to 2.4.0, bundler 1.14.3, rubygems 2.6.10 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 4ebb3bbc22..696b84d030 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 819ce5670c..ec7ed28c89 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 6f9a791792..7df36597ee 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.2 +ENV BUNDLER_VERSION 1.14.3 RUN gem install bundler --version "$BUNDLER_VERSION" From 0a9c4539b78e5265edf887b2a5537a1e81f6b5f7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Feb 2017 12:50:29 -0800 Subject: [PATCH 024/462] Update to 2.2.6, bundler 1.14.4, rubygems 2.6.10 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index f2e9e1c23f..9f1f02b772 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 8cf3500631..8d19a3d21c 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index cd746adc33..bb43f6f929 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" From 17f666371fa5c88c48a38bc53c611f26c7455778 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Feb 2017 12:50:29 -0800 Subject: [PATCH 025/462] Update to 2.3.3, bundler 1.14.4, rubygems 2.6.10 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index f74e0481df..59d9a4747d 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index bb91095cfb..915842065b 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 188bd9c190..aae61bbbf7 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" From 1ab58f6415d01794d025ad245fb0f21521e1a159 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Feb 2017 12:50:29 -0800 Subject: [PATCH 026/462] Update to 2.1.10, bundler 1.14.4, rubygems 2.6.10 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 1dc145c37a..a3b6d19e92 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 619d7a0069..ae0d7f7c00 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 3a4dfc4c3c..39039b4f3f 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" From e294c37cc1c2e52e5e765b7dff7f6549eedd7a47 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Feb 2017 12:50:29 -0800 Subject: [PATCH 027/462] Update to 2.4.0, bundler 1.14.4, rubygems 2.6.10 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 696b84d030..517bda253a 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index ec7ed28c89..361e935834 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 7df36597ee..0ebbdf59cd 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.3 +ENV BUNDLER_VERSION 1.14.4 RUN gem install bundler --version "$BUNDLER_VERSION" From 448e0b809772b225d3fc2cbc3a6a2cc551e65400 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 21 Feb 2017 22:03:59 -0800 Subject: [PATCH 028/462] Update to 2.1.10, bundler 1.14.5, rubygems 2.6.10 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index a3b6d19e92..a7b9592246 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index ae0d7f7c00..63f4591a79 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 39039b4f3f..ab154d7fe3 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" From 60957cdfc0986eef4a6063e083d5ff27c901014a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 21 Feb 2017 22:03:59 -0800 Subject: [PATCH 029/462] Update to 2.2.6, bundler 1.14.5, rubygems 2.6.10 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 9f1f02b772..09b7a9376b 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 8d19a3d21c..3680f10f95 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index bb43f6f929..e3a036a62d 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" From aba4590582d91d49926558ac27b9f005c7488bc9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 21 Feb 2017 22:04:00 -0800 Subject: [PATCH 030/462] Update to 2.3.3, bundler 1.14.5, rubygems 2.6.10 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 59d9a4747d..b89d0bd29c 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 915842065b..9ec77b4c3b 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index aae61bbbf7..521eb472bd 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" From 2ad277a78dc56dff66b50ab7c17533f50f125008 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 21 Feb 2017 22:04:00 -0800 Subject: [PATCH 031/462] Update to 2.4.0, bundler 1.14.5, rubygems 2.6.10 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 517bda253a..8be0613826 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 361e935834..79fea1a8b6 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 0ebbdf59cd..9b215d4251 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.4 +ENV BUNDLER_VERSION 1.14.5 RUN gem install bundler --version "$BUNDLER_VERSION" From 6882c6bc7c19c78800ed84b9abd254e2911a78a0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 27 Feb 2017 16:14:30 -0800 Subject: [PATCH 032/462] Add "travis_retry" to our build to reduce transitory failures Documentation is at https://docs.travis-ci.com/user/common-build-problems/#travis_retry See https://github.com/docker-library/memcached/pull/14 for the test PR for this pattern. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2630f5c106..b722b18aeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,10 @@ before_script: - image="$(awk '$1 == "FROM" { print $2; exit }' onbuild/Dockerfile)${VARIANT:+-$VARIANT}" script: - - docker build -t "$image" "${VARIANT:-.}" + - travis_retry docker build -t "$image" "${VARIANT:-.}" - ~/official-images/test/run.sh "$image" # the "onbuild" variant has to happen with the base variant because it's FROM it - - true && [ "$VARIANT" ] || docker build -t "${image}-onbuild" onbuild + - true && [ "$VARIANT" ] || travis_retry docker build -t "${image}-onbuild" onbuild after_script: - docker images From 0053e6ec1b9c5b86e5201def195993518590d22c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Mar 2017 16:03:27 -0800 Subject: [PATCH 033/462] Update to 2.3.3, bundler 1.14.6, rubygems 2.6.10 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index b89d0bd29c..97bff2b301 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 9ec77b4c3b..3ceb84f8fd 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 521eb472bd..a0477dbfc8 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" From 1c70fd4133287f2273a0cd890a21c91d8da98094 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Mar 2017 16:03:28 -0800 Subject: [PATCH 034/462] Update to 2.4.0, bundler 1.14.6, rubygems 2.6.10 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 8be0613826..b2c78fd0c2 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 79fea1a8b6..fdeef9787f 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 9b215d4251..f8b85fde48 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" From fdfa234d2264af31a45af27c782844761dc4cbd0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Mar 2017 16:03:28 -0800 Subject: [PATCH 035/462] Update to 2.2.6, bundler 1.14.6, rubygems 2.6.10 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 09b7a9376b..42d31d26aa 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 3680f10f95..4b277e4eaf 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index e3a036a62d..6aef4f0036 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" From daf4be52f413ad4121f9366f5e1b9a02f763f7b1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Mar 2017 16:03:28 -0800 Subject: [PATCH 036/462] Update to 2.1.10, bundler 1.14.6, rubygems 2.6.10 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index a7b9592246..2109000afa 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -54,7 +54,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 63f4591a79..948361d391 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -90,7 +90,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index ab154d7fe3..62196662ed 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -77,7 +77,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.5 +ENV BUNDLER_VERSION 1.14.6 RUN gem install bundler --version "$BUNDLER_VERSION" From 7a3e1295bbc840c350fc37d406692301b27f4e86 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Mar 2017 22:03:25 -0700 Subject: [PATCH 037/462] Update to 2.3.3, bundler 1.14.6, rubygems 2.6.11 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 97bff2b301..519e06dfe5 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 3ceb84f8fd..58d30135cb 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index a0477dbfc8..076eb84afd 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 5a967fab59319d95fd80e3956d1eeb54a66f9d77 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Mar 2017 22:03:26 -0700 Subject: [PATCH 038/462] Update to 2.4.0, bundler 1.14.6, rubygems 2.6.11 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index b2c78fd0c2..a13b91b970 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index fdeef9787f..8aa86d6ae5 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index f8b85fde48..c4e604c0fb 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 1f59d1d363dd65945a1feae08da2518ea934c334 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Mar 2017 22:03:26 -0700 Subject: [PATCH 039/462] Update to 2.2.6, bundler 1.14.6, rubygems 2.6.11 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 42d31d26aa..81a3c17935 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 4b277e4eaf..557dd446a5 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 6aef4f0036..d3d957337e 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From d2e8fbec715d6adab99835cb4c7fd5acb7149a51 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Mar 2017 22:03:26 -0700 Subject: [PATCH 040/462] Update to 2.1.10, bundler 1.14.6, rubygems 2.6.11 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 2109000afa..edb1e8f65e 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 948361d391..6fcb47b31d 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 62196662ed..54a50572bd 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.10 +ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From e98bec810e6f1bd88ad0106f2e3b3f3291f5f5bb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Mar 2017 10:03:31 -0700 Subject: [PATCH 041/462] Update to 2.4.1, bundler 1.14.6, rubygems 2.6.11 --- 2.4/Dockerfile | 4 ++-- 2.4/alpine/Dockerfile | 4 ++-- 2.4/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index a13b91b970..065f6592f2 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 8aa86d6ae5..bf7d706bb9 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index c4e604c0fb..6ccc727fa9 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby From 1f028a535fe8e97b86f99899afd08b1b1df1406c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 Mar 2017 22:03:40 -0700 Subject: [PATCH 042/462] Update to 2.3.4, bundler 1.14.6, rubygems 2.6.11 --- 2.3/Dockerfile | 4 ++-- 2.3/alpine/Dockerfile | 4 ++-- 2.3/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 519e06dfe5..c25f2cc3d6 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc +ENV RUBY_VERSION 2.3.4 +ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 58d30135cb..77a1711c8c 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc +ENV RUBY_VERSION 2.3.4 +ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 076eb84afd..9943c2ed92 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc +ENV RUBY_VERSION 2.3.4 +ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby From 8e83e621cc71c4f55b7f1d62e47ec9b56258c740 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 Mar 2017 22:03:40 -0700 Subject: [PATCH 043/462] Update to 2.2.7, bundler 1.14.6, rubygems 2.6.11 --- 2.2/Dockerfile | 4 ++-- 2.2/alpine/Dockerfile | 4 ++-- 2.2/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 81a3c17935..ba0032c15b 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 +ENV RUBY_VERSION 2.2.7 +ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 557dd446a5..41e46ebb03 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 +ENV RUBY_VERSION 2.2.7 +ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index d3d957337e..72b525199e 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 +ENV RUBY_VERSION 2.2.7 +ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 ENV RUBYGEMS_VERSION 2.6.11 # some of ruby's build scripts are written in ruby From f47162319baa20972289786bea2e7498d04a8e82 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 30 Apr 2017 22:03:32 -0700 Subject: [PATCH 044/462] Update to 2.3.4, bundler 1.14.6, rubygems 2.6.12 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index c25f2cc3d6..8ea6ad77ed 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 77a1711c8c..fb447de9a3 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 9943c2ed92..75ac3cd52c 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From fbb4b1683e3689efcf1bf3899125f9f6ec1ba84b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 30 Apr 2017 22:03:32 -0700 Subject: [PATCH 045/462] Update to 2.4.1, bundler 1.14.6, rubygems 2.6.12 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 065f6592f2..d7d9d737a6 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index bf7d706bb9..b23c37e0c8 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 6ccc727fa9..0abf42cbd4 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From f71f396078ea28a60d0b4cb805ef6d3d86419989 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 30 Apr 2017 22:03:32 -0700 Subject: [PATCH 046/462] Update to 2.2.7, bundler 1.14.6, rubygems 2.6.12 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index ba0032c15b..03746918da 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 41e46ebb03..856431a135 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 72b525199e..b78e334691 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 1b6455cc7246264f27232fe971253d083ad0aedb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 30 Apr 2017 22:03:32 -0700 Subject: [PATCH 047/462] Update to 2.1.10, bundler 1.14.6, rubygems 2.6.12 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index edb1e8f65e..eb5a0409ed 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 6fcb47b31d..7906127217 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 54a50572bd..b5350e6c6d 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.11 +ENV RUBYGEMS_VERSION 2.6.12 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From be55938d970a392e7d41f17131a091b0a9f4bebc Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 8 May 2017 19:53:33 -0700 Subject: [PATCH 048/462] Add explicit "--build" to our "./configure" invocations --- 2.1/Dockerfile | 9 +++++++-- 2.1/alpine/Dockerfile | 11 ++++++++--- 2.1/slim/Dockerfile | 9 +++++++-- 2.2/Dockerfile | 9 +++++++-- 2.2/alpine/Dockerfile | 11 ++++++++--- 2.2/slim/Dockerfile | 9 +++++++-- 2.3/Dockerfile | 9 +++++++-- 2.3/alpine/Dockerfile | 11 ++++++++--- 2.3/slim/Dockerfile | 9 +++++++-- 2.4/Dockerfile | 9 +++++++-- 2.4/alpine/Dockerfile | 11 ++++++++--- 2.4/slim/Dockerfile | 9 +++++++-- Dockerfile-alpine.template | 11 ++++++++--- Dockerfile-slim.template | 9 +++++++-- Dockerfile.template | 9 +++++++-- 15 files changed, 110 insertions(+), 35 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index eb5a0409ed..16de059e84 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -18,6 +18,7 @@ RUN set -ex \ \ && buildDeps=' \ bison \ + dpkg-dev \ libgdbm-dev \ ruby \ ' \ @@ -44,8 +45,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 7906127217..6d8d835d9a 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ bzip2-dev \ ca-certificates \ coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ glib-dev \ @@ -63,10 +64,14 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # the configure script does not detect isnan/isinf as macros - && ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - ./configure --disable-install-doc --enable-shared \ - && make -j"$(getconf _NPROCESSORS_ONLN)" \ + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index b5350e6c6d..23dd34ada2 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ && buildDeps=' \ autoconf \ bison \ + dpkg-dev \ gcc \ libbz2-dev \ libgdbm-dev \ @@ -67,8 +68,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 03746918da..6ffa3522c0 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -18,6 +18,7 @@ RUN set -ex \ \ && buildDeps=' \ bison \ + dpkg-dev \ libgdbm-dev \ ruby \ ' \ @@ -44,8 +45,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 856431a135..8dce338be6 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ bzip2-dev \ ca-certificates \ coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ glib-dev \ @@ -63,10 +64,14 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # the configure script does not detect isnan/isinf as macros - && ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - ./configure --disable-install-doc --enable-shared \ - && make -j"$(getconf _NPROCESSORS_ONLN)" \ + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index b78e334691..369ed4aa98 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ && buildDeps=' \ autoconf \ bison \ + dpkg-dev \ gcc \ libbz2-dev \ libgdbm-dev \ @@ -67,8 +68,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 8ea6ad77ed..544e368beb 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -18,6 +18,7 @@ RUN set -ex \ \ && buildDeps=' \ bison \ + dpkg-dev \ libgdbm-dev \ ruby \ ' \ @@ -44,8 +45,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index fb447de9a3..23a72b9e9d 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ bzip2-dev \ ca-certificates \ coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ glib-dev \ @@ -63,10 +64,14 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # the configure script does not detect isnan/isinf as macros - && ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - ./configure --disable-install-doc --enable-shared \ - && make -j"$(getconf _NPROCESSORS_ONLN)" \ + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 75ac3cd52c..c0b57ffb5a 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ && buildDeps=' \ autoconf \ bison \ + dpkg-dev \ gcc \ libbz2-dev \ libgdbm-dev \ @@ -67,8 +68,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.4/Dockerfile b/2.4/Dockerfile index d7d9d737a6..cb90faff04 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -18,6 +18,7 @@ RUN set -ex \ \ && buildDeps=' \ bison \ + dpkg-dev \ libgdbm-dev \ ruby \ ' \ @@ -44,8 +45,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index b23c37e0c8..c2c1ee98bd 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -24,6 +24,7 @@ RUN set -ex \ bzip2-dev \ ca-certificates \ coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ glib-dev \ @@ -63,10 +64,14 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # the configure script does not detect isnan/isinf as macros - && ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - ./configure --disable-install-doc --enable-shared \ - && make -j"$(getconf _NPROCESSORS_ONLN)" \ + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 0abf42cbd4..f2492256ec 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex \ && buildDeps=' \ autoconf \ bison \ + dpkg-dev \ gcc \ libbz2-dev \ libgdbm-dev \ @@ -67,8 +68,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8880bad536..cf4ff8e2fa 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,6 +24,7 @@ RUN set -ex \ bzip2-dev \ ca-certificates \ coreutils \ + dpkg-dev dpkg \ gcc \ gdbm-dev \ glib-dev \ @@ -63,10 +64,14 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ # the configure script does not detect isnan/isinf as macros - && ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - ./configure --disable-install-doc --enable-shared \ - && make -j"$(getconf _NPROCESSORS_ONLN)" \ + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && runDeps="$( \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index d0b68f2a66..5f8d036944 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -31,6 +31,7 @@ RUN set -ex \ && buildDeps=' \ autoconf \ bison \ + dpkg-dev \ gcc \ libbz2-dev \ libgdbm-dev \ @@ -67,8 +68,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ diff --git a/Dockerfile.template b/Dockerfile.template index eb61b87b55..c43a4acdb5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -18,6 +18,7 @@ RUN set -ex \ \ && buildDeps=' \ bison \ + dpkg-dev \ libgdbm-dev \ ruby \ ' \ @@ -44,8 +45,12 @@ RUN set -ex \ && mv file.c.new file.c \ \ && autoconf \ - && ./configure --disable-install-doc --enable-shared \ - && make -j"$(nproc)" \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ && make install \ \ && apt-get purge -y --auto-remove $buildDeps \ From d2644c44a3e2a8a07f604dc4667aafdc9ac04cef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 May 2017 10:03:26 -0700 Subject: [PATCH 049/462] Update to 2.3.4, bundler 1.15.0, rubygems 2.6.12 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 544e368beb..e604c1927a 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 23a72b9e9d..c3a7d7d126 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index c0b57ffb5a..f7c277227e 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 869369d45905b991585920ec2f44a81abd08e2e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 May 2017 10:03:26 -0700 Subject: [PATCH 050/462] Update to 2.2.7, bundler 1.15.0, rubygems 2.6.12 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 6ffa3522c0..993ea1b5a7 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 8dce338be6..ba0c8fadd9 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 369ed4aa98..7b6bfc025c 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" From b12b0fd99eed0dc416f3f85d4643be69c44e4fa7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 May 2017 10:03:26 -0700 Subject: [PATCH 051/462] Update to 2.1.10, bundler 1.15.0, rubygems 2.6.12 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 16de059e84..010684a32a 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 6d8d835d9a..a8f86a44f9 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 23dd34ada2..06e2f797f0 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 0011ab1a6a0d7452d81e5e7dde02ac0753e466aa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 May 2017 10:03:26 -0700 Subject: [PATCH 052/462] Update to 2.4.1, bundler 1.15.0, rubygems 2.6.12 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index cb90faff04..58f87e2c29 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index c2c1ee98bd..6b67383514 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index f2492256ec..2f139f4516 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.14.6 +ENV BUNDLER_VERSION 1.15.0 RUN gem install bundler --version "$BUNDLER_VERSION" From 21bc2bf9f98aa749f1bd85d190cf0991dac87fc9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Jun 2017 11:03:20 +0000 Subject: [PATCH 053/462] Update to 2.4.1, bundler 1.15.1, rubygems 2.6.12 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 58f87e2c29..143dfe333b 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 6b67383514..a9128221a4 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 2f139f4516..b2e072e240 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" From 09c6a1602c111cf0cc83bf1df3186a85314ce398 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Jun 2017 11:03:20 +0000 Subject: [PATCH 054/462] Update to 2.3.4, bundler 1.15.1, rubygems 2.6.12 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index e604c1927a..85bc08c0d8 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index c3a7d7d126..5cc1068878 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index f7c277227e..03ebd25918 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" From 82b764e1635acbfcce392d4c0cb6f703a739e173 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Jun 2017 11:03:20 +0000 Subject: [PATCH 055/462] Update to 2.2.7, bundler 1.15.1, rubygems 2.6.12 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 993ea1b5a7..f26ce0aaba 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index ba0c8fadd9..29992eeea7 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 7b6bfc025c..26bab04a7a 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" From c5693b25aa865489fee130e572a3f11bccebd21b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Jun 2017 11:03:20 +0000 Subject: [PATCH 056/462] Update to 2.1.10, bundler 1.15.1, rubygems 2.6.12 --- 2.1/Dockerfile | 2 +- 2.1/alpine/Dockerfile | 2 +- 2.1/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 010684a32a..ff90ed55b0 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index a8f86a44f9..31dbb4743c 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 06e2f797f0..cd31b70e4b 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.0 +ENV BUNDLER_VERSION 1.15.1 RUN gem install bundler --version "$BUNDLER_VERSION" From 48ad4b7d1c2d581ab2426b460e331a5ea023425a Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 15 Jun 2017 15:49:20 -0700 Subject: [PATCH 057/462] Add explicit multiarch support in "generate-stackbrew-library.sh" --- generate-stackbrew-library.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index f6535b3292..e94e9e081a 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -33,6 +33,22 @@ dirCommit() { ) } +getArches() { + local repo="$1"; shift + local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' + + eval "declare -A -g parentRepoToArches=( $( + find -name 'Dockerfile' -exec awk ' + toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ { + print "'"$officialImagesUrl"'" $2 + } + ' '{}' + \ + | sort -u \ + | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' + ) )" +} +getArches 'ruby' + cat <<-EOH # this file is generated via https://github.com/docker-library/ruby/blob/$(fileCommit "$self")/$self @@ -51,6 +67,9 @@ join() { for version in "${versions[@]}"; do commit="$(dirCommit "$version")" + parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" + arches="${parentRepoToArches[$parent]}" + fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" versionAliases=( @@ -62,6 +81,7 @@ for version in "${versions[@]}"; do echo cat <<-EOE Tags: $(join ', ' "${versionAliases[@]}") + Architectures: $(join ', ' $arches) GitCommit: $commit Directory: $version EOE @@ -74,9 +94,18 @@ for version in "${versions[@]}"; do variantAliases=( "${versionAliases[@]/%/-$variant}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) + case "$variant" in + onbuild) variantArches="$arches" ;; + *) + variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")" + variantArches="${parentRepoToArches[$variantParent]}" + ;; + esac + echo cat <<-EOE Tags: $(join ', ' "${variantAliases[@]}") + Architectures: $(join ', ' $variantArches) GitCommit: $commit Directory: $version/$variant EOE From 44c06085695b3654999e2fa23c744c091551883b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 5 Jul 2017 11:06:16 -0700 Subject: [PATCH 058/462] Remove 2.1 (EOL as of 2017-03-31; see https://www.ruby-lang.org/en/downloads/branches/) --- .travis.yml | 3 -- 2.1/Dockerfile | 77 ---------------------------- 2.1/alpine/Dockerfile | 113 ----------------------------------------- 2.1/onbuild/Dockerfile | 13 ----- 2.1/slim/Dockerfile | 100 ------------------------------------ 5 files changed, 306 deletions(-) delete mode 100644 2.1/Dockerfile delete mode 100644 2.1/alpine/Dockerfile delete mode 100644 2.1/onbuild/Dockerfile delete mode 100644 2.1/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 6d294e9dd5..c163b2ce76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,6 @@ env: - VERSION=2.2 VARIANT= - VERSION=2.2 VARIANT=slim - VERSION=2.2 VARIANT=alpine - - VERSION=2.1 VARIANT= - - VERSION=2.1 VARIANT=slim - - VERSION=2.1 VARIANT=alpine install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.1/Dockerfile b/2.1/Dockerfile deleted file mode 100644 index ff90ed55b0..0000000000 --- a/2.1/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -FROM buildpack-deps:jessie - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.1 -ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.12 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.1 - -RUN gem install bundler --version "$BUNDLER_VERSION" - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile deleted file mode 100644 index 31dbb4743c..0000000000 --- a/2.1/alpine/Dockerfile +++ /dev/null @@ -1,113 +0,0 @@ -FROM alpine:3.4 - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.1 -ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.12 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - yaml-dev \ - zlib-dev \ - xz \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ - | sort -u \ - )" \ - && apk add --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - openssl-dev \ - yaml-dev \ - procps \ - zlib-dev \ - && apk del .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.1 - -RUN gem install bundler --version "$BUNDLER_VERSION" - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] diff --git a/2.1/onbuild/Dockerfile b/2.1/onbuild/Dockerfile deleted file mode 100644 index 9a9bdb7b6b..0000000000 --- a/2.1/onbuild/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:2.1 - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile deleted file mode 100644 index cd31b70e4b..0000000000 --- a/2.1/slim/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM debian:jessie - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgdbm3 \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.1 -ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 -ENV RUBYGEMS_VERSION 2.6.12 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.1 - -RUN gem install bundler --version "$BUNDLER_VERSION" - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] From 8954b9635b143504e2fa21459cc8ce809d388242 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Jul 2017 23:03:58 +0000 Subject: [PATCH 059/462] Update to 2.4.1, bundler 1.15.2, rubygems 2.6.12 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 143dfe333b..9e7de35672 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index a9128221a4..29f0236f8f 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index b2e072e240..bc4e241f4c 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" From b1a072ca6473efdb849f38eebe206f73c6f8578f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Jul 2017 23:03:58 +0000 Subject: [PATCH 060/462] Update to 2.2.7, bundler 1.15.2, rubygems 2.6.12 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index f26ce0aaba..4760b3a7d0 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 29992eeea7..b572b2c605 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 26bab04a7a..ab02341181 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" From c46f549b57d34a16d0cbbead68eae188815b30a5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Jul 2017 23:03:58 +0000 Subject: [PATCH 061/462] Update to 2.3.4, bundler 1.15.2, rubygems 2.6.12 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 85bc08c0d8..8238c1a1d3 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 5cc1068878..df57e86452 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 03ebd25918..b2a9a99640 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.1 +ENV BUNDLER_VERSION 1.15.2 RUN gem install bundler --version "$BUNDLER_VERSION" From 1824c6ec7555c92c61d335136da9a6fb6665de2a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jul 2017 23:03:54 +0000 Subject: [PATCH 062/462] Update to 2.4.1, bundler 1.15.3, rubygems 2.6.12 --- 2.4/Dockerfile | 2 +- 2.4/alpine/Dockerfile | 2 +- 2.4/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 9e7de35672..beed0c1d90 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 29f0236f8f..d6b1bee1db 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index bc4e241f4c..c9ef211016 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" From ff427d10f40d1e19d2581346610ef47a83c4b8dc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jul 2017 23:03:54 +0000 Subject: [PATCH 063/462] Update to 2.2.7, bundler 1.15.3, rubygems 2.6.12 --- 2.2/Dockerfile | 2 +- 2.2/alpine/Dockerfile | 2 +- 2.2/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 4760b3a7d0..a84fc3ad37 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index b572b2c605..01428ed677 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index ab02341181..65d9fd3c49 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" From 00ade5b52c4d0a3400cba91e3972cf950b6854f7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jul 2017 23:03:54 +0000 Subject: [PATCH 064/462] Update to 2.3.4, bundler 1.15.3, rubygems 2.6.12 --- 2.3/Dockerfile | 2 +- 2.3/alpine/Dockerfile | 2 +- 2.3/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 8238c1a1d3..d65135faab 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index df57e86452..60a0c4d5e2 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index b2a9a99640..362c276bab 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -82,7 +82,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.2 +ENV BUNDLER_VERSION 1.15.3 RUN gem install bundler --version "$BUNDLER_VERSION" From a6918175fd506b46bf2d8f899f4faa40e72296fb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 31 Jul 2017 16:48:09 -0700 Subject: [PATCH 065/462] Add explicit "jessie" and "alpine3.4" aliases --- .travis.yml | 39 ++++++---- 2.2/{alpine => alpine3.4}/Dockerfile | 0 2.2/{ => jessie}/Dockerfile | 0 2.2/{ => jessie}/onbuild/Dockerfile | 0 2.2/{ => jessie}/slim/Dockerfile | 0 2.3/{alpine => alpine3.4}/Dockerfile | 0 2.3/{ => jessie}/Dockerfile | 0 2.3/{ => jessie}/onbuild/Dockerfile | 0 2.3/{ => jessie}/slim/Dockerfile | 0 2.4/{alpine => alpine3.4}/Dockerfile | 0 2.4/{ => jessie}/Dockerfile | 0 2.4/{ => jessie}/onbuild/Dockerfile | 0 2.4/{ => jessie}/slim/Dockerfile | 0 Dockerfile-alpine.template | 2 +- ...ile.template => Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- generate-stackbrew-library.sh | 78 ++++++++++++------- update.sh | 51 ++++++++---- 18 files changed, 113 insertions(+), 61 deletions(-) rename 2.2/{alpine => alpine3.4}/Dockerfile (100%) rename 2.2/{ => jessie}/Dockerfile (100%) rename 2.2/{ => jessie}/onbuild/Dockerfile (100%) rename 2.2/{ => jessie}/slim/Dockerfile (100%) rename 2.3/{alpine => alpine3.4}/Dockerfile (100%) rename 2.3/{ => jessie}/Dockerfile (100%) rename 2.3/{ => jessie}/onbuild/Dockerfile (100%) rename 2.3/{ => jessie}/slim/Dockerfile (100%) rename 2.4/{alpine => alpine3.4}/Dockerfile (100%) rename 2.4/{ => jessie}/Dockerfile (100%) rename 2.4/{ => jessie}/onbuild/Dockerfile (100%) rename 2.4/{ => jessie}/slim/Dockerfile (100%) rename Dockerfile.template => Dockerfile-debian.template (98%) diff --git a/.travis.yml b/.travis.yml index c163b2ce76..c9ca295a59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,29 +2,38 @@ language: bash services: docker env: - - VERSION=2.4 VARIANT= - - VERSION=2.4 VARIANT=slim - - VERSION=2.4 VARIANT=alpine - - VERSION=2.3 VARIANT= - - VERSION=2.3 VARIANT=slim - - VERSION=2.3 VARIANT=alpine - - VERSION=2.2 VARIANT= - - VERSION=2.2 VARIANT=slim - - VERSION=2.2 VARIANT=alpine + - VERSION=2.4 VARIANT=jessie + - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.4 + - VERSION=2.3 VARIANT=jessie + - VERSION=2.3 VARIANT=jessie/slim + - VERSION=2.3 VARIANT=alpine3.4 + - VERSION=2.2 VARIANT=jessie + - VERSION=2.2 VARIANT=jessie/slim + - VERSION=2.2 VARIANT=alpine3.4 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images before_script: - env | sort - - cd "$VERSION" - - image="$(awk '$1 == "FROM" { print $2; exit }' onbuild/Dockerfile)${VARIANT:+-$VARIANT}" + - cd "$VERSION/$VARIANT" + - slash='/'; image="ruby:${VERSION}-${VARIANT//$slash/-}" script: - - travis_retry docker build -t "$image" "${VARIANT:-.}" - - ~/official-images/test/run.sh "$image" -# the "onbuild" variant has to happen with the base variant because it's FROM it - - true && [ "$VARIANT" ] || travis_retry docker build -t "${image}-onbuild" onbuild + - | + ( + set -Eeuo pipefail + set -x + travis_retry docker build -t "$image" . + ~/official-images/test/run.sh "$image" + if [ -d onbuild ]; then + onbuildFrom="$(awk 'toupper($1) == "FROM" { print $2; exit }' onbuild/Dockerfile)" + docker tag "$image" "$onbuildFrom" + docker build -t "$image-onbuild" onbuild + ~/official-images/test/run.sh "$image-onbuild" + fi + ) after_script: - docker images diff --git a/2.2/alpine/Dockerfile b/2.2/alpine3.4/Dockerfile similarity index 100% rename from 2.2/alpine/Dockerfile rename to 2.2/alpine3.4/Dockerfile diff --git a/2.2/Dockerfile b/2.2/jessie/Dockerfile similarity index 100% rename from 2.2/Dockerfile rename to 2.2/jessie/Dockerfile diff --git a/2.2/onbuild/Dockerfile b/2.2/jessie/onbuild/Dockerfile similarity index 100% rename from 2.2/onbuild/Dockerfile rename to 2.2/jessie/onbuild/Dockerfile diff --git a/2.2/slim/Dockerfile b/2.2/jessie/slim/Dockerfile similarity index 100% rename from 2.2/slim/Dockerfile rename to 2.2/jessie/slim/Dockerfile diff --git a/2.3/alpine/Dockerfile b/2.3/alpine3.4/Dockerfile similarity index 100% rename from 2.3/alpine/Dockerfile rename to 2.3/alpine3.4/Dockerfile diff --git a/2.3/Dockerfile b/2.3/jessie/Dockerfile similarity index 100% rename from 2.3/Dockerfile rename to 2.3/jessie/Dockerfile diff --git a/2.3/onbuild/Dockerfile b/2.3/jessie/onbuild/Dockerfile similarity index 100% rename from 2.3/onbuild/Dockerfile rename to 2.3/jessie/onbuild/Dockerfile diff --git a/2.3/slim/Dockerfile b/2.3/jessie/slim/Dockerfile similarity index 100% rename from 2.3/slim/Dockerfile rename to 2.3/jessie/slim/Dockerfile diff --git a/2.4/alpine/Dockerfile b/2.4/alpine3.4/Dockerfile similarity index 100% rename from 2.4/alpine/Dockerfile rename to 2.4/alpine3.4/Dockerfile diff --git a/2.4/Dockerfile b/2.4/jessie/Dockerfile similarity index 100% rename from 2.4/Dockerfile rename to 2.4/jessie/Dockerfile diff --git a/2.4/onbuild/Dockerfile b/2.4/jessie/onbuild/Dockerfile similarity index 100% rename from 2.4/onbuild/Dockerfile rename to 2.4/jessie/onbuild/Dockerfile diff --git a/2.4/slim/Dockerfile b/2.4/jessie/slim/Dockerfile similarity index 100% rename from 2.4/slim/Dockerfile rename to 2.4/jessie/slim/Dockerfile diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cf4ff8e2fa..da8df8a20e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM alpine:%%PLACEHOLDER%% # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/Dockerfile.template b/Dockerfile-debian.template similarity index 98% rename from Dockerfile.template rename to Dockerfile-debian.template index c43a4acdb5..9778402961 100644 --- a/Dockerfile.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie +FROM buildpack-deps:%%PLACEHOLDER%% # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 5f8d036944..3f3249182c 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:%%PLACEHOLDER%% RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e94e9e081a..b7265a3e9b 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,16 +1,32 @@ -#!/bin/bash -set -eu +#!/usr/bin/env bash +set -Eeuo pipefail declare -A aliases=( [2.4]='2 latest' ) +defaultDebianSuite='stretch' +declare -A debianSuites=( + [2.2]='jessie' + [2.3]='jessie' + [2.4]='jessie' +) +defaultAlpineVersion='3.6' +declare -A alpineVersions=( + [2.2]='3.4' + [2.3]='3.4' + [2.4]='3.4' +) + self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( */ ) versions=( "${versions[@]%/}" ) +# sort version numbers with highest first +IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS + # get the most recent commit which modified any of "$@" fileCommit() { git log -1 --format='format:%H' HEAD -- "$@" @@ -37,7 +53,7 @@ getArches() { local repo="$1"; shift local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' - eval "declare -A -g parentRepoToArches=( $( + eval "declare -g -A parentRepoToArches=( $( find -name 'Dockerfile' -exec awk ' toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ { print "'"$officialImagesUrl"'" $2 @@ -65,39 +81,47 @@ join() { } for version in "${versions[@]}"; do - commit="$(dirCommit "$version")" + debianSuite="${debianSuites[$version]:-$defaultDebianSuite}" + alpineVersion="${alpineVersions[$version]:-$defaultAlpineVersion}" - parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" - arches="${parentRepoToArches[$parent]}" + for v in \ + {stretch,jessie}{,/slim,/onbuild} \ + alpine{3.6,3.4} \ + ; do + dir="$version/$v" + variant="$(basename "$v")" - fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" + [ -f "$dir/Dockerfile" ] || continue - versionAliases=( - $fullVersion - $version - ${aliases[$version]:-} - ) - - echo - cat <<-EOE - Tags: $(join ', ' "${versionAliases[@]}") - Architectures: $(join ', ' $arches) - GitCommit: $commit - Directory: $version - EOE + commit="$(dirCommit "$dir")" - for variant in slim alpine onbuild; do - [ -f "$version/$variant/Dockerfile" ] || continue + versionDockerfile="$dir/Dockerfile" + if [ "$variant" = 'onbuild' ]; then + versionDockerfile="$(dirname "$dir")/Dockerfile" + fi + fullVersion="$(git show "$commit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" - commit="$(dirCommit "$version/$variant")" + versionAliases=( + $fullVersion + $version + ${aliases[$version]:-} + ) variantAliases=( "${versionAliases[@]/%/-$variant}" ) + if [ "$variant" = "$debianSuite" ]; then + variantAliases+=( "${versionAliases[@]}" ) + elif [ "$variant" = "alpine${alpineVersion}" ]; then + variantAliases+=( "${versionAliases[@]/%/-alpine}" ) + fi variantAliases=( "${variantAliases[@]//latest-/}" ) - case "$variant" in - onbuild) variantArches="$arches" ;; + case "$v" in + */onbuild) + variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$(dirname "$dir")/Dockerfile")" + variantArches="${parentRepoToArches[$variantParent]}" + ;; *) - variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")" + variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" variantArches="${parentRepoToArches[$variantParent]}" ;; esac @@ -107,7 +131,7 @@ for version in "${versions[@]}"; do Tags: $(join ', ' "${variantAliases[@]}") Architectures: $(join ', ' $variantArches) GitCommit: $commit - Directory: $version/$variant + Directory: $dir EOE done done diff --git a/update.sh b/update.sh index 65330bfc86..3333becfd2 100755 --- a/update.sh +++ b/update.sh @@ -1,5 +1,5 @@ -#!/bin/bash -set -eo pipefail +#!/usr/bin/env bash +set -Eeuo pipefail cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -24,7 +24,7 @@ for version in "${versions[@]}"; do if [ "$rcVersion" != "$version" ]; then rcGrepV= fi - + IFS=$'\n'; allVersions=( $(curl -fsSL --compressed "https://cache.ruby-lang.org/pub/ruby/$rcVersion/" \ | grep -E 'Ruby $fullVersion" -A 2 | awk -F '"' '$1 == " "$version/$variant/Dockerfile" - if [ "$variant" != 'onbuild' ]; then - travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv" - fi + + for v in \ + alpine{3.4,3.6} \ + {jessie,stretch}{/slim,/onbuild,} \ + ; do + dir="$version/$v" + variant="$(basename "$v")" + + [ -d "$dir" ] || continue + + case "$variant" in + slim|onbuild|windowsservercore) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;; + alpine*) template='alpine'; tag="${variant#alpine}" ;; + *) template='debian'; tag="$variant" ;; + esac + template="Dockerfile-${template}.template" + + sed -r \ + -e 's!%%VERSION%%!'"$version"'!g' \ + -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ + -e 's!%%SHA256%%!'"$shaVal"'!g' \ + -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ + -e 's!%%BUNDLER%%!'"$bundler"'!g' \ + -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ + "$template" > "$dir/Dockerfile" + + case "$v" in + */onbuild) ;; + *) + travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv" + ;; + esac done done From 05a198ca89a5cb563a857d0d6f060abcbd6eb8e4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 3 Aug 2017 14:07:41 -0700 Subject: [PATCH 066/462] Adjust "slim" variants to also include hyper-explicit aliases ("slim-jessie", etc) --- generate-stackbrew-library.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b7265a3e9b..6e4d158791 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -91,6 +91,12 @@ for version in "${versions[@]}"; do dir="$version/$v" variant="$(basename "$v")" + if [ "$variant" = 'slim' ]; then + # convert "slim" into "slim-jessie" + # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 + variant="$variant-$(basename "$(dirname "$v")")" + fi + [ -f "$dir/Dockerfile" ] || continue commit="$(dirCommit "$dir")" @@ -108,11 +114,17 @@ for version in "${versions[@]}"; do ) variantAliases=( "${versionAliases[@]/%/-$variant}" ) - if [ "$variant" = "$debianSuite" ]; then - variantAliases+=( "${versionAliases[@]}" ) - elif [ "$variant" = "alpine${alpineVersion}" ]; then - variantAliases+=( "${versionAliases[@]/%/-alpine}" ) - fi + case "$variant" in + "$debianSuite") + variantAliases+=( "${versionAliases[@]}" ) + ;; + *-"$debianSuite") + variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" ) + ;; + "alpine${alpineVersion}") + variantAliases+=( "${versionAliases[@]/%/-alpine}" ) + ;; + esac variantAliases=( "${variantAliases[@]//latest-/}" ) case "$v" in From 98d971fb71e696bf6783388d0e2c4171c97f0459 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Aug 2017 12:41:04 -0700 Subject: [PATCH 067/462] Add "stretch" variants of 2.4 --- .travis.yml | 2 + 2.4/stretch/Dockerfile | 77 +++++++++++++++++++++++++ 2.4/stretch/onbuild/Dockerfile | 13 +++++ 2.4/stretch/slim/Dockerfile | 100 +++++++++++++++++++++++++++++++++ 4 files changed, 192 insertions(+) create mode 100644 2.4/stretch/Dockerfile create mode 100644 2.4/stretch/onbuild/Dockerfile create mode 100644 2.4/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index c9ca295a59..6400106be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: bash services: docker env: + - VERSION=2.4 VARIANT=stretch + - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim - VERSION=2.4 VARIANT=alpine3.4 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile new file mode 100644 index 0000000000..7b1046695a --- /dev/null +++ b/2.4/stretch/Dockerfile @@ -0,0 +1,77 @@ +FROM buildpack-deps:stretch + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBYGEMS_VERSION 2.6.12 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" + +ENV BUNDLER_VERSION 1.15.3 + +RUN gem install bundler --version "$BUNDLER_VERSION" + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.4/stretch/onbuild/Dockerfile b/2.4/stretch/onbuild/Dockerfile new file mode 100644 index 0000000000..0cc4112d64 --- /dev/null +++ b/2.4/stretch/onbuild/Dockerfile @@ -0,0 +1,13 @@ +FROM ruby:2.4 + +# throw errors if Gemfile has been modified since Gemfile.lock +RUN bundle config --global frozen 1 + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +ONBUILD COPY Gemfile /usr/src/app/ +ONBUILD COPY Gemfile.lock /usr/src/app/ +ONBUILD RUN bundle install + +ONBUILD COPY . /usr/src/app diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile new file mode 100644 index 0000000000..e5286d33d4 --- /dev/null +++ b/2.4/stretch/slim/Dockerfile @@ -0,0 +1,100 @@ +FROM debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgdbm3 \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBYGEMS_VERSION 2.6.12 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" + +ENV BUNDLER_VERSION 1.15.3 + +RUN gem install bundler --version "$BUNDLER_VERSION" + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] From a7a74d43ec21a6e589113be56024df083ff320ab Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Aug 2017 12:42:25 -0700 Subject: [PATCH 068/462] Add "alpine3.6" variant of 2.4 --- .travis.yml | 1 + 2.4/alpine3.6/Dockerfile | 113 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 2.4/alpine3.6/Dockerfile diff --git a/.travis.yml b/.travis.yml index c9ca295a59..a61723f664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ services: docker env: - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.4 VARIANT=alpine3.4 - VERSION=2.3 VARIANT=jessie - VERSION=2.3 VARIANT=jessie/slim diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile new file mode 100644 index 0000000000..56e03188fc --- /dev/null +++ b/2.4/alpine3.6/Dockerfile @@ -0,0 +1,113 @@ +FROM alpine:3.6 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.1 +ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBYGEMS_VERSION 2.6.12 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + yaml-dev \ + zlib-dev \ + xz \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --recursive /usr/local \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + openssl-dev \ + yaml-dev \ + procps \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" + +ENV BUNDLER_VERSION 1.15.3 + +RUN gem install bundler --version "$BUNDLER_VERSION" + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] From 445b7e4b78763ae70ef2951dbd78d777edb68358 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Aug 2017 15:49:48 -0700 Subject: [PATCH 069/462] Make sure "libreadlineX" stays installed --- 2.2/jessie/slim/Dockerfile | 3 +++ 2.3/jessie/slim/Dockerfile | 3 +++ 2.4/jessie/slim/Dockerfile | 3 +++ 2.4/stretch/slim/Dockerfile | 3 +++ Dockerfile-slim.template | 3 +++ 5 files changed, 15 insertions(+) diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 65d9fd3c49..2cbf0aba3d 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -76,6 +76,9 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 362c276bab..fadd38c109 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -76,6 +76,9 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index c9ef211016..815d33acb4 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -76,6 +76,9 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index e5286d33d4..908442235a 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -76,6 +76,9 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 3f3249182c..79b68cb419 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -76,6 +76,9 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ From e219bf6f6a9a24d1b15cccb2c39cbbe3b9029bec Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 7 Aug 2017 09:39:32 -0700 Subject: [PATCH 070/462] Remove "doh" moment --- 2.4/stretch/onbuild/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 2.4/stretch/onbuild/Dockerfile diff --git a/2.4/stretch/onbuild/Dockerfile b/2.4/stretch/onbuild/Dockerfile deleted file mode 100644 index 0cc4112d64..0000000000 --- a/2.4/stretch/onbuild/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:2.4 - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app From ecbfdeb2b71e155222b1d3df0a33685247f00616 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 8 Aug 2017 09:33:44 -0700 Subject: [PATCH 071/462] Switch from "openssl" to "libressl" for Alpine 3.6+ --- 2.2/alpine3.4/Dockerfile | 8 ++++---- 2.3/alpine3.4/Dockerfile | 8 ++++---- 2.4/alpine3.4/Dockerfile | 8 ++++---- 2.4/alpine3.6/Dockerfile | 10 +++++----- Dockerfile-alpine.template | 10 +++++----- update.sh | 4 ++++ 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 01428ed677..4e914e15d1 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -30,20 +30,20 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + openssl \ + openssl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ - openssl \ - openssl-dev \ procps \ readline-dev \ ruby \ tar \ + xz \ yaml-dev \ zlib-dev \ - xz \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ @@ -86,8 +86,8 @@ RUN set -ex \ ca-certificates \ libffi-dev \ openssl-dev \ - yaml-dev \ procps \ + yaml-dev \ zlib-dev \ && apk del .ruby-builddeps \ && cd / \ diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 60a0c4d5e2..8a13059481 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -30,20 +30,20 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + openssl \ + openssl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ - openssl \ - openssl-dev \ procps \ readline-dev \ ruby \ tar \ + xz \ yaml-dev \ zlib-dev \ - xz \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ @@ -86,8 +86,8 @@ RUN set -ex \ ca-certificates \ libffi-dev \ openssl-dev \ - yaml-dev \ procps \ + yaml-dev \ zlib-dev \ && apk del .ruby-builddeps \ && cd / \ diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index d6b1bee1db..fd7f3d760e 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -30,20 +30,20 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + openssl \ + openssl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ - openssl \ - openssl-dev \ procps \ readline-dev \ ruby \ tar \ + xz \ yaml-dev \ zlib-dev \ - xz \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ @@ -86,8 +86,8 @@ RUN set -ex \ ca-certificates \ libffi-dev \ openssl-dev \ - yaml-dev \ procps \ + yaml-dev \ zlib-dev \ && apk del .ruby-builddeps \ && cd / \ diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 56e03188fc..c85f209671 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -30,20 +30,20 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libressl \ + libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ - openssl \ - openssl-dev \ procps \ readline-dev \ ruby \ tar \ + xz \ yaml-dev \ zlib-dev \ - xz \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ @@ -85,9 +85,9 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - openssl-dev \ - yaml-dev \ + libressl-dev \ procps \ + yaml-dev \ zlib-dev \ && apk del .ruby-builddeps \ && cd / \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index da8df8a20e..aacd95d1f9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,20 +30,20 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ + libressl \ + libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ - openssl \ - openssl-dev \ procps \ readline-dev \ ruby \ tar \ + xz \ yaml-dev \ zlib-dev \ - xz \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ @@ -85,9 +85,9 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - openssl-dev \ - yaml-dev \ + libressl-dev \ procps \ + yaml-dev \ zlib-dev \ && apk del .ruby-builddeps \ && cd / \ diff --git a/update.sh b/update.sh index 3333becfd2..462afbda3b 100755 --- a/update.sh +++ b/update.sh @@ -75,6 +75,10 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" + if [ "$variant" = 'alpine3.4' ]; then + sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile" + fi + case "$v" in */onbuild) ;; *) From f9327a002f9f197843829ecccb3aeeec102034d0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 19 Aug 2017 23:03:09 +0000 Subject: [PATCH 072/462] Update to 2.3.4, bundler 1.15.4, rubygems 2.6.12 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 8a13059481..e6596d4bfd 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index d65135faab..77c5b3880c 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index fadd38c109..0c87182917 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -85,7 +85,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" From 627e55f6a1ec8d63b5c3671e25c70bdae412ef56 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 19 Aug 2017 23:03:09 +0000 Subject: [PATCH 073/462] Update to 2.4.1, bundler 1.15.4, rubygems 2.6.12 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index fd7f3d760e..a068e6a01e 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index c85f209671..0df670ae0e 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index beed0c1d90..5a341b5501 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 815d33acb4..754be6b680 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -85,7 +85,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 7b1046695a..c3ec4f6cdd 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 908442235a..9afa1258d9 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -85,7 +85,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" From 5f1f63541ced4c2c87e3441ce2d05a69b71a6912 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 19 Aug 2017 23:03:10 +0000 Subject: [PATCH 074/462] Update to 2.2.7, bundler 1.15.4, rubygems 2.6.12 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 4e914e15d1..a68b9b7c18 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -95,7 +95,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index a84fc3ad37..da59cfec78 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -59,7 +59,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 2cbf0aba3d..5b8bea2285 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -85,7 +85,7 @@ RUN set -ex \ \ && gem update --system "$RUBYGEMS_VERSION" -ENV BUNDLER_VERSION 1.15.3 +ENV BUNDLER_VERSION 1.15.4 RUN gem install bundler --version "$BUNDLER_VERSION" From d2a85bf5a3799c0592140ff66b269c823b813998 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 28 Aug 2017 05:03:10 +0000 Subject: [PATCH 075/462] Update to 2.3.4, bundler 1.15.4, rubygems 2.6.13 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index e6596d4bfd..8a0b6df2a9 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 77c5b3880c..ce279b65d8 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 0c87182917..3b1b3bef78 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.4 ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 135c84979b1401a6963e75f3c95161bfe5be2336 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 28 Aug 2017 05:03:10 +0000 Subject: [PATCH 076/462] Update to 2.4.1, bundler 1.15.4, rubygems 2.6.13 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index a068e6a01e..d7174b4d8f 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 0df670ae0e..6829180e6a 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 5a341b5501..085c886a7c 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 754be6b680..f652161270 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index c3ec4f6cdd..acc0d49d10 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 9afa1258d9..760ca10069 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.1 ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From ab1275096a39d8952d1ede12d0a701cef9cb77d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 28 Aug 2017 05:03:10 +0000 Subject: [PATCH 077/462] Update to 2.2.7, bundler 1.15.4, rubygems 2.6.13 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index a68b9b7c18..db5d2c7a39 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index da59cfec78..edbc9a7074 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 5b8bea2285..71d144c124 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.7 ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 -ENV RUBYGEMS_VERSION 2.6.12 +ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 196445490cf522edae4196f07655fc2dfe85862e Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Wed, 30 Aug 2017 15:48:50 +0300 Subject: [PATCH 078/462] LICENSE: Fixed copyright year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index b384c6e51b..e7208b523c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2014-2015 Docker, Inc. All rights reserved. +Copyright (C) 2014-2017 Docker, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions From 55191f909e7c088960a7000feb3b1c8d329df112 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 5 Sep 2017 10:05:11 -0700 Subject: [PATCH 079/462] Remove support for arm32v5 (takes days to build) --- generate-stackbrew-library.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6e4d158791..36ad9cd072 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -138,6 +138,9 @@ for version in "${versions[@]}"; do ;; esac + # arm32v5 takes _way_ too long to build (on the order of days) + variantArches="$(echo " $variantArches " | sed -r -e 's/ arm32v5//g')" + echo cat <<-EOE Tags: $(join ', ' "${variantAliases[@]}") From beb05c8c3c694e4527effe3e3623120486d0e5ed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Sep 2017 05:03:09 +0000 Subject: [PATCH 080/462] Update to 2.4.2, bundler 1.15.4, rubygems 2.6.13 --- 2.4/alpine3.4/Dockerfile | 4 ++-- 2.4/alpine3.6/Dockerfile | 4 ++-- 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index d7174b4d8f..be255fa956 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 6829180e6a..16a22a6455 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 085c886a7c..f058fe1345 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index f652161270..b63a6eb337 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index acc0d49d10..56265fba18 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 760ca10069..76b5490a57 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.1 -ENV RUBY_DOWNLOAD_SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby From 083a412b5d9da36614b02e36bae39518f7948f04 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 15 Sep 2017 07:58:44 -0700 Subject: [PATCH 081/462] Adjust "update.sh" to also scrape the news page (since the releases page doesn't seem to contain 2.3.5 or 2.2.8, and even 2.4.2 took a while to show up) --- update.sh | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/update.sh b/update.sh index 462afbda3b..3d86d9859b 100755 --- a/update.sh +++ b/update.sh @@ -8,7 +8,9 @@ if [ ${#versions[@]} -eq 0 ]; then versions=( */ ) fi versions=( "${versions[@]%/}" ) -releasePage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" + +releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" +newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page latest_gem_version() { curl -fsSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/' @@ -34,10 +36,25 @@ for version in "${versions[@]}"; do ); unset IFS fullVersion= + shaVal= for tryVersion in "${allVersions[@]}"; do - if echo "$releasePage" | grep -q "Ruby ${tryVersion}<"; then - fullVersion="$tryVersion" - break + if \ + { + versionReleasePage="$(echo "$releasesPage" | grep "Ruby $tryVersion" -A 2 | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ + && [ "$versionReleasePage" ] + } \ + ; then + if \ + shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '/^SHA256:/ { print $2; exit }')" \ + && [ "$shaVal" ] \ + ; then + fullVersion="$tryVersion" + break + fi fi done @@ -45,8 +62,6 @@ for version in "${versions[@]}"; do echo >&2 "warning: cannot determine sha for $version (tried all of ${allVersions[*]}); skipping" continue fi - versionReleasePage="$(echo "$releasePage" | grep "Ruby $fullVersion" -A 2 | awk -F '"' '$1 == " Date: Fri, 15 Sep 2017 15:00:01 +0000 Subject: [PATCH 082/462] Update to 2.3.5, bundler 1.15.4, rubygems 2.6.13 --- 2.3/alpine3.4/Dockerfile | 4 ++-- 2.3/jessie/Dockerfile | 4 ++-- 2.3/jessie/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 8a0b6df2a9..2096297936 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.4 -ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c +ENV RUBY_VERSION 2.3.5 +ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index ce279b65d8..f1ff724e2c 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.4 -ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c +ENV RUBY_VERSION 2.3.5 +ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 3b1b3bef78..1882fb5368 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.4 -ENV RUBY_DOWNLOAD_SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c +ENV RUBY_VERSION 2.3.5 +ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby From c1f97577cd4f73ae0968f417dd74a1fd7a6f0cce Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Sep 2017 15:00:01 +0000 Subject: [PATCH 083/462] Update to 2.2.8, bundler 1.15.4, rubygems 2.6.13 --- 2.2/alpine3.4/Dockerfile | 4 ++-- 2.2/jessie/Dockerfile | 4 ++-- 2.2/jessie/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index db5d2c7a39..5c019e558a 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.7 -ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 +ENV RUBY_VERSION 2.2.8 +ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index edbc9a7074..3c10c89a14 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.7 -ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 +ENV RUBY_VERSION 2.2.8 +ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 71d144c124..7a120c40f4 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.7 -ENV RUBY_DOWNLOAD_SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 +ENV RUBY_VERSION 2.2.8 +ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.13 # some of ruby's build scripts are written in ruby From 2925aed5fe286a35db19fcc770379234a425cc3c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 15 Sep 2017 10:53:33 -0700 Subject: [PATCH 084/462] Update comments with more links --- update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 3d86d9859b..efc43e69f0 100755 --- a/update.sh +++ b/update.sh @@ -10,7 +10,8 @@ fi versions=( "${versions[@]%/}" ) releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" -newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page +newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) +# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well latest_gem_version() { curl -fsSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/' From 076a28bbc35c37078e06636c0dfc8158130959bc Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 15 Sep 2017 11:09:42 -0700 Subject: [PATCH 085/462] Fix "onbuild" commit --- generate-stackbrew-library.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 36ad9cd072..5f21b0e15d 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -102,10 +102,12 @@ for version in "${versions[@]}"; do commit="$(dirCommit "$dir")" versionDockerfile="$dir/Dockerfile" + versionCommit="$commit" if [ "$variant" = 'onbuild' ]; then versionDockerfile="$(dirname "$dir")/Dockerfile" + versionCommit="$(dirCommit "$(dirname "$versionDockerfile")")" fi - fullVersion="$(git show "$commit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" + fullVersion="$(git show "$versionCommit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" versionAliases=( $fullVersion From c9838b69af941637d68bbbaff70fee4402b715cb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 22 Sep 2017 13:23:58 -0700 Subject: [PATCH 086/462] Adjust scanelf to properly remove "ruby-libs" in the "2.4-alpine3.6" image This saves ~11MB of final image size (~79.4MB down to ~68.5MB). --- 2.2/alpine3.4/Dockerfile | 7 +++---- 2.3/alpine3.4/Dockerfile | 7 +++---- 2.4/alpine3.4/Dockerfile | 7 +++---- 2.4/alpine3.6/Dockerfile | 7 +++---- Dockerfile-alpine.template | 7 +++---- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 5c019e558a..a25c71e58a 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .ruby-rundeps $runDeps \ bzip2 \ diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 2096297936..3132595c67 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .ruby-rundeps $runDeps \ bzip2 \ diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index be255fa956..2d2de017dc 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .ruby-rundeps $runDeps \ bzip2 \ diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 16a22a6455..9d5e8ce4d2 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .ruby-rundeps $runDeps \ bzip2 \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index aacd95d1f9..9eccd7b431 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -75,11 +75,10 @@ RUN set -ex \ && make install \ \ && runDeps="$( \ - scanelf --needed --nobanner --recursive /usr/local \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | sort -u \ - | xargs -r apk info --installed \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ && apk add --virtual .ruby-rundeps $runDeps \ bzip2 \ From 35eccb65d277077e9589df5b6d1ac7253eefe4e3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 28 Sep 2017 11:01:06 -0700 Subject: [PATCH 087/462] Re-enable arm32v5 --- generate-stackbrew-library.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5f21b0e15d..2fffd08c36 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -140,9 +140,6 @@ for version in "${versions[@]}"; do ;; esac - # arm32v5 takes _way_ too long to build (on the order of days) - variantArches="$(echo " $variantArches " | sed -r -e 's/ arm32v5//g')" - echo cat <<-EOE Tags: $(join ', ' "${variantAliases[@]}") From 104e3aeadd3c2ea1597be3cd407551faab802ecb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 10 Oct 2017 05:03:11 +0000 Subject: [PATCH 088/462] Update to 2.3.5, bundler 1.15.4, rubygems 2.6.14 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 3132595c67..9b43e0a333 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index f1ff724e2c..a775af9ff5 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 1882fb5368..a81314d538 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9390129c08cc19668fc482edfd7d7c5a890a80eb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 10 Oct 2017 05:03:11 +0000 Subject: [PATCH 089/462] Update to 2.4.2, bundler 1.15.4, rubygems 2.6.14 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 2d2de017dc..09e411bee7 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 9d5e8ce4d2..28ac75504f 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index f058fe1345..57a841690e 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index b63a6eb337..98f5973df9 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 56265fba18..7e63445744 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 76b5490a57..22e9f65464 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 59abfdf2c6aaeab159aeb46c762c178e76900c0f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 10 Oct 2017 05:03:11 +0000 Subject: [PATCH 090/462] Update to 2.2.8, bundler 1.15.4, rubygems 2.6.14 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index a25c71e58a..ccf820b4b4 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 3c10c89a14..f0f3bb389b 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 7a120c40f4..cb0893f18a 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.13 +ENV RUBYGEMS_VERSION 2.6.14 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 6959194971f4f84e9bef2976ae6b8a469fa58dae Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Sun, 22 Oct 2017 08:56:02 +0900 Subject: [PATCH 091/462] Add 2.5-rc builds --- .travis.yml | 3 + 2.2/alpine3.4/Dockerfile | 8 +-- 2.2/jessie/Dockerfile | 8 +-- 2.2/jessie/slim/Dockerfile | 8 +-- 2.3/alpine3.4/Dockerfile | 8 +-- 2.3/jessie/Dockerfile | 8 +-- 2.3/jessie/slim/Dockerfile | 8 +-- 2.4/alpine3.4/Dockerfile | 8 +-- 2.4/alpine3.6/Dockerfile | 8 +-- 2.4/jessie/Dockerfile | 8 +-- 2.4/jessie/slim/Dockerfile | 8 +-- 2.4/stretch/Dockerfile | 8 +-- 2.4/stretch/slim/Dockerfile | 8 +-- 2.5-rc/alpine3.6/Dockerfile | 110 +++++++++++++++++++++++++++++++++ 2.5-rc/stretch/Dockerfile | 75 ++++++++++++++++++++++ 2.5-rc/stretch/slim/Dockerfile | 101 ++++++++++++++++++++++++++++++ Dockerfile-alpine.template | 8 +-- Dockerfile-debian.template | 8 +-- Dockerfile-slim.template | 8 +-- 19 files changed, 334 insertions(+), 75 deletions(-) create mode 100644 2.5-rc/alpine3.6/Dockerfile create mode 100644 2.5-rc/stretch/Dockerfile create mode 100644 2.5-rc/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 3c5f483e69..fbdf65fee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: bash services: docker env: + - VERSION=2.5-rc VARIANT=stretch + - VERSION=2.5-rc VARIANT=stretch/slim + - VERSION=2.5-rc VARIANT=alpine3.6 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index ccf820b4b4..7d8e10ab8c 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -92,11 +93,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index f0f3bb389b..e78f07c001 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,11 +58,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index cb0893f18a..508baea2f5 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -23,6 +23,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,11 +84,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 9b43e0a333..411929d31c 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -92,11 +93,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index a775af9ff5..5e94501d68 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,11 +58,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index a81314d538..7ab7901eb4 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,6 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,11 +84,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 09e411bee7..2986fac1f6 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -92,11 +93,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 28ac75504f..5bc8af5a94 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -92,11 +93,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 57a841690e..8d32eeb757 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,11 +58,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 98f5973df9..549522eaa5 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,6 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,11 +84,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 7e63445744..b8981fdf71 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,6 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,11 +58,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 22e9f65464..d9dd0e828e 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,6 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,11 +84,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION 1.15.4 - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile new file mode 100644 index 0000000000..75b5775855 --- /dev/null +++ b/2.5-rc/alpine3.6/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.6 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5-rc +ENV RUBY_VERSION 2.5.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile new file mode 100644 index 0000000000..cbc1666092 --- /dev/null +++ b/2.5-rc/stretch/Dockerfile @@ -0,0 +1,75 @@ +FROM buildpack-deps:stretch + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5-rc +ENV RUBY_VERSION 2.5.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile new file mode 100644 index 0000000000..87c160b85f --- /dev/null +++ b/2.5-rc/stretch/slim/Dockerfile @@ -0,0 +1,101 @@ +FROM debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgdbm3 \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5-rc +ENV RUBY_VERSION 2.5.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9eccd7b431..e6e6cdbb99 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,6 +11,7 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% +ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -92,11 +93,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION %%BUNDLER%% - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9778402961..d323817e11 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -11,6 +11,7 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% +ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,11 +58,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION %%BUNDLER%% - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 79b68cb419..9825ddd056 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -23,6 +23,7 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% +ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,11 +84,8 @@ RUN set -ex \ && cd / \ && rm -r /usr/src/ruby \ \ - && gem update --system "$RUBYGEMS_VERSION" - -ENV BUNDLER_VERSION %%BUNDLER%% - -RUN gem install bundler --version "$BUNDLER_VERSION" + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force # install things globally, for great justice # and don't create ".bundle" in all our apps From 6bd09a6694ddd921b06cc21d829b6affefa96307 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 24 Oct 2017 09:48:31 -0700 Subject: [PATCH 092/462] Add the "rc" alias for 2.5-rc --- generate-stackbrew-library.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 2fffd08c36..5a81d88feb 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,6 +3,7 @@ set -Eeuo pipefail declare -A aliases=( [2.4]='2 latest' + [2.5-rc]='rc' ) defaultDebianSuite='stretch' From ed50dfb679ca43ef3ece8224da9f29a081cda082 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 31 Oct 2017 23:03:11 +0000 Subject: [PATCH 093/462] Update to 2.5.0-preview1, bundler 1.16.0, rubygems 2.6.14 --- 2.5-rc/alpine3.6/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile index 75b5775855..5e773174ce 100644 --- a/2.5-rc/alpine3.6/Dockerfile +++ b/2.5-rc/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index cbc1666092..3edf75c8c0 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index 87c160b85f..23f21f1fd8 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 7e1c5ff8efecf8991f8fb8298d6fb8f9e992bf4a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 31 Oct 2017 23:03:11 +0000 Subject: [PATCH 094/462] Update to 2.3.5, bundler 1.16.0, rubygems 2.6.14 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 411929d31c..89330fbfbb 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 5e94501d68..28fb25db58 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 7ab7901eb4..5e3fe14a6a 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 8a4631f3750e594f394e4bda97d71999d9439179 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 31 Oct 2017 23:03:11 +0000 Subject: [PATCH 095/462] Update to 2.4.2, bundler 1.16.0, rubygems 2.6.14 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 2986fac1f6..3715ed6b06 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 5bc8af5a94..f68a2c244e 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 8d32eeb757..ec1be1e678 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 549522eaa5..c5b0689eba 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index b8981fdf71..a4922f14f0 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index d9dd0e828e..c98e5c052b 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 54c32e9b3cb131f9bb3e1aed455410669abeda81 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 31 Oct 2017 23:03:11 +0000 Subject: [PATCH 096/462] Update to 2.2.8, bundler 1.16.0, rubygems 2.6.14 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 7d8e10ab8c..8159c1950b 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index e78f07c001..74b9e1664c 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 508baea2f5..4aabd4d695 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From f0d425c10d680eecb9845db709005eb276bb1860 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Nov 2017 11:03:10 +0000 Subject: [PATCH 097/462] Update to 2.2.8, bundler 1.16.0, rubygems 2.7.0 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 8159c1950b..fa7698e56d 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 74b9e1664c..3c4c620902 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 4aabd4d695..7e87b96ff3 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From f528306dffdc55fd082c3ec0d483777a9c046ef0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Nov 2017 11:03:10 +0000 Subject: [PATCH 098/462] Update to 2.5.0-preview1, bundler 1.16.0, rubygems 2.7.0 --- 2.5-rc/alpine3.6/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile index 5e773174ce..6eb3a6d790 100644 --- a/2.5-rc/alpine3.6/Dockerfile +++ b/2.5-rc/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index 3edf75c8c0..d5a7cb1ec5 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index 23f21f1fd8..c514b00481 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 9984daa9247c76a292614d6cd752d513ac1309d9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Nov 2017 11:03:10 +0000 Subject: [PATCH 099/462] Update to 2.4.2, bundler 1.16.0, rubygems 2.7.0 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 3715ed6b06..65d1215132 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index f68a2c244e..4d9fdb9243 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index ec1be1e678..d0f7e2aad9 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index c5b0689eba..4535c1ecc1 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index a4922f14f0..2aa2b32590 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index c98e5c052b..c07ad89ee1 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 58d779d22b18c4a5daad0fb0f11cf81f12a00cba Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Nov 2017 11:03:10 +0000 Subject: [PATCH 100/462] Update to 2.3.5, bundler 1.16.0, rubygems 2.7.0 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 89330fbfbb..4aa1b00fcf 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 28fb25db58..8b3519112d 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 5e3fe14a6a..95e9a9eb4a 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.14 +ENV RUBYGEMS_VERSION 2.7.0 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 9d6c3fe1348a23bb9903fc1e8ed73b800808dbfe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Nov 2017 18:03:13 +0000 Subject: [PATCH 101/462] Update to 2.2.8, bundler 1.16.0, rubygems 2.7.2 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index fa7698e56d..d1aea946d6 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 3c4c620902..bc815e0a42 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 7e87b96ff3..280be68c0e 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 06027e388354d5c61c2a0301a2d31c0301594c9b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Nov 2017 18:03:13 +0000 Subject: [PATCH 102/462] Update to 2.5.0-preview1, bundler 1.16.0, rubygems 2.7.2 --- 2.5-rc/alpine3.6/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile index 6eb3a6d790..da5ad658cc 100644 --- a/2.5-rc/alpine3.6/Dockerfile +++ b/2.5-rc/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index d5a7cb1ec5..baea37607a 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index c514b00481..bc2279a1da 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 73d3ed6b06738a7457a24fba9024cad303829c0a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Nov 2017 18:03:13 +0000 Subject: [PATCH 103/462] Update to 2.4.2, bundler 1.16.0, rubygems 2.7.2 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 65d1215132..b739fa2af6 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 4d9fdb9243..b9476d9cf9 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index d0f7e2aad9..e8a2d12f39 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 4535c1ecc1..1053413cab 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 2aa2b32590..e44221d64a 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index c07ad89ee1..d440c3aeae 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From d3dc5a87e233dd19497cb6a0ce3933cd0340ce32 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Nov 2017 18:03:13 +0000 Subject: [PATCH 104/462] Update to 2.3.5, bundler 1.16.0, rubygems 2.7.2 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 4aa1b00fcf..b8df349cc1 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 8b3519112d..7e2f2f40d9 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 95e9a9eb4a..c28833ec4f 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.0 +ENV RUBYGEMS_VERSION 2.7.2 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 1d57c363d6b25099cac5472c30632e2f92ddab61 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Nov 2017 04:03:11 -0800 Subject: [PATCH 105/462] Update to 2.2.8, bundler 1.16.0, rubygems 2.7.3 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index d1aea946d6..969b20665a 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index bc815e0a42..3dbf756160 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 280be68c0e..fc984a8fea 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.8 ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 0f6af01cc2f8b8d39ea5f2c7e9fb3c413edb93d6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Nov 2017 04:03:11 -0800 Subject: [PATCH 106/462] Update to 2.5.0-preview1, bundler 1.16.0, rubygems 2.7.3 --- 2.5-rc/alpine3.6/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile index da5ad658cc..f3c061cb5c 100644 --- a/2.5-rc/alpine3.6/Dockerfile +++ b/2.5-rc/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index baea37607a..33ce83d851 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index bc2279a1da..c305ca1078 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-preview1 ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From 9ecd8dcd7c5303b1c5772446d8fea938f3cd233c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Nov 2017 04:03:11 -0800 Subject: [PATCH 107/462] Update to 2.4.2, bundler 1.16.0, rubygems 2.7.3 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index b739fa2af6..2318fb362b 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index b9476d9cf9..7912ff4bdc 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index e8a2d12f39..286c3fe616 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 1053413cab..f8c22b5162 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e44221d64a..ba8c44fe6c 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index d440c3aeae..ea2c34bba7 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.2 ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From e23879898862f2426e6714324c912d14db1067b5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Nov 2017 04:03:11 -0800 Subject: [PATCH 108/462] Update to 2.3.5, bundler 1.16.0, rubygems 2.7.3 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index b8df349cc1..bb1edd4504 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 7e2f2f40d9..02adf6c518 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index c28833ec4f..294efc2b8b 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.5 ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.7.2 +ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 # some of ruby's build scripts are written in ruby From ee2df55c3abd3d0eccea5733f7041b733f8a5a62 Mon Sep 17 00:00:00 2001 From: ojab Date: Thu, 7 Dec 2017 11:22:34 +0000 Subject: [PATCH 109/462] Add "alpine3.7" variant of 2.4 & 2.5-rc --- .travis.yml | 2 + 2.4/alpine3.7/Dockerfile | 110 ++++++++++++++++++++++++++++++++++ 2.5-rc/alpine3.7/Dockerfile | 110 ++++++++++++++++++++++++++++++++++ generate-stackbrew-library.sh | 5 +- update.sh | 2 +- 5 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 2.4/alpine3.7/Dockerfile create mode 100644 2.5-rc/alpine3.7/Dockerfile diff --git a/.travis.yml b/.travis.yml index fbdf65fee9..265ea2eff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,13 @@ services: docker env: - VERSION=2.5-rc VARIANT=stretch - VERSION=2.5-rc VARIANT=stretch/slim + - VERSION=2.5-rc VARIANT=alpine3.7 - VERSION=2.5-rc VARIANT=alpine3.6 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.4 VARIANT=alpine3.4 - VERSION=2.3 VARIANT=jessie diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile new file mode 100644 index 0000000000..137b1d438d --- /dev/null +++ b/2.4/alpine3.7/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.7 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.2 +ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBYGEMS_VERSION 2.7.3 +ENV BUNDLER_VERSION 1.16.0 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5-rc/alpine3.7/Dockerfile new file mode 100644 index 0000000000..03ab826c77 --- /dev/null +++ b/2.5-rc/alpine3.7/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.7 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5-rc +ENV RUBY_VERSION 2.5.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBYGEMS_VERSION 2.7.3 +ENV BUNDLER_VERSION 1.16.0 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5a81d88feb..c13492e123 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -12,11 +12,12 @@ declare -A debianSuites=( [2.3]='jessie' [2.4]='jessie' ) -defaultAlpineVersion='3.6' +defaultAlpineVersion='3.7' declare -A alpineVersions=( [2.2]='3.4' [2.3]='3.4' [2.4]='3.4' + [2.4]='3.6' ) self="$(basename "$BASH_SOURCE")" @@ -87,7 +88,7 @@ for version in "${versions[@]}"; do for v in \ {stretch,jessie}{,/slim,/onbuild} \ - alpine{3.6,3.4} \ + alpine{3.7,3.6,3.4} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index efc43e69f0..a3b502b74b 100755 --- a/update.sh +++ b/update.sh @@ -67,7 +67,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal" for v in \ - alpine{3.4,3.6} \ + alpine{3.4,3.6,3.7} \ {jessie,stretch}{/slim,/onbuild,} \ ; do dir="$version/$v" From cd25076d7045f6f4d01544a95d8008ad0a1dbbd4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Dec 2017 10:34:15 -0800 Subject: [PATCH 110/462] Remove my wrong advice :innocent: --- generate-stackbrew-library.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c13492e123..7889f8c4b3 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -17,7 +17,6 @@ declare -A alpineVersions=( [2.2]='3.4' [2.3]='3.4' [2.4]='3.4' - [2.4]='3.6' ) self="$(basename "$BASH_SOURCE")" From 6ad601794e06ec986cdebc7365c53ca7b05f9e32 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Dec 2017 15:30:20 -0800 Subject: [PATCH 111/462] Remove unreleased 2.5-rc-alpine3.6 variant (superseded by the new 2.5-rc-alpine3.7 variant) See https://github.com/docker-library/official-images/pull/3789#issuecomment-350387112 --- .travis.yml | 1 - 2.5-rc/alpine3.6/Dockerfile | 110 ------------------------------------ 2 files changed, 111 deletions(-) delete mode 100644 2.5-rc/alpine3.6/Dockerfile diff --git a/.travis.yml b/.travis.yml index 265ea2eff4..89c736bb8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: - VERSION=2.5-rc VARIANT=stretch - VERSION=2.5-rc VARIANT=stretch/slim - VERSION=2.5-rc VARIANT=alpine3.7 - - VERSION=2.5-rc VARIANT=alpine3.6 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie diff --git a/2.5-rc/alpine3.6/Dockerfile b/2.5-rc/alpine3.6/Dockerfile deleted file mode 100644 index f3c061cb5c..0000000000 --- a/2.5-rc/alpine3.6/Dockerfile +++ /dev/null @@ -1,110 +0,0 @@ -FROM alpine:3.6 - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 -ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libressl \ - libressl-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libressl-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] From 8388fb66f2df5b269c8a1fa1d50beb635bfe5129 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Dec 2017 00:03:12 +0000 Subject: [PATCH 112/462] Update to 2.4.3, bundler 1.16.0, rubygems 2.7.3 --- 2.4/alpine3.4/Dockerfile | 4 ++-- 2.4/alpine3.6/Dockerfile | 4 ++-- 2.4/alpine3.7/Dockerfile | 4 ++-- 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 2318fb362b..c7d5950769 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 7912ff4bdc..e63f167b54 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 137b1d438d..c272fd7d04 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 286c3fe616..d89e9efb33 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index f8c22b5162..7fa34d8120 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index ba8c44fe6c..5e87c77161 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index ea2c34bba7..e769dc33ba 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.2 -ENV RUBY_DOWNLOAD_SHA256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 +ENV RUBY_VERSION 2.4.3 +ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 From 15e585cbe131a3506daf25710e87433e90c3cbd1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Dec 2017 00:03:12 +0000 Subject: [PATCH 113/462] Update to 2.3.6, bundler 1.16.0, rubygems 2.7.3 --- 2.3/alpine3.4/Dockerfile | 4 ++-- 2.3/jessie/Dockerfile | 4 ++-- 2.3/jessie/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index bb1edd4504..56ac9c8500 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.5 -ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda +ENV RUBY_VERSION 2.3.6 +ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 02adf6c518..0de53c6610 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.5 -ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda +ENV RUBY_VERSION 2.3.6 +ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 294efc2b8b..4d62e4f7b2 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.5 -ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda +ENV RUBY_VERSION 2.3.6 +ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 From c7145524ca5294bca43e12648e817ec4d8e7927f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Dec 2017 00:03:12 +0000 Subject: [PATCH 114/462] Update to 2.2.9, bundler 1.16.0, rubygems 2.7.3 --- 2.2/alpine3.4/Dockerfile | 4 ++-- 2.2/jessie/Dockerfile | 4 ++-- 2.2/jessie/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 969b20665a..9d88c2bffd 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.8 -ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 +ENV RUBY_VERSION 2.2.9 +ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 3dbf756160..f563d83620 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.8 -ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 +ENV RUBY_VERSION 2.2.9 +ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index fc984a8fea..8a993182fd 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.8 -ENV RUBY_DOWNLOAD_SHA256 37eafc15037396c26870f6a6c5bcd0658d14b46cd5e191a3b56d89dd22d561b0 +ENV RUBY_VERSION 2.2.9 +ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 From 458fa7be72323ffa6eecfc27b7cf6106dc4cd808 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 14 Dec 2017 19:56:14 -0800 Subject: [PATCH 115/462] Fix update.sh so it picks up 2.5.0-rc1 This accounts for https://github.com/ruby/www.ruby-lang.org/pull/1691#discussion_r157087824. --- update.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/update.sh b/update.sh index a3b502b74b..f02bf27495 100755 --- a/update.sh +++ b/update.sh @@ -42,20 +42,19 @@ for version in "${versions[@]}"; do if \ { versionReleasePage="$(echo "$releasesPage" | grep "Ruby $tryVersion" -A 2 | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ - && [ "$versionReleasePage" ] + && [ "$versionReleasePage" ] \ + && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '/^SHA256:/ { print $2; exit }')" \ + && [ "$shaVal" ] } \ ; then - if \ - shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '/^SHA256:/ { print $2; exit }')" \ - && [ "$shaVal" ] \ - ; then - fullVersion="$tryVersion" - break - fi + fullVersion="$tryVersion" + break fi done From e6441b9c34d6429e03695095543de11a80ea76e4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Dec 2017 06:03:14 +0000 Subject: [PATCH 116/462] Update to 2.5.0-rc1, bundler 1.16.0, rubygems 2.7.3 --- 2.5-rc/alpine3.7/Dockerfile | 4 ++-- 2.5-rc/stretch/Dockerfile | 4 ++-- 2.5-rc/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5-rc/alpine3.7/Dockerfile index 03ab826c77..6d02a08f14 100644 --- a/2.5-rc/alpine3.7/Dockerfile +++ b/2.5-rc/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBY_VERSION 2.5.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index 33ce83d851..218767198d 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBY_VERSION 2.5.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index c305ca1078..bf957e3ec9 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 c2f518eb04b38bdd562ba5611abd2521248a1608fc466368563dd794ddeddd09 +ENV RUBY_VERSION 2.5.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 ENV BUNDLER_VERSION 1.16.0 From 342c5bc6f7a6d5cdfb90e8dd0197a55a18cebe54 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Dec 2017 16:03:11 -0800 Subject: [PATCH 117/462] Update to 2.4.3, bundler 1.16.1, rubygems 2.7.3 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index c7d5950769..151c80c264 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index e63f167b54..fe02b6688c 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index c272fd7d04..54fb760550 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index d89e9efb33..b966f7b1f6 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 7fa34d8120..0a7529b994 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 5e87c77161..201c3c7ec6 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index e769dc33ba..455bb0810c 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From ace04afbea62e23792fcf7c2fa2c1883ca625db4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Dec 2017 16:03:11 -0800 Subject: [PATCH 118/462] Update to 2.3.6, bundler 1.16.1, rubygems 2.7.3 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 56ac9c8500..6777708d32 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 0de53c6610..1576944e4f 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 4d62e4f7b2..fd00727346 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From f4d5c084fab6c9a2bc55bf25257887d53e4eff87 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Dec 2017 16:03:11 -0800 Subject: [PATCH 119/462] Update to 2.5.0-rc1, bundler 1.16.1, rubygems 2.7.3 --- 2.5-rc/alpine3.7/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5-rc/alpine3.7/Dockerfile index 6d02a08f14..f344d960bf 100644 --- a/2.5-rc/alpine3.7/Dockerfile +++ b/2.5-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index 218767198d..e1d6c62ba7 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index bf957e3ec9..823e6e678c 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 4208b2eb070e6e6b5b1ec26029aac81d573cb276 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Dec 2017 16:03:11 -0800 Subject: [PATCH 120/462] Update to 2.2.9, bundler 1.16.1, rubygems 2.7.3 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 9d88c2bffd..551f8245d0 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index f563d83620..b937374256 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 8a993182fd..d4ec71b290 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c ENV RUBYGEMS_VERSION 2.7.3 -ENV BUNDLER_VERSION 1.16.0 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9ef6f79b6a6aeab1856a8c890bbb16b1dd5e0745 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Dec 2017 12:03:10 +0000 Subject: [PATCH 121/462] Update to 2.3.6, bundler 1.16.1, rubygems 2.7.4 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 6777708d32..d81dcfa653 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 1576944e4f..2403f8d853 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index fd00727346..d5b071dba6 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 1d0fe6a9d5c75d8a114fb03016f528d68c613d80 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Dec 2017 12:03:10 +0000 Subject: [PATCH 122/462] Update to 2.4.3, bundler 1.16.1, rubygems 2.7.4 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 151c80c264..13e5c023ee 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index fe02b6688c..9e96ef17b5 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 54fb760550..f77eeccc2c 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index b966f7b1f6..8773b3fde4 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 0a7529b994..7cb2174104 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 201c3c7ec6..89f7a9da5d 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 455bb0810c..b61bad52e6 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 3cefd8f55dd00b96fb67ce91cc0675f7fe7516a3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Dec 2017 12:03:10 +0000 Subject: [PATCH 123/462] Update to 2.5.0-rc1, bundler 1.16.1, rubygems 2.7.4 --- 2.5-rc/alpine3.7/Dockerfile | 2 +- 2.5-rc/stretch/Dockerfile | 2 +- 2.5-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5-rc/alpine3.7/Dockerfile index f344d960bf..1fbf826c57 100644 --- a/2.5-rc/alpine3.7/Dockerfile +++ b/2.5-rc/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/Dockerfile b/2.5-rc/stretch/Dockerfile index e1d6c62ba7..718188d5aa 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5-rc/stretch/slim/Dockerfile index 823e6e678c..48aedc53fb 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5-rc ENV RUBY_VERSION 2.5.0-rc1 ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From c441f3dcacc103f0ebea5f0d9fd2ad773516e7ad Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Dec 2017 12:03:10 +0000 Subject: [PATCH 124/462] Update to 2.2.9, bundler 1.16.1, rubygems 2.7.4 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 551f8245d0..1b4dcc7457 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index b937374256..44aed8a983 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index d4ec71b290..1b09a30ffe 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.3 +ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From e5d5ed23036c66c5797c39e0e156de5d006dbfc0 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 26 Dec 2017 11:42:18 +0900 Subject: [PATCH 125/462] Remove rc label from 2.5.0 --- .travis.yml | 6 +++--- {2.5-rc => 2.5}/alpine3.7/Dockerfile | 6 +++--- {2.5-rc => 2.5}/stretch/Dockerfile | 6 +++--- {2.5-rc => 2.5}/stretch/slim/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) rename {2.5-rc => 2.5}/alpine3.7/Dockerfile (95%) rename {2.5-rc => 2.5}/stretch/Dockerfile (93%) rename {2.5-rc => 2.5}/stretch/slim/Dockerfile (94%) diff --git a/.travis.yml b/.travis.yml index 89c736bb8a..1c64eaf653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=2.5-rc VARIANT=stretch - - VERSION=2.5-rc VARIANT=stretch/slim - - VERSION=2.5-rc VARIANT=alpine3.7 + - VERSION=2.5 VARIANT=stretch + - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile similarity index 95% rename from 2.5-rc/alpine3.7/Dockerfile rename to 2.5/alpine3.7/Dockerfile index 1fbf826c57..2873a3b6bc 100644 --- a/2.5-rc/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5-rc/stretch/Dockerfile b/2.5/stretch/Dockerfile similarity index 93% rename from 2.5-rc/stretch/Dockerfile rename to 2.5/stretch/Dockerfile index 718188d5aa..d041b962a6 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile similarity index 94% rename from 2.5-rc/stretch/slim/Dockerfile rename to 2.5/stretch/slim/Dockerfile index 48aedc53fb..e31092b6b4 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -19,9 +19,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 7889f8c4b3..72ddc37073 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [2.4]='2 latest' - [2.5-rc]='rc' + [2.5]='2 latest' ) defaultDebianSuite='stretch' From bf3b9e755c36c25dde89c832c293abe87292e482 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 26 Dec 2017 09:42:00 -0800 Subject: [PATCH 126/462] Add back the "rc" alias, but point it at 2.6-rc (as a reminder to future us) --- generate-stackbrew-library.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 72ddc37073..ac97000fdf 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,6 +3,7 @@ set -Eeuo pipefail declare -A aliases=( [2.5]='2 latest' + [2.6-rc]='rc' ) defaultDebianSuite='stretch' From c9a4472a019d18aba1fdab6a63b96474b40ca191 Mon Sep 17 00:00:00 2001 From: Stephen Crosby Date: Mon, 22 Jan 2018 16:08:25 -0800 Subject: [PATCH 127/462] Remove /root/.gem to shrink image size --- 2.2/alpine3.4/Dockerfile | 3 ++- 2.2/jessie/Dockerfile | 3 ++- 2.2/jessie/slim/Dockerfile | 3 ++- 2.3/alpine3.4/Dockerfile | 3 ++- 2.3/jessie/Dockerfile | 3 ++- 2.3/jessie/slim/Dockerfile | 3 ++- 2.4/alpine3.4/Dockerfile | 3 ++- 2.4/alpine3.6/Dockerfile | 3 ++- 2.4/alpine3.7/Dockerfile | 3 ++- 2.4/jessie/Dockerfile | 3 ++- 2.4/jessie/slim/Dockerfile | 3 ++- 2.4/stretch/Dockerfile | 3 ++- 2.4/stretch/slim/Dockerfile | 3 ++- 2.5/alpine3.7/Dockerfile | 3 ++- 2.5/stretch/Dockerfile | 3 ++- 2.5/stretch/slim/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- Dockerfile-slim.template | 3 ++- 19 files changed, 38 insertions(+), 19 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 1b4dcc7457..bee4990963 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 44aed8a983..03c99b5781 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 1b09a30ffe..b8d43ea611 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index d81dcfa653..6be2a437a4 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 2403f8d853..ca6daf8b3e 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index d5b071dba6..1be9667ebe 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 13e5c023ee..6ba2673cc4 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 9e96ef17b5..23f20bd395 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index f77eeccc2c..10d6d5b6dd 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 8773b3fde4..4c799b83e0 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 7cb2174104..71ac26a68a 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 89f7a9da5d..11804ed4d2 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index b61bad52e6..820356c1eb 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 2873a3b6bc..7564684f9b 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index d041b962a6..5eb25b6940 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index e31092b6b4..0bdeb58c34 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index e6e6cdbb99..9f2342308f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -94,7 +94,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index d323817e11..9ac03cb1df 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -59,7 +59,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 9825ddd056..80834f1a7a 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps From 1f9102c4e5c9fb9842e09c3c50f6402ed583456a Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Wed, 25 Oct 2017 15:12:34 -0300 Subject: [PATCH 128/462] Add stretch variants of 2.3 --- .travis.yml | 2 + 2.3/stretch/Dockerfile | 75 ++++++++++++++++++++++++++ 2.3/stretch/slim/Dockerfile | 101 ++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 2.3/stretch/Dockerfile create mode 100644 2.3/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 1c64eaf653..115efab956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ env: - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.4 VARIANT=alpine3.4 + - VERSION=2.3 VARIANT=stretch + - VERSION=2.3 VARIANT=stretch/slim - VERSION=2.3 VARIANT=jessie - VERSION=2.3 VARIANT=jessie/slim - VERSION=2.3 VARIANT=alpine3.4 diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile new file mode 100644 index 0000000000..034e9a78bc --- /dev/null +++ b/2.3/stretch/Dockerfile @@ -0,0 +1,75 @@ +FROM buildpack-deps:stretch + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.3 +ENV RUBY_VERSION 2.3.5 +ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda +ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile new file mode 100644 index 0000000000..821452fcc2 --- /dev/null +++ b/2.3/stretch/slim/Dockerfile @@ -0,0 +1,101 @@ +FROM debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgdbm3 \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.3 +ENV RUBY_VERSION 2.3.5 +ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda +ENV RUBYGEMS_VERSION 2.6.14 +ENV BUNDLER_VERSION 1.15.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] From 0008d79b1285efd2c6b0b1c271c8b8362594b65b Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Wed, 25 Oct 2017 15:38:14 -0300 Subject: [PATCH 129/462] Use libssl1.0 for stretch images --- 2.3/stretch/Dockerfile | 1 + 2.3/stretch/slim/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 034e9a78bc..0daa9f3704 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -22,6 +22,7 @@ RUN set -ex \ dpkg-dev \ libgdbm-dev \ ruby \ + libssl1.0-dev \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 821452fcc2..2f22cf2745 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ - libssl-dev \ + libssl1.0-dev \ libyaml-dev \ procps \ zlib1g-dev \ From 4d2e178d3847b5458602d908c48782b6b18cd62e Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Thu, 4 Jan 2018 10:54:34 -0300 Subject: [PATCH 130/462] Add libssl1.0-dev mangling to the auto update script and run update.sh --- 2.3/stretch/Dockerfile | 14 ++++++++------ 2.3/stretch/slim/Dockerfile | 11 ++++++----- Dockerfile-debian.template | 2 ++ update.sh | 7 +++++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 0daa9f3704..5cdbbb94c1 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -8,10 +8,10 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.5 -ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV RUBY_VERSION 2.3.6 +ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBYGEMS_VERSION 2.7.4 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -21,8 +21,9 @@ RUN set -ex \ bison \ dpkg-dev \ libgdbm-dev \ - ruby \ + # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) libssl1.0-dev \ + ruby \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ @@ -60,7 +61,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 2f22cf2745..484f31f717 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -20,10 +20,10 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.5 -ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda -ENV RUBYGEMS_VERSION 2.6.14 -ENV BUNDLER_VERSION 1.15.4 +ENV RUBY_VERSION 2.3.6 +ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBYGEMS_VERSION 2.7.4 +ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -85,7 +85,8 @@ RUN set -ex \ && rm -r /usr/src/ruby \ \ && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9ac03cb1df..fe02a2953a 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -21,6 +21,8 @@ RUN set -ex \ bison \ dpkg-dev \ libgdbm-dev \ + # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) + libssl1.0-dev \ ruby \ ' \ && apt-get update \ diff --git a/update.sh b/update.sh index f02bf27495..5a31edfe23 100755 --- a/update.sh +++ b/update.sh @@ -87,6 +87,13 @@ for version in "${versions[@]}"; do -e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ -e 's!%%BUNDLER%%!'"$bundler"'!g' \ + -e "$( + if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then + echo 's/libssl-dev/libssl1.0-dev/g' + else + echo '/libssl1.0-dev/d' + fi + )" \ -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" From d5cab201f7f689688b121cd4831aeb8e23becf96 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Feb 2018 06:26:33 +0000 Subject: [PATCH 131/462] Update to 2.3.6, bundler 1.16.1, rubygems 2.7.5 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 6be2a437a4..c8bb5fbd0e 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index ca6daf8b3e..7a7c4c8ce9 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 1be9667ebe..72224ca043 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 5cdbbb94c1..d36049a9a1 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 484f31f717..d9add90095 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 4b43155d8a8ec30fe1cb9ea6f0fcf8a432096a53 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Feb 2018 06:26:33 +0000 Subject: [PATCH 132/462] Update to 2.4.3, bundler 1.16.1, rubygems 2.7.5 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 6ba2673cc4..3defa15323 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 23f20bd395..0097f65951 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 10d6d5b6dd..aae71ccee5 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 4c799b83e0..af291eb2f4 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 71ac26a68a..8fb9adc6a4 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 11804ed4d2..ce23a72bf7 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 820356c1eb..d7b3a21d14 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From b42e7bb58583ec9854aecf651980917dd06aa5da Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Feb 2018 06:26:33 +0000 Subject: [PATCH 133/462] Update to 2.2.9, bundler 1.16.1, rubygems 2.7.5 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index bee4990963..da60a7e80c 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 03c99b5781..3a9c0838a6 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index b8d43ea611..b92f11e5ba 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 99e8080d3cda7d7ee49d582ca2dc16b1999370bf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Feb 2018 06:26:33 +0000 Subject: [PATCH 134/462] Update to 2.5.0, bundler 1.16.1, rubygems 2.7.5 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 7564684f9b..9a09c54e2f 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 5eb25b6940..1cf6670bc7 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 0bdeb58c34..3ebc408d4f 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.4 +ENV RUBYGEMS_VERSION 2.7.5 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 019b9214a571d4dcb5a7e9e43ef192ca75ff27b8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Feb 2018 12:03:13 +0000 Subject: [PATCH 135/462] Update to 2.3.6, bundler 1.16.1, rubygems 2.7.6 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index c8bb5fbd0e..c7384d0535 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 7a7c4c8ce9..92acbbb893 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 72224ca043..566a1e8a23 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index d36049a9a1..112cff8658 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index d9add90095..9ae32e1d5f 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.6 ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 83c60cc26a1efb0ea581b3343a97df7508481fcf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Feb 2018 12:03:13 +0000 Subject: [PATCH 136/462] Update to 2.4.3, bundler 1.16.1, rubygems 2.7.6 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 3defa15323..e8acd9b821 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 0097f65951..0c79537362 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index aae71ccee5..fdc456a826 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index af291eb2f4..04b703128c 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 8fb9adc6a4..ac376bf6d3 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index ce23a72bf7..b3a527b837 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index d7b3a21d14..536e67a2d3 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.3 ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 6bccf4bd0c6aa158b4a842c29f78c335ec9dc41b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Feb 2018 12:03:13 +0000 Subject: [PATCH 137/462] Update to 2.5.0, bundler 1.16.1, rubygems 2.7.6 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 9a09c54e2f..c9cd615971 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 1cf6670bc7..f44b2814ad 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 3ebc408d4f..b01b3e0234 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.0 ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From 127b99a6f22e43c3b9e0b9544dd77d85aa299906 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Feb 2018 12:03:13 +0000 Subject: [PATCH 138/462] Update to 2.2.9, bundler 1.16.1, rubygems 2.7.6 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index da60a7e80c..bfd5e87158 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 3a9c0838a6..9c22d395c8 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index b92f11e5ba..9de0e93f6d 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.9 ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c -ENV RUBYGEMS_VERSION 2.7.5 +ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 # some of ruby's build scripts are written in ruby From c9644fe5c95cd71913db348baa41240f05d882b3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Mar 2018 23:03:11 +0000 Subject: [PATCH 139/462] Update to 2.5.1, bundler 1.16.1, rubygems 2.7.6 --- 2.5/alpine3.7/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index c9cd615971..f6f0538d6e 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.0 -ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f44b2814ad..4ee1857a36 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.0 -ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index b01b3e0234..814eb23630 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.0 -ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 From 78ecfcb108930a94eded6dfe1be50246052dc632 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Mar 2018 23:03:11 +0000 Subject: [PATCH 140/462] Update to 2.3.7, bundler 1.16.1, rubygems 2.7.6 --- 2.3/alpine3.4/Dockerfile | 4 ++-- 2.3/jessie/Dockerfile | 4 ++-- 2.3/jessie/slim/Dockerfile | 4 ++-- 2.3/stretch/Dockerfile | 4 ++-- 2.3/stretch/slim/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index c7384d0535..b1c6d49d5a 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.6 -ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 92acbbb893..78da4038ec 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.6 -ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 566a1e8a23..be03b28a43 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.6 -ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 112cff8658..7735d30a1d 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.6 -ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 9ae32e1d5f..ce7a481a8a 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.6 -ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 From 1bd8b466277668bff50528b26360e6e451e4dae4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Mar 2018 23:03:11 +0000 Subject: [PATCH 141/462] Update to 2.4.4, bundler 1.16.1, rubygems 2.7.6 --- 2.4/alpine3.4/Dockerfile | 4 ++-- 2.4/alpine3.6/Dockerfile | 4 ++-- 2.4/alpine3.7/Dockerfile | 4 ++-- 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index e8acd9b821..c4303dc872 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 0c79537362..72ce68c317 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index fdc456a826..ebe856fad6 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 04b703128c..6595e059ce 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index ac376bf6d3..25a5ea6cda 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index b3a527b837..7083c3649e 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 536e67a2d3..4dc2f43b5f 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.3 -ENV RUBY_DOWNLOAD_SHA256 23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51 +ENV RUBY_VERSION 2.4.4 +ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 From e48cb2431e5cdcd99ce8d8c236d7b73e7d4452f2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Mar 2018 23:03:11 +0000 Subject: [PATCH 142/462] Update to 2.2.10, bundler 1.16.1, rubygems 2.7.6 --- 2.2/alpine3.4/Dockerfile | 4 ++-- 2.2/jessie/Dockerfile | 4 ++-- 2.2/jessie/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index bfd5e87158..56d8bdb7e4 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.9 -ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c +ENV RUBY_VERSION 2.2.10 +ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 9c22d395c8..2b60268c8a 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.9 -ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c +ENV RUBY_VERSION 2.2.10 +ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 9de0e93f6d..ba5cc4a402 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.9 -ENV RUBY_DOWNLOAD_SHA256 313b44b1105589d00bb30b9cccf7da44d263fe20a2d8d269ada536d4a7ef285c +ENV RUBY_VERSION 2.2.10 +ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 From 53ca276f03918cee2d9db367638be49725e5f152 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Thu, 29 Mar 2018 20:41:22 +0900 Subject: [PATCH 143/462] $ cp -r 2.5 2.6-rc --- 2.6-rc/alpine3.7/Dockerfile | 111 +++++++++++++++++++++++++++++++++ 2.6-rc/stretch/Dockerfile | 76 ++++++++++++++++++++++ 2.6-rc/stretch/slim/Dockerfile | 102 ++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+) create mode 100644 2.6-rc/alpine3.7/Dockerfile create mode 100644 2.6-rc/stretch/Dockerfile create mode 100644 2.6-rc/stretch/slim/Dockerfile diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile new file mode 100644 index 0000000000..f6f0538d6e --- /dev/null +++ b/2.6-rc/alpine3.7/Dockerfile @@ -0,0 +1,111 @@ +FROM alpine:3.7 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBYGEMS_VERSION 2.7.6 +ENV BUNDLER_VERSION 1.16.1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libressl-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile new file mode 100644 index 0000000000..4ee1857a36 --- /dev/null +++ b/2.6-rc/stretch/Dockerfile @@ -0,0 +1,76 @@ +FROM buildpack-deps:stretch + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBYGEMS_VERSION 2.7.6 +ENV BUNDLER_VERSION 1.16.1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile new file mode 100644 index 0000000000..814eb23630 --- /dev/null +++ b/2.6-rc/stretch/slim/Dockerfile @@ -0,0 +1,102 @@ +FROM debian:stretch + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgdbm3 \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.1 +ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBYGEMS_VERSION 2.7.6 +ENV BUNDLER_VERSION 1.16.1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && dpkg-query --show --showformat '${package}\n' \ + | grep -P '^libreadline\d+$' \ + | xargs apt-mark manual \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_BIN="$GEM_HOME/bin" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $BUNDLE_BIN:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" + +CMD [ "irb" ] From c0740f2479625032bee21ea5c3a29e74464057c9 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Thu, 29 Mar 2018 20:42:17 +0900 Subject: [PATCH 144/462] $ docker run --rm -v $PWD:/app -w /app ruby ./update.sh --- .travis.yml | 3 +++ 2.6-rc/alpine3.7/Dockerfile | 6 +++--- 2.6-rc/stretch/Dockerfile | 6 +++--- 2.6-rc/stretch/slim/Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 115efab956..60d7bdae12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: bash services: docker env: + - VERSION=2.6-rc VARIANT=stretch + - VERSION=2.6-rc VARIANT=stretch/slim + - VERSION=2.6-rc VARIANT=alpine3.7 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim - VERSION=2.5 VARIANT=alpine3.7 diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index f6f0538d6e..dc65fd9e79 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_MAJOR 2.6-rc +ENV RUBY_VERSION 2.6.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 4ee1857a36..97cb7c25f6 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_MAJOR 2.6-rc +ENV RUBY_VERSION 2.6.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 814eb23630..590e5eabb9 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -19,9 +19,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_MAJOR 2.6-rc +ENV RUBY_VERSION 2.6.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 ENV BUNDLER_VERSION 1.16.1 From 06881d7ebd92ceecd9695102b516299d63651ffb Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 3 Apr 2018 14:37:40 -0400 Subject: [PATCH 145/462] Allow 2.4 to fallback to alpine latest --- generate-stackbrew-library.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ac97000fdf..8b322cd66c 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -16,7 +16,6 @@ defaultAlpineVersion='3.7' declare -A alpineVersions=( [2.2]='3.4' [2.3]='3.4' - [2.4]='3.4' ) self="$(basename "$BASH_SOURCE")" From 2400c174354913fc84bf1aa8c137955d13696fc2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 19 Apr 2018 11:04:03 -0700 Subject: [PATCH 146/462] Update generated README https://github.com/docker-library/docs/pull/1193 https://github.com/docker-library/docs/pull/1195 --- README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b658ffd98d..d6008dd121 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,16 @@ -# About this Repo +# https://github.com/docker-library/ruby -This is the Git repo of the Docker [official image](https://docs.docker.com/docker-hub/official_repos/) for [ruby](https://registry.hub.docker.com/_/ruby/). See [the Docker Hub page](https://registry.hub.docker.com/_/ruby/) for the full readme on how to use this Docker image and for information regarding contributing and issues. +## Maintained by: [the Docker Community](https://github.com/docker-library/ruby) -The full readme is generated over in [docker-library/docs](https://github.com/docker-library/docs), specifically in [docker-library/docs/ruby](https://github.com/docker-library/docs/tree/master/ruby). +This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [ruby](https://hub.docker.com/_/ruby/) (not to be confused with any official ruby image provided by ruby upstream). See [the Docker Hub page](https://hub.docker.com/_/ruby/) for the full readme on how to use this Docker image and for information regarding contributing and issues. -See a change merged here that doesn't show up on the Docker Hub yet? Check [the "library/ruby" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/ruby), especially [PRs with the "library/ruby" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fruby). For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md). +The [full description from Docker Hub](https://hub.docker.com/_/ruby/) is generated over in [docker-library/docs](https://github.com/docker-library/docs), specifically in [docker-library/docs/ruby](https://github.com/docker-library/docs/tree/master/ruby). + +## See a change merged here that doesn't show up on Docker Hub yet? + +Check [the "library/ruby" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/ruby), especially [PRs with the "library/ruby" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fruby). + +For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md). --- @@ -13,4 +19,9 @@ See a change merged here that doesn't show up on the Docker Hub yet? Check [the - [Automated `update.sh`: ![build status badge](https://doi-janky.infosiftr.net/job/update.sh/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby) +| Build | Status | Badges | (per-arch) | +|:-:|:-:|:-:|:-:| +| [`amd64`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby) | [`arm32v5`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby) | [`arm32v6`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby) | [`arm32v7`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby) | +| [`arm64v8`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby) | [`i386`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby) | [`ppc64le`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby) | [`s390x`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby) | + From ee0b15d76c92ad221caf9afaf9b8827e7fe39f9a Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 15 May 2018 14:12:56 -0700 Subject: [PATCH 147/462] Fix PATH to use the fully generic binstubs bundler binstubs are not necessarily generic; they were until bundler 1.16 and should be fixed back, but will likely be non-generic again by default in 2.0 See https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 56d8bdb7e4..55b73d1a84 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 2b60268c8a..b6294dcac4 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index ba5cc4a402..ff1ac737a3 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index b1c6d49d5a..581cf318f6 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 78da4038ec..541fdfb671 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index be03b28a43..b222d7839a 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 7735d30a1d..27de37fb3e 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -71,7 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index ce7a481a8a..36374ab5cd 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index c4303dc872..b5fa704e93 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 72ce68c317..6ba3544d2e 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index ebe856fad6..1e379ee0a7 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 6595e059ce..177c4e9783 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 25a5ea6cda..adc32b1c4f 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 7083c3649e..2ba93d1fea 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 4dc2f43b5f..03923096ad 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f6f0538d6e..5c4f833fe3 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 4ee1857a36..0f9708900f 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 814eb23630..94ea3542be 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index dc65fd9e79..690c2d1beb 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 97cb7c25f6..9f93e4ef07 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 590e5eabb9..7ab8794c8f 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9f2342308f..0acb26c5ca 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index fe02a2953a..8c750079c7 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -71,7 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 80834f1a7a..e2cbbc1fe3 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH +ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" From 77515a062795c609e645bf84d5e09f553ec9deef Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 16 May 2018 12:32:39 -0700 Subject: [PATCH 148/462] Add link to bundler/bundler comment --- 2.2/alpine3.4/Dockerfile | 1 + 2.2/jessie/Dockerfile | 1 + 2.2/jessie/slim/Dockerfile | 1 + 2.3/alpine3.4/Dockerfile | 1 + 2.3/jessie/Dockerfile | 1 + 2.3/jessie/slim/Dockerfile | 1 + 2.3/stretch/Dockerfile | 1 + 2.3/stretch/slim/Dockerfile | 1 + 2.4/alpine3.4/Dockerfile | 1 + 2.4/alpine3.6/Dockerfile | 1 + 2.4/alpine3.7/Dockerfile | 1 + 2.4/jessie/Dockerfile | 1 + 2.4/jessie/slim/Dockerfile | 1 + 2.4/stretch/Dockerfile | 1 + 2.4/stretch/slim/Dockerfile | 1 + 2.5/alpine3.7/Dockerfile | 1 + 2.5/stretch/Dockerfile | 1 + 2.5/stretch/slim/Dockerfile | 1 + 2.6-rc/alpine3.7/Dockerfile | 1 + 2.6-rc/stretch/Dockerfile | 1 + 2.6-rc/stretch/slim/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + Dockerfile-slim.template | 1 + 24 files changed, 24 insertions(+) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 55b73d1a84..0006eebc82 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index b6294dcac4..5d4776388d 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index ff1ac737a3..91aaa02d32 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 581cf318f6..c25df2689c 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 541fdfb671..0a94683fdf 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index b222d7839a..25ba9bec30 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 27de37fb3e..fcc9519a9a 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -71,6 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 36374ab5cd..0c2fe315ea 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index b5fa704e93..75a66d2a85 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 6ba3544d2e..76bab209f8 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 1e379ee0a7..c08339605d 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 177c4e9783..a6a1e359cd 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index adc32b1c4f..4bcf0300f2 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 2ba93d1fea..ee06f82c9c 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 03923096ad..0277a4049f 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 5c4f833fe3..62dbee343b 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 0f9708900f..880b07087e 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 94ea3542be..6d6fbf1e28 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 690c2d1beb..10d3a4edab 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 9f93e4ef07..38658c103a 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -69,6 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 7ab8794c8f..12c32d85e9 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0acb26c5ca..1d0f9e0ef5 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -104,6 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8c750079c7..ee05fcc0b0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -71,6 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index e2cbbc1fe3..8b0038c72e 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -95,6 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 ENV PATH $BUNDLE_PATH/gems/bin:$PATH RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" From f50608f084f272c31a729a7f27996a7686a965c6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 May 2018 23:03:15 +0000 Subject: [PATCH 149/462] Update to 2.5.1, bundler 1.16.2, rubygems 2.7.6 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 62dbee343b..dd37d533bd 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 880b07087e..fffc4a62e8 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 6d6fbf1e28..4bb770024d 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 67c61268a7a68f6cf2f2b6b87694b93ef5d3b2ae Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 May 2018 23:03:15 +0000 Subject: [PATCH 150/462] Update to 2.6.0-preview1, bundler 1.16.2, rubygems 2.7.6 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 10d3a4edab..796b76914e 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 38658c103a..30169b60d4 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 12c32d85e9..7e68e44f1c 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From a8a07cef8ac3b24a3ad6488c2a4ba115bd8662b4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 May 2018 23:03:15 +0000 Subject: [PATCH 151/462] Update to 2.2.10, bundler 1.16.2, rubygems 2.7.6 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index 0006eebc82..adef463c73 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 5d4776388d..047dac8366 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 91aaa02d32..94b83433b8 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From b146f5103be07e88cae5b848c666735ae35d3535 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 May 2018 23:03:15 +0000 Subject: [PATCH 152/462] Update to 2.3.7, bundler 1.16.2, rubygems 2.7.6 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index c25df2689c..2ad9e2e95b 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 0a94683fdf..4e62e1acbc 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 25ba9bec30..694282dee8 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index fcc9519a9a..37cfe631ef 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 0c2fe315ea..fd234724e8 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 6b3ebbba3c6b511801558cf04968a9a83f0aa521 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 May 2018 23:03:15 +0000 Subject: [PATCH 153/462] Update to 2.4.4, bundler 1.16.2, rubygems 2.7.6 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index 75a66d2a85..fdfa9fa58f 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 76bab209f8..49d637a432 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index c08339605d..abebffeda6 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index a6a1e359cd..af84834b49 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 4bcf0300f2..596a0366d9 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index ee06f82c9c..d69cad9070 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 0277a4049f..193cc43e90 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.6 -ENV BUNDLER_VERSION 1.16.1 +ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From e703dc6278b7f12c84cdc587f1719cc2cf2aac96 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 May 2018 05:03:18 +0000 Subject: [PATCH 154/462] Update to 2.5.1, bundler 1.16.2, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index dd37d533bd..71725f3db4 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index fffc4a62e8..c654d97eba 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 4bb770024d..c80c031db7 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby From 0f01e5bae915b3c2e84fd4bf046ebb5dc4e5db29 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 May 2018 05:03:18 +0000 Subject: [PATCH 155/462] Update to 2.6.0-preview1, bundler 1.16.2, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 796b76914e..42e029b4de 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 30169b60d4..34c2178b4f 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 7e68e44f1c..26af3b352c 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview1 ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby From b5ef401d348ca9b1d9f6a5cb4b25f32bf013daca Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 May 2018 05:03:18 +0000 Subject: [PATCH 156/462] Update to 2.2.10, bundler 1.16.2, rubygems 2.7.7 --- 2.2/alpine3.4/Dockerfile | 2 +- 2.2/jessie/Dockerfile | 2 +- 2.2/jessie/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index adef463c73..6566155bb3 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 047dac8366..671f9c233b 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 94b83433b8..a3e2f9660e 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.10 ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby From 3d06ea1d9574219883f37ecf3de7cbda2422516f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 May 2018 05:03:18 +0000 Subject: [PATCH 157/462] Update to 2.3.7, bundler 1.16.2, rubygems 2.7.7 --- 2.3/alpine3.4/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index 2ad9e2e95b..c405e74166 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 4e62e1acbc..eace3b8c49 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 694282dee8..0de9a637c9 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 37cfe631ef..ee6c536ce9 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index fd234724e8..3dbfc7f760 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby From 395cce4eba52917eb9a40c72d50703a1ce9e1acd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 May 2018 05:03:18 +0000 Subject: [PATCH 158/462] Update to 2.4.4, bundler 1.16.2, rubygems 2.7.7 --- 2.4/alpine3.4/Dockerfile | 2 +- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index fdfa9fa58f..c85050bfb5 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 49d637a432..d6071461e9 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index abebffeda6..8bf6723afb 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index af84834b49..591d088a31 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 596a0366d9..190c973ec2 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index d69cad9070..cc08911031 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 193cc43e90..ac2b07fd0f 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.6 +ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 # some of ruby's build scripts are written in ruby From 494b0dd834fbf0f2916a35be99023af930b4779b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 May 2018 14:05:57 -0700 Subject: [PATCH 159/462] Remove EOL 2.2 series See https://www.ruby-lang.org/en/downloads/branches/: > EOL date: scheduled for 2018-03-31 --- .travis.yml | 3 - 2.2/alpine3.4/Dockerfile | 112 ---------------------------------- 2.2/jessie/Dockerfile | 77 ----------------------- 2.2/jessie/onbuild/Dockerfile | 13 ---- 2.2/jessie/slim/Dockerfile | 103 ------------------------------- 5 files changed, 308 deletions(-) delete mode 100644 2.2/alpine3.4/Dockerfile delete mode 100644 2.2/jessie/Dockerfile delete mode 100644 2.2/jessie/onbuild/Dockerfile delete mode 100644 2.2/jessie/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 60d7bdae12..ec0a55876f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,6 @@ env: - VERSION=2.3 VARIANT=jessie - VERSION=2.3 VARIANT=jessie/slim - VERSION=2.3 VARIANT=alpine3.4 - - VERSION=2.2 VARIANT=jessie - - VERSION=2.2 VARIANT=jessie/slim - - VERSION=2.2 VARIANT=alpine3.4 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile deleted file mode 100644 index 6566155bb3..0000000000 --- a/2.2/alpine3.4/Dockerfile +++ /dev/null @@ -1,112 +0,0 @@ -FROM alpine:3.4 - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.10 -ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - openssl \ - openssl-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - openssl-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile deleted file mode 100644 index 671f9c233b..0000000000 --- a/2.2/jessie/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -FROM buildpack-deps:jessie - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.10 -ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] diff --git a/2.2/jessie/onbuild/Dockerfile b/2.2/jessie/onbuild/Dockerfile deleted file mode 100644 index 1c90bfd92d..0000000000 --- a/2.2/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:2.2 - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile deleted file mode 100644 index a3e2f9660e..0000000000 --- a/2.2/jessie/slim/Dockerfile +++ /dev/null @@ -1,103 +0,0 @@ -FROM debian:jessie - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgdbm3 \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.10 -ENV RUBY_DOWNLOAD_SHA256 bf77bcb7e6666ccae8d0882ea12b05f382f963f0a9a5285a328760c06a9ab650 -ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] From 7766c719ed4c11dd52a8e0e35195ec82097aebfe Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 22 May 2018 14:13:20 -0700 Subject: [PATCH 160/462] Add 2.3-alpine3.7, remove all Alpine 3.4 variants Alpine 3.4 is EOL; see https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases This also makes all `stretch` and `alpine3.7` variants default. --- .travis.yml | 3 +- 2.3/{alpine3.4 => alpine3.7}/Dockerfile | 8 +- 2.4/alpine3.4/Dockerfile | 112 ------------------------ generate-stackbrew-library.sh | 22 ++--- update.sh | 6 +- 5 files changed, 11 insertions(+), 140 deletions(-) rename 2.3/{alpine3.4 => alpine3.7}/Dockerfile (97%) delete mode 100644 2.4/alpine3.4/Dockerfile diff --git a/.travis.yml b/.travis.yml index ec0a55876f..83865fdb2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,11 @@ env: - VERSION=2.4 VARIANT=jessie/slim - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=alpine3.6 - - VERSION=2.4 VARIANT=alpine3.4 - VERSION=2.3 VARIANT=stretch - VERSION=2.3 VARIANT=stretch/slim - VERSION=2.3 VARIANT=jessie - VERSION=2.3 VARIANT=jessie/slim - - VERSION=2.3 VARIANT=alpine3.4 + - VERSION=2.3 VARIANT=alpine3.7 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.7/Dockerfile similarity index 97% rename from 2.3/alpine3.4/Dockerfile rename to 2.3/alpine3.7/Dockerfile index c405e74166..12c841b101 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM alpine:3.7 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ @@ -31,8 +31,8 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - openssl \ - openssl-dev \ + libressl \ + libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ @@ -85,7 +85,7 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - openssl-dev \ + libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile deleted file mode 100644 index c85050bfb5..0000000000 --- a/2.4/alpine3.4/Dockerfile +++ /dev/null @@ -1,112 +0,0 @@ -FROM alpine:3.4 - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 -ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - openssl \ - openssl-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - openssl-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" - -CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 8b322cd66c..a24716506c 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,16 +7,7 @@ declare -A aliases=( ) defaultDebianSuite='stretch' -declare -A debianSuites=( - [2.2]='jessie' - [2.3]='jessie' - [2.4]='jessie' -) defaultAlpineVersion='3.7' -declare -A alpineVersions=( - [2.2]='3.4' - [2.3]='3.4' -) self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -81,12 +72,9 @@ join() { } for version in "${versions[@]}"; do - debianSuite="${debianSuites[$version]:-$defaultDebianSuite}" - alpineVersion="${alpineVersions[$version]:-$defaultAlpineVersion}" - for v in \ {stretch,jessie}{,/slim,/onbuild} \ - alpine{3.7,3.6,3.4} \ + alpine{3.7,3.6} \ ; do dir="$version/$v" variant="$(basename "$v")" @@ -117,13 +105,13 @@ for version in "${versions[@]}"; do variantAliases=( "${versionAliases[@]/%/-$variant}" ) case "$variant" in - "$debianSuite") + "$defaultDebianSuite") variantAliases+=( "${versionAliases[@]}" ) ;; - *-"$debianSuite") - variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" ) + *-"$defaultDebianSuite") + variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianSuite}}" ) ;; - "alpine${alpineVersion}") + "alpine${defaultAlpineVersion}") variantAliases+=( "${versionAliases[@]/%/-alpine}" ) ;; esac diff --git a/update.sh b/update.sh index 5a31edfe23..8a76c06324 100755 --- a/update.sh +++ b/update.sh @@ -66,7 +66,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal" for v in \ - alpine{3.4,3.6,3.7} \ + alpine{3.6,3.7} \ {jessie,stretch}{/slim,/onbuild,} \ ; do dir="$version/$v" @@ -97,10 +97,6 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" - if [ "$variant" = 'alpine3.4' ]; then - sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile" - fi - case "$v" in */onbuild) ;; *) From 699a04311386ecc98ca242fc9bdee17fb4008863 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 21 May 2018 12:34:41 -0700 Subject: [PATCH 161/462] Remove BUNDLE_BIN and add GEM_HOME/bin back to PATH See https://github.com/docker-library/ruby/pull/208#issuecomment-390755292 --- 2.3/alpine3.7/Dockerfile | 8 ++++---- 2.3/jessie/Dockerfile | 8 ++++---- 2.3/jessie/slim/Dockerfile | 8 ++++---- 2.3/stretch/Dockerfile | 8 ++++---- 2.3/stretch/slim/Dockerfile | 8 ++++---- 2.4/alpine3.6/Dockerfile | 8 ++++---- 2.4/alpine3.7/Dockerfile | 8 ++++---- 2.4/jessie/Dockerfile | 8 ++++---- 2.4/jessie/slim/Dockerfile | 8 ++++---- 2.4/stretch/Dockerfile | 8 ++++---- 2.4/stretch/slim/Dockerfile | 8 ++++---- 2.5/alpine3.7/Dockerfile | 8 ++++---- 2.5/stretch/Dockerfile | 8 ++++---- 2.5/stretch/slim/Dockerfile | 8 ++++---- 2.6-rc/alpine3.7/Dockerfile | 8 ++++---- 2.6-rc/stretch/Dockerfile | 8 ++++---- 2.6-rc/stretch/slim/Dockerfile | 8 ++++---- Dockerfile-alpine.template | 8 ++++---- Dockerfile-debian.template | 8 ++++---- Dockerfile-slim.template | 8 ++++---- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 12c841b101..2853a4ce53 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index eace3b8c49..8a12e622b7 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -66,12 +66,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 0de9a637c9..70939abf84 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index ee6c536ce9..0f75c01fd7 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -68,12 +68,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 3dbfc7f760..2b4e438c2b 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index d6071461e9..d6dc0462a6 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 8bf6723afb..4b0dd8205a 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 591d088a31..de82348f3b 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -66,12 +66,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 190c973ec2..92842cc513 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index cc08911031..34899060d2 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -66,12 +66,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index ac2b07fd0f..a2d97467de 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 71725f3db4..d80296285d 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index c654d97eba..14d8198af1 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -66,12 +66,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index c80c031db7..8a71a2e25b 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 42e029b4de..a3f9ada1c6 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 34c2178b4f..6ba905b7c5 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -66,12 +66,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 26af3b352c..e687be268f 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1d0f9e0ef5..4a75626e5f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -101,12 +101,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ee05fcc0b0..3eb568b968 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -68,12 +68,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 8b0038c72e..3c2846a417 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -92,12 +92,12 @@ RUN set -ex \ # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $BUNDLE_PATH/gems/bin:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] From ecb78337005eb49371c4faf5f79d2675382d487a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 1 Jun 2018 05:03:13 +0000 Subject: [PATCH 162/462] Update to 2.6.0-preview2, bundler 1.16.2, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 4 ++-- 2.6-rc/stretch/Dockerfile | 4 ++-- 2.6-rc/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index a3f9ada1c6..9ae2b3b8ca 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e +ENV RUBY_VERSION 2.6.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 6ba905b7c5..e48c040fc4 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e +ENV RUBY_VERSION 2.6.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index e687be268f..ea0e3fa787 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 1d99139116e4e245ce543edb137b2a8873c26e9f0bde88d8cee6789617cc8d0e +ENV RUBY_VERSION 2.6.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.2 From 0bdb14674cb10d5b3d430b315f2930ca0f3a7381 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 9 Jul 2018 16:38:17 -0700 Subject: [PATCH 163/462] Fix update.sh version scraping --- update.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/update.sh b/update.sh index 8a76c06324..a57a2f4deb 100755 --- a/update.sh +++ b/update.sh @@ -28,13 +28,13 @@ for version in "${versions[@]}"; do rcGrepV= fi - IFS=$'\n'; allVersions=( - $(curl -fsSL --compressed "https://cache.ruby-lang.org/pub/ruby/$rcVersion/" \ - | grep -E ' Date: Tue, 17 Jul 2018 05:03:17 +0000 Subject: [PATCH 164/462] Update to 2.3.7, bundler 1.16.3, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 2853a4ce53..ae93e89412 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 8a12e622b7..f68ecd90e4 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 70939abf84..442c6d27aa 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 0f75c01fd7..864142cfad 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 2b4e438c2b..a422bf5b18 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From c43fef8a60cea31eb9e7d960a076d633cb62ba8d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Jul 2018 05:03:17 +0000 Subject: [PATCH 165/462] Update to 2.4.4, bundler 1.16.3, rubygems 2.7.7 --- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index d6dc0462a6..01c1f60b9a 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 4b0dd8205a..31daa0eb28 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index de82348f3b..c602fa9a55 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 92842cc513..b58ca9d77e 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 34899060d2..d83d74574b 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index a2d97467de..f5cd12b32f 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 57801cf4e9a2506e9c66380ab9e3ff9f63a669a7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Jul 2018 05:03:17 +0000 Subject: [PATCH 166/462] Update to 2.6.0-preview2, bundler 1.16.3, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 9ae2b3b8ca..f3976adb06 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index e48c040fc4..e5d7d6910e 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index ea0e3fa787..f36b73851a 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From eca972d167cf4291de898e85aaf50d9a1929d4c7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Jul 2018 05:03:17 +0000 Subject: [PATCH 167/462] Update to 2.5.1, bundler 1.16.3, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index d80296285d..c21be06050 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 14d8198af1..5fa1f0a74d 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 8a71a2e25b..e853a6f76b 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.2 +ENV BUNDLER_VERSION 1.16.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From b9e495c8e400363e6cc2d4db6d944235b7989584 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 20 Jul 2018 13:32:43 -0700 Subject: [PATCH 168/462] Finally remove onbuild completely --- .travis.yml | 6 ------ 2.3/jessie/onbuild/Dockerfile | 13 ------------- 2.4/jessie/onbuild/Dockerfile | 13 ------------- Dockerfile-onbuild.template | 13 ------------- generate-stackbrew-library.sh | 22 ++++------------------ update.sh | 11 +++-------- 6 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 2.3/jessie/onbuild/Dockerfile delete mode 100644 2.4/jessie/onbuild/Dockerfile delete mode 100644 Dockerfile-onbuild.template diff --git a/.travis.yml b/.travis.yml index 83865fdb2f..5c94bc40cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,12 +35,6 @@ script: set -x travis_retry docker build -t "$image" . ~/official-images/test/run.sh "$image" - if [ -d onbuild ]; then - onbuildFrom="$(awk 'toupper($1) == "FROM" { print $2; exit }' onbuild/Dockerfile)" - docker tag "$image" "$onbuildFrom" - docker build -t "$image-onbuild" onbuild - ~/official-images/test/run.sh "$image-onbuild" - fi ) after_script: diff --git a/2.3/jessie/onbuild/Dockerfile b/2.3/jessie/onbuild/Dockerfile deleted file mode 100644 index 7accb9c596..0000000000 --- a/2.3/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:2.3 - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app diff --git a/2.4/jessie/onbuild/Dockerfile b/2.4/jessie/onbuild/Dockerfile deleted file mode 100644 index 0cc4112d64..0000000000 --- a/2.4/jessie/onbuild/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:2.4 - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template deleted file mode 100644 index 3664cae175..0000000000 --- a/Dockerfile-onbuild.template +++ /dev/null @@ -1,13 +0,0 @@ -FROM ruby:%%VERSION%% - -# throw errors if Gemfile has been modified since Gemfile.lock -RUN bundle config --global frozen 1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD COPY Gemfile /usr/src/app/ -ONBUILD COPY Gemfile.lock /usr/src/app/ -ONBUILD RUN bundle install - -ONBUILD COPY . /usr/src/app diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a24716506c..a57829f011 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -73,7 +73,7 @@ join() { for version in "${versions[@]}"; do for v in \ - {stretch,jessie}{,/slim,/onbuild} \ + {stretch,jessie}{,/slim} \ alpine{3.7,3.6} \ ; do dir="$version/$v" @@ -89,13 +89,7 @@ for version in "${versions[@]}"; do commit="$(dirCommit "$dir")" - versionDockerfile="$dir/Dockerfile" - versionCommit="$commit" - if [ "$variant" = 'onbuild' ]; then - versionDockerfile="$(dirname "$dir")/Dockerfile" - versionCommit="$(dirCommit "$(dirname "$versionDockerfile")")" - fi - fullVersion="$(git show "$versionCommit":"$versionDockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" + fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" versionAliases=( $fullVersion @@ -117,16 +111,8 @@ for version in "${versions[@]}"; do esac variantAliases=( "${variantAliases[@]//latest-/}" ) - case "$v" in - */onbuild) - variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$(dirname "$dir")/Dockerfile")" - variantArches="${parentRepoToArches[$variantParent]}" - ;; - *) - variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" - variantArches="${parentRepoToArches[$variantParent]}" - ;; - esac + variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" + variantArches="${parentRepoToArches[$variantParent]}" echo cat <<-EOE diff --git a/update.sh b/update.sh index a57a2f4deb..a55320b566 100755 --- a/update.sh +++ b/update.sh @@ -67,7 +67,7 @@ for version in "${versions[@]}"; do for v in \ alpine{3.6,3.7} \ - {jessie,stretch}{/slim,/onbuild,} \ + {jessie,stretch}{/slim,} \ ; do dir="$version/$v" variant="$(basename "$v")" @@ -75,7 +75,7 @@ for version in "${versions[@]}"; do [ -d "$dir" ] || continue case "$variant" in - slim|onbuild|windowsservercore) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;; + slim|windowsservercore) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;; alpine*) template='alpine'; tag="${variant#alpine}" ;; *) template='debian'; tag="$variant" ;; esac @@ -97,12 +97,7 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" - case "$v" in - */onbuild) ;; - *) - travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv" - ;; - esac + travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv" done done From 93cb6e0bf34fd325bdf06495e9ec361f933c42c1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Jul 2018 09:16:58 -0700 Subject: [PATCH 169/462] Remove ending year from LICENSE See https://github.com/docker-library/golang/pull/212 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index e7208b523c..fbb62238dc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2014-2017 Docker, Inc. All rights reserved. +Copyright (C) 2014 Docker, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions From 8e4d795f70df296f79b1272b665cc0c970e58fe2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Aug 2018 17:03:14 +0000 Subject: [PATCH 170/462] Update to 2.6.0-preview2, bundler 1.16.4, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index f3976adb06..d053901a50 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index e5d7d6910e..9d049df985 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index f36b73851a..ee564e0844 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From a7ccc7ba6924a2abb902da99dae82aadde9b0581 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Aug 2018 17:03:14 +0000 Subject: [PATCH 171/462] Update to 2.4.4, bundler 1.16.4, rubygems 2.7.7 --- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 01c1f60b9a..ebe703b2c4 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 31daa0eb28..b6dabdaa2a 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index c602fa9a55..7e9bfcb389 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index b58ca9d77e..a43e108f06 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index d83d74574b..9b10aa09bd 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index f5cd12b32f..1abac02fde 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From a04dd5259eaef8d682dae2bb709f03219a6e5905 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Aug 2018 17:03:14 +0000 Subject: [PATCH 172/462] Update to 2.5.1, bundler 1.16.4, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index c21be06050..f91c6dfa02 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 5fa1f0a74d..09b8b676e7 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index e853a6f76b..a7f547b45f 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 4fa4c114e81bf8bdb653262c033da1d3fafa9141 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Aug 2018 17:03:14 +0000 Subject: [PATCH 173/462] Update to 2.3.7, bundler 1.16.4, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index ae93e89412..9a0d5af807 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index f68ecd90e4..f2daf6c54e 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 442c6d27aa..7ee637a069 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 864142cfad..070c9a9dc2 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index a422bf5b18..4fbfff1b73 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.3 +ENV BUNDLER_VERSION 1.16.4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 55b509b397ec2bc7d0e626fcca08310eb5f59981 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Sun, 9 Sep 2018 19:44:47 +0900 Subject: [PATCH 174/462] Remove libressl-dev from runtime dependency --- 2.3/alpine3.7/Dockerfile | 1 - 2.4/alpine3.6/Dockerfile | 1 - 2.4/alpine3.7/Dockerfile | 1 - 2.5/alpine3.7/Dockerfile | 1 - 2.6-rc/alpine3.7/Dockerfile | 1 - Dockerfile-alpine.template | 1 - 6 files changed, 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 9a0d5af807..512a3c691c 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index ebe703b2c4..b8ec8f36af 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index b6dabdaa2a..f04fb896fe 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f91c6dfa02..7ef43e6db0 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index d053901a50..7eaeff57e2 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4a75626e5f..759a8dfa9e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -85,7 +85,6 @@ RUN set -ex \ bzip2 \ ca-certificates \ libffi-dev \ - libressl-dev \ procps \ yaml-dev \ zlib-dev \ From 96967d8295f1b26a784e5893f41b5f5ccd8318eb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 13 Sep 2018 10:04:36 -0700 Subject: [PATCH 175/462] Add "--no-network" to all APK invocations that shouldn't need to hit the mirrors for any reason --- 2.3/alpine3.7/Dockerfile | 4 ++-- 2.4/alpine3.6/Dockerfile | 4 ++-- 2.4/alpine3.7/Dockerfile | 4 ++-- 2.5/alpine3.7/Dockerfile | 4 ++-- 2.6-rc/alpine3.7/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 512a3c691c..2a9c19b2b6 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index b8ec8f36af..8d611d8488 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index f04fb896fe..fbfe011b25 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 7ef43e6db0..f7a9f4d977 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 7eaeff57e2..7599271967 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 759a8dfa9e..15375cdfb1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ From bb5c7101e13cfa3632dfc21245b172c205d90353 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 13 Sep 2018 10:30:25 -0700 Subject: [PATCH 176/462] Add 2.3/alpine3.8 and 2.6-rc/alpine3.8 Alpine 3.8 for 2.4 and 2.5 need to wait for https://bugs.ruby-lang.org/issues/14754 backports to be released (should be 2.4.5+ and 2.5.2+ respectively). --- .travis.yml | 2 + 2.3/alpine3.8/Dockerfile | 111 ++++++++++++++++++++++++++++++++++ 2.6-rc/alpine3.8/Dockerfile | 111 ++++++++++++++++++++++++++++++++++ generate-stackbrew-library.sh | 12 +++- update.sh | 2 +- 5 files changed, 234 insertions(+), 4 deletions(-) create mode 100644 2.3/alpine3.8/Dockerfile create mode 100644 2.6-rc/alpine3.8/Dockerfile diff --git a/.travis.yml b/.travis.yml index 5c94bc40cf..50a719b4cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ services: docker env: - VERSION=2.6-rc VARIANT=stretch - VERSION=2.6-rc VARIANT=stretch/slim + - VERSION=2.6-rc VARIANT=alpine3.8 - VERSION=2.6-rc VARIANT=alpine3.7 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim @@ -18,6 +19,7 @@ env: - VERSION=2.3 VARIANT=stretch/slim - VERSION=2.3 VARIANT=jessie - VERSION=2.3 VARIANT=jessie/slim + - VERSION=2.3 VARIANT=alpine3.8 - VERSION=2.3 VARIANT=alpine3.7 install: diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile new file mode 100644 index 0000000000..187b7914e8 --- /dev/null +++ b/2.3/alpine3.8/Dockerfile @@ -0,0 +1,111 @@ +FROM alpine:3.8 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.3 +ENV RUBY_VERSION 2.3.7 +ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBYGEMS_VERSION 2.7.7 +ENV BUNDLER_VERSION 1.16.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile new file mode 100644 index 0000000000..de382a1464 --- /dev/null +++ b/2.6-rc/alpine3.8/Dockerfile @@ -0,0 +1,111 @@ +FROM alpine:3.8 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.6-rc +ENV RUBY_VERSION 2.6.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec +ENV RUBYGEMS_VERSION 2.7.7 +ENV BUNDLER_VERSION 1.16.4 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a57829f011..ab08a6f37f 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,7 +7,13 @@ declare -A aliases=( ) defaultDebianSuite='stretch' -defaultAlpineVersion='3.7' +defaultAlpineVersion='3.8' +declare -A alpineVersion=( + # "openssl_missing.h:196:22: error: static declaration of 'EVP_PKEY_get0_RSA' follows non-static declaration" (and friends) + # https://github.com/docker-library/ruby/issues/228 / https://bugs.ruby-lang.org/issues/14754 + [2.4]='3.7' # TODO remove this (and add Alpine 3.8) once 2.4.5+ is released + [2.5]='3.7' # TODO remove this (and add Alpine 3.8) once 2.5.2+ is released +) self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -74,7 +80,7 @@ join() { for version in "${versions[@]}"; do for v in \ {stretch,jessie}{,/slim} \ - alpine{3.7,3.6} \ + alpine{3.8,3.7,3.6} \ ; do dir="$version/$v" variant="$(basename "$v")" @@ -105,7 +111,7 @@ for version in "${versions[@]}"; do *-"$defaultDebianSuite") variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianSuite}}" ) ;; - "alpine${defaultAlpineVersion}") + "alpine${alpineVersion[$version]:-$defaultAlpineVersion}") variantAliases+=( "${versionAliases[@]/%/-alpine}" ) ;; esac diff --git a/update.sh b/update.sh index a55320b566..0c1222932e 100755 --- a/update.sh +++ b/update.sh @@ -66,7 +66,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal" for v in \ - alpine{3.6,3.7} \ + alpine{3.6,3.7,3.8} \ {jessie,stretch}{/slim,} \ ; do dir="$version/$v" From e7d27d514f15f3bffdc7fac383a8b83494317d47 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 14 Sep 2018 15:30:17 -0700 Subject: [PATCH 177/462] Apply update.sh to get #231 applied to alpine 3.8 images from #232 --- 2.3/alpine3.8/Dockerfile | 4 ++-- 2.6-rc/alpine3.8/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 187b7914e8..ec22bbe5f0 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index de382a1464..e0366612f8 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -81,14 +81,14 @@ RUN set -ex \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )" \ - && apk add --virtual .ruby-rundeps $runDeps \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del .ruby-builddeps \ + && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ \ From 3149de350c3bc540492a4331881b925e608c3abd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Sep 2018 17:03:13 +0000 Subject: [PATCH 178/462] Update to 2.4.4, bundler 1.16.5, rubygems 2.7.7 --- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 8d611d8488..416e5fd3ff 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index fbfe011b25..5f7dbeb76c 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 7e9bfcb389..51a7581f7a 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index a43e108f06..5465682f3b 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 9b10aa09bd..4740a5fe4f 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 1abac02fde..f17df60e6e 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 929ba8718f380644aaaa38047508256d1e7c5a3c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Sep 2018 17:03:13 +0000 Subject: [PATCH 179/462] Update to 2.6.0-preview2, bundler 1.16.5, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 7599271967..46e4ff6499 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index e0366612f8..46637fec5a 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 9d049df985..d4d2d1040f 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index ee564e0844..149d3e00a5 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 38e06eaab48f587fca9993a6c7124a11512ac65c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Sep 2018 17:03:13 +0000 Subject: [PATCH 180/462] Update to 2.5.1, bundler 1.16.5, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f7a9f4d977..dfe1e979cd 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 09b8b676e7..0aece2b4c8 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index a7f547b45f..0103347533 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From bba73b8fbe85081da0362b8e5224e6dc336ac0d6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Sep 2018 17:03:13 +0000 Subject: [PATCH 181/462] Update to 2.3.7, bundler 1.16.5, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 2a9c19b2b6..9b2db8ba02 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index ec22bbe5f0..256e549505 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index f2daf6c54e..3d2f5bb846 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 7ee637a069..ae2344c4ec 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 070c9a9dc2..4d6cb6d354 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 4fbfff1b73..23104c67a6 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.4 +ENV BUNDLER_VERSION 1.16.5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 87ab073c1cdb82c043eba4f144df5fa108031a5b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 20 Sep 2018 15:58:57 -0700 Subject: [PATCH 182/462] Apply Alpine thread stack size patch This patch was OK'd by a Ruby maintainer (https://bugs.ruby-lang.org/issues/14387#note-16), but hasn't been merged because it isn't generic enough to support glibc properly, which doesn't matter here (since we're Alpine-only in this context). --- 2.3/alpine3.7/Dockerfile | 8 ++++++++ 2.3/alpine3.8/Dockerfile | 8 ++++++++ 2.4/alpine3.6/Dockerfile | 8 ++++++++ 2.4/alpine3.7/Dockerfile | 8 ++++++++ 2.5/alpine3.7/Dockerfile | 8 ++++++++ 2.6-rc/alpine3.7/Dockerfile | 8 ++++++++ 2.6-rc/alpine3.8/Dockerfile | 8 ++++++++ Dockerfile-alpine.template | 8 ++++++++ 8 files changed, 64 insertions(+) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 9b2db8ba02..dd2b238627 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 256e549505..32f880c2fc 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 416e5fd3ff..e0921c0de9 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 5f7dbeb76c..81a24c5cd4 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index dfe1e979cd..f1227c95b0 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 46e4ff6499..5e3ef775a2 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 46637fec5a..7a90392dd5 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 15375cdfb1..44d86c18da 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -55,6 +55,14 @@ RUN set -ex \ \ && cd /usr/src/ruby \ \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir && { \ From a6559bd074b19055a37f7bdac7f40ae5d79010ed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 5 Oct 2018 11:03:18 +0000 Subject: [PATCH 183/462] Update to 2.6.0-preview2, bundler 1.16.6, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 5e3ef775a2..c68fa34481 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 7a90392dd5..67b1d63215 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index d4d2d1040f..f4416cbd08 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 149d3e00a5..f4ef43f9a2 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From ccf00a6b31abe14d27bdda498707a2ce338ef019 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 5 Oct 2018 11:03:18 +0000 Subject: [PATCH 184/462] Update to 2.5.1, bundler 1.16.6, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f1227c95b0..5a2e5eee87 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 0aece2b4c8..e4995a93e7 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 0103347533..148c3b4bda 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.1 ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 676eadd43f87bdb1d3f033ea31ae69e45d11ee5b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 5 Oct 2018 11:03:18 +0000 Subject: [PATCH 185/462] Update to 2.3.7, bundler 1.16.6, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index dd2b238627..d08d87fcf4 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 32f880c2fc..daf556fbf5 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 3d2f5bb846..98121da75d 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index ae2344c4ec..0cac61dbea 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 4d6cb6d354..41736ed5f3 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 23104c67a6..aec42545d9 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.7 ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From ccacdf5eb9e69b6f249a890c87621679410e7d74 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 5 Oct 2018 11:03:18 +0000 Subject: [PATCH 186/462] Update to 2.4.4, bundler 1.16.6, rubygems 2.7.7 --- 2.4/alpine3.6/Dockerfile | 2 +- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index e0921c0de9..9f4e47f7b3 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 81a24c5cd4..23a24baa77 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 51a7581f7a..e97ccdf007 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 5465682f3b..90877823bc 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 4740a5fe4f..2f4fca1e70 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index f17df60e6e..3257b491ff 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.4 ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.5 +ENV BUNDLER_VERSION 1.16.6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 58cbeeb8ea937737eeb8f358472add230b6ded30 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Oct 2018 19:56:02 +0000 Subject: [PATCH 187/462] Update to 2.4.5, bundler 1.16.6, rubygems 2.7.7 --- 2.4/alpine3.6/Dockerfile | 4 ++-- 2.4/alpine3.7/Dockerfile | 4 ++-- 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 9f4e47f7b3..f1f230a12c 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 23a24baa77..d4274fabde 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index e97ccdf007..346510bf97 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 90877823bc..5cdd55c097 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 2f4fca1e70..06ad58d4f7 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 3257b491ff..8719bebfa0 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.4 -ENV RUBY_DOWNLOAD_SHA256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 From eed4e6befb2d0b9d4735659315d825cf6e3bc02d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Oct 2018 19:56:02 +0000 Subject: [PATCH 188/462] Update to 2.5.2, bundler 1.16.6, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 5a2e5eee87..4d8ec0d5eb 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_VERSION 2.5.2 +ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index e4995a93e7..4a9ff69702 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_VERSION 2.5.2 +ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 148c3b4bda..8a428c19ef 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.1 -ENV RUBY_DOWNLOAD_SHA256 886ac5eed41e3b5fc699be837b0087a6a5a3d10f464087560d2d21b3e71b754d +ENV RUBY_VERSION 2.5.2 +ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 From 36c87bb64362de2e6e9ea003104030ca2a5fc4e5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Oct 2018 19:56:02 +0000 Subject: [PATCH 189/462] Update to 2.3.8, bundler 1.16.6, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 4 ++-- 2.3/alpine3.8/Dockerfile | 4 ++-- 2.3/jessie/Dockerfile | 4 ++-- 2.3/jessie/slim/Dockerfile | 4 ++-- 2.3/stretch/Dockerfile | 4 ++-- 2.3/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index d08d87fcf4..4b33e7c7c5 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index daf556fbf5..2f5d6b0c7f 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 98121da75d..9a659d2952 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 0cac61dbea..4ddcc4fa3f 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 41736ed5f3..b16e8fa14c 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index aec42545d9..29ac2d83ae 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.7 -ENV RUBY_DOWNLOAD_SHA256 c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb +ENV RUBY_VERSION 2.3.8 +ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 From 0bdbbff7475155c90a5945f13daf7067a7bd9f11 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Oct 2018 16:02:00 +0000 Subject: [PATCH 190/462] Update to 2.5.3, bundler 1.16.6, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 4d8ec0d5eb..f2804c32fc 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 4a9ff69702..9f30235262 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 8a428c19ef..c47bc418d5 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 From 41d798955ded54ec8ed4befdf9ca6f393ef8f13b Mon Sep 17 00:00:00 2001 From: Trevor John Date: Thu, 18 Oct 2018 11:52:45 -0400 Subject: [PATCH 191/462] Upgrade Ruby to 2.5.3 --- 2.5/alpine3.7/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 4d8ec0d5eb..f2804c32fc 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 4a9ff69702..9f30235262 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 8a428c19ef..c47bc418d5 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.2 -ENV RUBY_DOWNLOAD_SHA256 8be6b6afdf09957a6e2c2a6ada4b1982a391a828b34e49072c4beb60febb678d +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 ENV BUNDLER_VERSION 1.16.6 From 06192e37c6daec1d2f2a516c04c7bcc97174b1e2 Mon Sep 17 00:00:00 2001 From: Ashley Hull Date: Fri, 19 Oct 2018 06:00:09 +1100 Subject: [PATCH 192/462] Support Alpine 3.8 --- .travis.yml | 2 + 2.4/alpine3.8/Dockerfile | 119 ++++++++++++++++++++++++++++++++++ 2.5/alpine3.8/Dockerfile | 119 ++++++++++++++++++++++++++++++++++ generate-stackbrew-library.sh | 7 +- 4 files changed, 243 insertions(+), 4 deletions(-) create mode 100644 2.4/alpine3.8/Dockerfile create mode 100644 2.5/alpine3.8/Dockerfile diff --git a/.travis.yml b/.travis.yml index 50a719b4cb..dde4aab6d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,13 @@ env: - VERSION=2.6-rc VARIANT=alpine3.7 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.8 - VERSION=2.5 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.8 - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.3 VARIANT=stretch diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile new file mode 100644 index 0000000000..de419971c5 --- /dev/null +++ b/2.4/alpine3.8/Dockerfile @@ -0,0 +1,119 @@ +FROM alpine:3.8 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.4 +ENV RUBY_VERSION 2.4.5 +ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBYGEMS_VERSION 2.7.7 +ENV BUNDLER_VERSION 1.16.6 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del --no-network .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile new file mode 100644 index 0000000000..2fe0d7a9e1 --- /dev/null +++ b/2.5/alpine3.8/Dockerfile @@ -0,0 +1,119 @@ +FROM alpine:3.8 + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.3 +ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f +ENV RUBYGEMS_VERSION 2.7.7 +ENV BUNDLER_VERSION 1.16.6 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libressl \ + libressl-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del --no-network .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ + \ + && gem update --system "$RUBYGEMS_VERSION" \ + && gem install bundler --version "$BUNDLER_VERSION" --force \ + && rm -r /root/.gem/ + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ab08a6f37f..6828fbe298 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,10 +9,9 @@ declare -A aliases=( defaultDebianSuite='stretch' defaultAlpineVersion='3.8' declare -A alpineVersion=( - # "openssl_missing.h:196:22: error: static declaration of 'EVP_PKEY_get0_RSA' follows non-static declaration" (and friends) - # https://github.com/docker-library/ruby/issues/228 / https://bugs.ruby-lang.org/issues/14754 - [2.4]='3.7' # TODO remove this (and add Alpine 3.8) once 2.4.5+ is released - [2.5]='3.7' # TODO remove this (and add Alpine 3.8) once 2.5.2+ is released + [2.4]='3.8' + [2.5]='3.8' + [2.6-rc]='3.8' ) self="$(basename "$BASH_SOURCE")" From 62dc7ec9b1f4ff7c54159520083905859237a725 Mon Sep 17 00:00:00 2001 From: Ashley Hull Date: Fri, 19 Oct 2018 08:47:36 +1100 Subject: [PATCH 193/462] minor tweak to rerun travis --- generate-stackbrew-library.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6828fbe298..50fe0b8482 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,7 +11,6 @@ defaultAlpineVersion='3.8' declare -A alpineVersion=( [2.4]='3.8' [2.5]='3.8' - [2.6-rc]='3.8' ) self="$(basename "$BASH_SOURCE")" From 0b4ab84ebb15d80b591a5610200cf537fc4740ad Mon Sep 17 00:00:00 2001 From: ashleyhull-versent Date: Fri, 19 Oct 2018 11:27:54 +1100 Subject: [PATCH 194/462] Update generate-stackbrew-library.sh --- generate-stackbrew-library.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 50fe0b8482..3b8f0fc949 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,8 +9,7 @@ declare -A aliases=( defaultDebianSuite='stretch' defaultAlpineVersion='3.8' declare -A alpineVersion=( - [2.4]='3.8' - [2.5]='3.8' + #[2.5]='3.8' ) self="$(basename "$BASH_SOURCE")" From 0522484eefcb89bcf766277dffcc3003b3ee09f5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 19 Oct 2018 14:01:10 -0700 Subject: [PATCH 195/462] Remove Alpine 3.6 support from Ruby 2.4 (now that it has 3.8) See https://github.com/docker-library/ruby/pull/241. --- .travis.yml | 1 - 2.4/alpine3.6/Dockerfile | 119 --------------------------------------- 2 files changed, 120 deletions(-) delete mode 100644 2.4/alpine3.6/Dockerfile diff --git a/.travis.yml b/.travis.yml index dde4aab6d5..36d14e95c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ env: - VERSION=2.4 VARIANT=jessie/slim - VERSION=2.4 VARIANT=alpine3.8 - VERSION=2.4 VARIANT=alpine3.7 - - VERSION=2.4 VARIANT=alpine3.6 - VERSION=2.3 VARIANT=stretch - VERSION=2.3 VARIANT=stretch/slim - VERSION=2.3 VARIANT=jessie diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile deleted file mode 100644 index f1f230a12c..0000000000 --- a/2.4/alpine3.6/Dockerfile +++ /dev/null @@ -1,119 +0,0 @@ -FROM alpine:3.6 - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libressl \ - libressl-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] From 6ebcb6b03454b1ca0c61407523f549a7bd669763 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 05:03:22 +0000 Subject: [PATCH 196/462] Update to 2.6.0-preview2, bundler 1.17.0, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index c68fa34481..38146c45d4 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 67b1d63215..83bea8c696 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index f4416cbd08..5424d29ad8 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index f4ef43f9a2..2003b43a2a 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 0ec28789af73f3a02ec675ee49172cc3cd1bfce2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 05:03:22 +0000 Subject: [PATCH 197/462] Update to 2.3.8, bundler 1.17.0, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 4b33e7c7c5..5eee19f195 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 2f5d6b0c7f..f88f7a0bf8 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 9a659d2952..77cf365cab 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 4ddcc4fa3f..65e4287231 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index b16e8fa14c..089d1deb76 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 29ac2d83ae..10df3f20f5 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 94c61b83026af46f7909aed29269a56247110485 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 05:03:22 +0000 Subject: [PATCH 198/462] Update to 2.5.3, bundler 1.17.0, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index f2804c32fc..3222c65ddc 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 2fe0d7a9e1..25031ad1a1 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 9f30235262..044bdb35de 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index c47bc418d5..cae089cb7c 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 95a644170764312bec299ca00c933bafdd1c9c64 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 05:03:23 +0000 Subject: [PATCH 199/462] Update to 2.4.5, bundler 1.17.0, rubygems 2.7.7 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index d4274fabde..662d642312 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index de419971c5..facafedbc3 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 346510bf97..9d430eebd5 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 5cdd55c097..2b8ebed1fc 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 06ad58d4f7..5bed76c9f5 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 8719bebfa0..a718d76a31 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.16.6 +ENV BUNDLER_VERSION 1.17.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 11b069f7a672f1900534901d50debae8e2770559 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 23:03:29 +0000 Subject: [PATCH 200/462] Update to 2.6.0-preview2, bundler 1.17.1, rubygems 2.7.7 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 38146c45d4..9523b08bf6 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 83bea8c696..3f0b8aee6a 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 5424d29ad8..8174530250 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 2003b43a2a..5fd6326cb3 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9e6a656108d5227e5788dcf5f0e4c63e726dc3e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 23:03:30 +0000 Subject: [PATCH 201/462] Update to 2.3.8, bundler 1.17.1, rubygems 2.7.7 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 5eee19f195..e50948b933 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index f88f7a0bf8..5448457446 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 77cf365cab..b1e5a2bf27 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 65e4287231..d02d08390c 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 089d1deb76..dc11b2e51b 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 10df3f20f5..2ec08c6a09 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From a1c2d5ce79ea8f0c381e24fbe535bd090043c393 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 23:03:30 +0000 Subject: [PATCH 202/462] Update to 2.4.5, bundler 1.17.1, rubygems 2.7.7 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 662d642312..c97c05b367 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index facafedbc3..dd514febff 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 9d430eebd5..e08ac46427 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 2b8ebed1fc..3c049e68d1 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 5bed76c9f5..84230c0ca0 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index a718d76a31..c2aac44df3 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From fc6fd1e86d41ca7efa2737374ca12f73c3bc42ac Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Oct 2018 23:03:30 +0000 Subject: [PATCH 203/462] Update to 2.5.3, bundler 1.17.1, rubygems 2.7.7 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 3222c65ddc..512a99b6a6 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 25031ad1a1..18cefe6f09 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 044bdb35de..7e9def251e 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index cae089cb7c..0e982f15cb 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.7 -ENV BUNDLER_VERSION 1.17.0 +ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9a70e975dc5b8f643d2a3918e2b1f50629a27220 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Nov 2018 11:03:13 +0000 Subject: [PATCH 204/462] Update to 2.6.0-preview2, bundler 1.17.1, rubygems 2.7.8 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 9523b08bf6..c312dcf6ec 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 3f0b8aee6a..8296900ef3 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 8174530250..bb94cdc9f6 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 5fd6326cb3..4e7588968b 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-preview2 ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby From f3f2ecfc0e9d2957af9e14d5a314ca223fb008d2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Nov 2018 11:03:13 +0000 Subject: [PATCH 205/462] Update to 2.3.8, bundler 1.17.1, rubygems 2.7.8 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index e50948b933..90451e9de9 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 5448457446..03308329a5 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index b1e5a2bf27..b219faa5c3 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index d02d08390c..7cae5c8a87 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index dc11b2e51b..32b9a8f7ba 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 2ec08c6a09..4c1b544234 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby From 9af33e632f173e90b4a7aba7644f2080b574e54f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Nov 2018 11:03:13 +0000 Subject: [PATCH 206/462] Update to 2.5.3, bundler 1.17.1, rubygems 2.7.8 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 512a99b6a6..20644f6da3 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 18cefe6f09..d87541ea28 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 7e9def251e..c7b82cf5c9 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 0e982f15cb..ede226da13 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby From 5fbf07f3c82789488c6ea6080cf000a773c38765 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Nov 2018 11:03:13 +0000 Subject: [PATCH 207/462] Update to 2.4.5, bundler 1.17.1, rubygems 2.7.8 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index c97c05b367..1737621c9b 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index dd514febff..f9244a5c6d 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index e08ac46427..c3ccc672aa 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 3c049e68d1..a9275ee23c 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 84230c0ca0..6d3a2c24f1 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index c2aac44df3..88def33885 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.7 +ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 # some of ruby's build scripts are written in ruby From 7efc2b75c021c08bbe17207059b5fb3d21dd7355 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Nov 2018 18:03:17 +0000 Subject: [PATCH 208/462] Update to 2.6.0-preview3, bundler 1.17.1, rubygems 2.7.8 --- 2.6-rc/alpine3.7/Dockerfile | 4 ++-- 2.6-rc/alpine3.8/Dockerfile | 4 ++-- 2.6-rc/stretch/Dockerfile | 4 ++-- 2.6-rc/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index c312dcf6ec..00b2ea2904 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec +ENV RUBY_VERSION 2.6.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 8296900ef3..804fb8f5bd 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec +ENV RUBY_VERSION 2.6.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index bb94cdc9f6..87de6ea70c 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec +ENV RUBY_VERSION 2.6.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 4e7588968b..55f34f302e 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 00ddfb5e33dee24469dd0b203597f7ecee66522ebb496f620f5815372ea2d3ec +ENV RUBY_VERSION 2.6.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 From d3b9c1e52bdbd4a13d331e8889f03fb46e893375 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 7 Dec 2018 22:39:10 +0000 Subject: [PATCH 209/462] Update to 2.6.0-rc1, bundler 1.17.1, rubygems 2.7.8 --- 2.6-rc/alpine3.7/Dockerfile | 4 ++-- 2.6-rc/alpine3.8/Dockerfile | 4 ++-- 2.6-rc/stretch/Dockerfile | 4 ++-- 2.6-rc/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 00b2ea2904..25c7aa05b7 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe +ENV RUBY_VERSION 2.6.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 804fb8f5bd..454d736d59 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe +ENV RUBY_VERSION 2.6.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 87de6ea70c..7b331b74d2 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe +ENV RUBY_VERSION 2.6.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 55f34f302e..53d42df80a 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 9856d9e0e32df9e5cdf01928eec363d037f1a76dab2abbf828170647beaf64fe +ENV RUBY_VERSION 2.6.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.1 From 2a42895d9fbb839e456f2f3624117761f86bcf43 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Dec 2018 12:03:14 +0000 Subject: [PATCH 210/462] Update to 2.6.0-rc1, bundler 1.17.2, rubygems 2.7.8 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index 25c7aa05b7..a6ba5bf0d9 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc1 ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 454d736d59..93d905dffb 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc1 ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 7b331b74d2..7130f17981 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc1 ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 53d42df80a..e54bbdece7 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc1 ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 8f56bde4498cb53ab4dec6d6a132e588487eb9b2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Dec 2018 12:03:14 +0000 Subject: [PATCH 211/462] Update to 2.4.5, bundler 1.17.2, rubygems 2.7.8 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 1737621c9b..7d3364854f 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index f9244a5c6d..193e1e037e 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index c3ccc672aa..81d1ba748b 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index a9275ee23c..44690da09d 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 6d3a2c24f1..37ed60a03a 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 88def33885..1477846bc1 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 6ae6b4aa2255ffb9ae9997efc104c4095c45f78e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Dec 2018 12:03:14 +0000 Subject: [PATCH 212/462] Update to 2.5.3, bundler 1.17.2, rubygems 2.7.8 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 20644f6da3..fd19103a17 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index d87541ea28..dd43dc5dd1 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index c7b82cf5c9..122c87e4ee 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index ede226da13..d2ae21f226 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From a5dc0f54319ad958ea5217eef9d6477c753b7fed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Dec 2018 12:03:15 +0000 Subject: [PATCH 213/462] Update to 2.3.8, bundler 1.17.2, rubygems 2.7.8 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 90451e9de9..2435c52d87 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 03308329a5..dcc026d02d 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index b219faa5c3..15d7f1b25b 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 7cae5c8a87..83ca4dc181 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 32b9a8f7ba..fe43af6080 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 4c1b544234..e860adaff2 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 2.7.8 -ENV BUNDLER_VERSION 1.17.1 +ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 2b705cda315ff35733fa0d8c6edf19754cefb1d7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 15 Dec 2018 18:03:15 +0000 Subject: [PATCH 214/462] Update to 2.6.0-rc2, bundler 1.17.2, rubygems 2.7.8 --- 2.6-rc/alpine3.7/Dockerfile | 4 ++-- 2.6-rc/alpine3.8/Dockerfile | 4 ++-- 2.6-rc/stretch/Dockerfile | 4 ++-- 2.6-rc/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index a6ba5bf0d9..fc31c30e68 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 +ENV RUBY_VERSION 2.6.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 93d905dffb..55ed2de67d 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 +ENV RUBY_VERSION 2.6.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 7130f17981..26690e500a 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 +ENV RUBY_VERSION 2.6.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index e54bbdece7..3e73e2ebae 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 21d9d54c20e45ccacecf8bea4dfccd05edc52479c776381ae98ef6a7b4afa739 +ENV RUBY_VERSION 2.6.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d ENV RUBYGEMS_VERSION 2.7.8 ENV BUNDLER_VERSION 1.17.2 From 1dd037551249b71b37117f2bdfeee0f18218d887 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 23 Dec 2018 00:03:22 +0000 Subject: [PATCH 215/462] Update to 2.3.8, bundler 1.17.2, rubygems 3.0.1 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 2435c52d87..fe619019bd 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index dcc026d02d..b64995bbe4 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 15d7f1b25b..bd26aa825e 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 83ca4dc181..115b305eb9 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index fe43af6080..3fcd2036f0 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index e860adaff2..728069a626 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby From 0ad99abb2b6d2df55d7b9b38440dacfe436fe0c3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 23 Dec 2018 00:03:22 +0000 Subject: [PATCH 216/462] Update to 2.5.3, bundler 1.17.2, rubygems 3.0.1 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index fd19103a17..940de32593 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index dd43dc5dd1..6ccf36baf8 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 122c87e4ee..cc279eeb1b 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index d2ae21f226..7000c4ba8d 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby From 9f560c29e7d37e9b3e646c73bb829c56eb70d763 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 23 Dec 2018 00:03:22 +0000 Subject: [PATCH 217/462] Update to 2.6.0-rc2, bundler 1.17.2, rubygems 3.0.1 --- 2.6-rc/alpine3.7/Dockerfile | 2 +- 2.6-rc/alpine3.8/Dockerfile | 2 +- 2.6-rc/stretch/Dockerfile | 2 +- 2.6-rc/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile index fc31c30e68..32427500e8 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6-rc/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc2 ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6-rc/alpine3.8/Dockerfile index 55ed2de67d..c5c71e279f 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6-rc/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc2 ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile index 26690e500a..bbf72f050e 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6-rc/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc2 ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile index 3e73e2ebae..329ad25ebf 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6-rc/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6-rc ENV RUBY_VERSION 2.6.0-rc2 ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby From fec6089b541d8de9abc8646781785293f8e051d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 23 Dec 2018 00:03:22 +0000 Subject: [PATCH 218/462] Update to 2.4.5, bundler 1.17.2, rubygems 3.0.1 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 7d3364854f..acbdd10eeb 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 193e1e037e..8c92f229f5 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 81d1ba748b..efc6b007d8 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 44690da09d..526c2a94a5 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 37ed60a03a..e2f4a6fb06 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 1477846bc1..58a4a98f2c 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 2.7.8 +ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 # some of ruby's build scripts are written in ruby From d4be0c416c61f1de327badb94e629aa993c2e2b4 Mon Sep 17 00:00:00 2001 From: booink Date: Wed, 26 Dec 2018 00:37:25 +0900 Subject: [PATCH 219/462] Update to 2.6.0 (GA) --- .travis.yml | 8 ++++---- {2.6-rc => 2.6}/alpine3.7/Dockerfile | 6 +++--- {2.6-rc => 2.6}/alpine3.8/Dockerfile | 6 +++--- {2.6-rc => 2.6}/stretch/Dockerfile | 6 +++--- {2.6-rc => 2.6}/stretch/slim/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) rename {2.6-rc => 2.6}/alpine3.7/Dockerfile (96%) rename {2.6-rc => 2.6}/alpine3.8/Dockerfile (96%) rename {2.6-rc => 2.6}/stretch/Dockerfile (93%) rename {2.6-rc => 2.6}/stretch/slim/Dockerfile (94%) diff --git a/.travis.yml b/.travis.yml index 36d14e95c6..d927f535f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: bash services: docker env: - - VERSION=2.6-rc VARIANT=stretch - - VERSION=2.6-rc VARIANT=stretch/slim - - VERSION=2.6-rc VARIANT=alpine3.8 - - VERSION=2.6-rc VARIANT=alpine3.7 + - VERSION=2.6 VARIANT=stretch + - VERSION=2.6 VARIANT=stretch/slim + - VERSION=2.6 VARIANT=alpine3.8 + - VERSION=2.6 VARIANT=alpine3.7 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim - VERSION=2.5 VARIANT=alpine3.8 diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile similarity index 96% rename from 2.6-rc/alpine3.7/Dockerfile rename to 2.6/alpine3.7/Dockerfile index 32427500e8..b79a462c2f 100644 --- a/2.6-rc/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.0 +ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile similarity index 96% rename from 2.6-rc/alpine3.8/Dockerfile rename to 2.6/alpine3.8/Dockerfile index c5c71e279f..3131339c7c 100644 --- a/2.6-rc/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.0 +ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/stretch/Dockerfile b/2.6/stretch/Dockerfile similarity index 93% rename from 2.6-rc/stretch/Dockerfile rename to 2.6/stretch/Dockerfile index bbf72f050e..7569a44255 100644 --- a/2.6-rc/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.0 +ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile similarity index 94% rename from 2.6-rc/stretch/slim/Dockerfile rename to 2.6/stretch/slim/Dockerfile index 329ad25ebf..8bd5cbfdbc 100644 --- a/2.6-rc/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -19,9 +19,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.6-rc -ENV RUBY_VERSION 2.6.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 d620b3d87b3190867304067f3ce77f5305f7ec1b2e73b09c17710c97c028986d +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.0 +ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 ENV BUNDLER_VERSION 1.17.2 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 3b8f0fc949..d036d0fbe7 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,8 @@ set -Eeuo pipefail declare -A aliases=( - [2.5]='2 latest' - [2.6-rc]='rc' + [2.6]='2 latest' + [2.7-rc]='rc' ) defaultDebianSuite='stretch' From 3c52e456a323e12f76639993ae2bcf0429193cdd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Dec 2018 06:03:16 +0000 Subject: [PATCH 220/462] Update to 2.6.0, bundler 1.17.3, rubygems 3.0.1 --- 2.6/alpine3.7/Dockerfile | 2 +- 2.6/alpine3.8/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index b79a462c2f..cb9e3bd38e 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 3131339c7c..269849688c 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 7569a44255..e74fa1171d 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 8bd5cbfdbc..665cc17b99 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 3e08dc45ad0386783e757d91347c6a61bc21744e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Dec 2018 06:03:16 +0000 Subject: [PATCH 221/462] Update to 2.3.8, bundler 1.17.3, rubygems 3.0.1 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index fe619019bd..8fa4de4953 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index b64995bbe4..7ea3885933 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index bd26aa825e..5f3cbec26a 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 115b305eb9..31636948df 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 3fcd2036f0..e40308cbd7 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 728069a626..5288e633e1 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 9a8e858e5d031266333cf79593b8581d32dd1b73 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Dec 2018 06:03:16 +0000 Subject: [PATCH 222/462] Update to 2.5.3, bundler 1.17.3, rubygems 3.0.1 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 940de32593..3a5809cf2a 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 6ccf36baf8..d2c323f134 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index cc279eeb1b..fc1e03f041 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 7000c4ba8d..ccd90c2215 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From ba8328861cb53f2ad6fbaff788d5e2b904ab9c6d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Dec 2018 06:03:16 +0000 Subject: [PATCH 223/462] Update to 2.4.5, bundler 1.17.3, rubygems 3.0.1 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index acbdd10eeb..d5b601b5d7 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 8c92f229f5..35a41fe219 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index efc6b007d8..bdb1458280 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 526c2a94a5..05717672f2 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e2f4a6fb06..39de92dbf5 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 58a4a98f2c..f66b4a15b0 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -ENV BUNDLER_VERSION 1.17.2 +ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 14d0ae96bc722862824d5b4d43ea96aae7ceeb26 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jan 2019 00:03:13 +0000 Subject: [PATCH 224/462] Update to 2.6.0, bundler 1.17.3, rubygems 3.0.2 --- 2.6/alpine3.7/Dockerfile | 2 +- 2.6/alpine3.8/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index cb9e3bd38e..4ce3689606 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 269849688c..e46a0cf4eb 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index e74fa1171d..9c06fd876a 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 665cc17b99..ef84c504e1 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby From 8f55f8326c17a83d18497075b0f6778e9241f385 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jan 2019 00:03:13 +0000 Subject: [PATCH 225/462] Update to 2.3.8, bundler 1.17.3, rubygems 3.0.2 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 8fa4de4953..aa781ebf8e 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 7ea3885933..ff28081149 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 5f3cbec26a..05c2aa2a45 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 31636948df..5c7585ebdb 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index e40308cbd7..e1b9e2aa50 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 5288e633e1..7a83dbd089 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby From da2d089fcfde0ae3b29d2ac70f3b672b07f1b2a7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jan 2019 00:03:13 +0000 Subject: [PATCH 226/462] Update to 2.5.3, bundler 1.17.3, rubygems 3.0.2 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 3a5809cf2a..2e5d6039f3 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index d2c323f134..17d70c2643 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index fc1e03f041..c38a6508f9 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index ccd90c2215..6629ef1b78 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby From 9f4f91be8b49e7c5f9323f214ea6765bebccf031 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jan 2019 00:03:13 +0000 Subject: [PATCH 227/462] Update to 2.4.5, bundler 1.17.3, rubygems 3.0.2 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index d5b601b5d7..138b8e0d0b 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 35a41fe219..8682c49124 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index bdb1458280..a48f330cdf 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 05717672f2..9f832e0a1e 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 39de92dbf5..d79c916801 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index f66b4a15b0..74bbf1d2dd 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,7 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.2 ENV BUNDLER_VERSION 1.17.3 # some of ruby's build scripts are written in ruby From 226cce854ebbc56800c11d013cace0fd1c891b1d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Jan 2019 06:03:28 +0000 Subject: [PATCH 228/462] Update to 2.4.5, bundler 2.0.0, rubygems 3.0.2 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 138b8e0d0b..5cb1045314 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 8682c49124..2678409bf6 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index a48f330cdf..54f262b443 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 9f832e0a1e..36fcb91b4a 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index d79c916801..e40b57d089 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 74bbf1d2dd..c8a0abb43c 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From c7024396963d31e4cdfaf43fdcb8147a3070f792 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Jan 2019 06:03:28 +0000 Subject: [PATCH 229/462] Update to 2.6.0, bundler 2.0.0, rubygems 3.0.2 --- 2.6/alpine3.7/Dockerfile | 2 +- 2.6/alpine3.8/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index 4ce3689606..7dd718fba1 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index e46a0cf4eb..f9f003c6ed 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 9c06fd876a..0e23719acf 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index ef84c504e1..a37a90ce84 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From e537d1c6f4331494f2fd051bffd3083c33a99897 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Jan 2019 06:03:28 +0000 Subject: [PATCH 230/462] Update to 2.3.8, bundler 2.0.0, rubygems 3.0.2 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index aa781ebf8e..9aea9d140c 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index ff28081149..f735b026ef 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 05c2aa2a45..ee912dc6c8 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 5c7585ebdb..5a24ea6567 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index e1b9e2aa50..bebd42a4c9 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 7a83dbd089..acafcb2f8d 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 16e0fadd9889314579e6190673ab456eb8f65ed6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Jan 2019 06:03:29 +0000 Subject: [PATCH 231/462] Update to 2.5.3, bundler 2.0.0, rubygems 3.0.2 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 2e5d6039f3..83c8d10b50 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 17d70c2643..1d5d94208c 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index c38a6508f9..a243a74d6c 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 6629ef1b78..8f51796ccf 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 1.17.3 +ENV BUNDLER_VERSION 2.0.0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 25c97d1a7a4f2c62136e6506ef870cbc44895e41 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 4 Jan 2019 06:03:27 +0000 Subject: [PATCH 232/462] Update to 2.5.3, bundler 2.0.1, rubygems 3.0.2 --- 2.5/alpine3.7/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 83c8d10b50..64cbadc890 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 1d5d94208c..e95d1e2800 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index a243a74d6c..027a1d6f12 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 8f51796ccf..d1af5b1d51 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 84cf376a5d7c1394082513afc947fc7102ac5686 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 4 Jan 2019 06:03:28 +0000 Subject: [PATCH 233/462] Update to 2.3.8, bundler 2.0.1, rubygems 3.0.2 --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 9aea9d140c..8005b2a159 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index f735b026ef..934b2625b4 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index ee912dc6c8..65aee4954e 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 5a24ea6567..d7c60bc77d 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index bebd42a4c9..9e3552b553 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index acafcb2f8d..432d6cfc5c 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 62cf9d368599d64ee407178048c2107e0f6b7a17 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 4 Jan 2019 06:03:28 +0000 Subject: [PATCH 234/462] Update to 2.4.5, bundler 2.0.1, rubygems 3.0.2 --- 2.4/alpine3.7/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 5cb1045314..91d71449cd 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 2678409bf6..4c50050213 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 54f262b443..8c43a0107a 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 36fcb91b4a..fcde488842 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e40b57d089..52a72d58ec 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index c8a0abb43c..fabd984c3e 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 489c6d4128fd6aa273384018ba3a2ce296fb0221 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 4 Jan 2019 06:03:28 +0000 Subject: [PATCH 235/462] Update to 2.6.0, bundler 2.0.1, rubygems 3.0.2 --- 2.6/alpine3.7/Dockerfile | 2 +- 2.6/alpine3.8/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index 7dd718fba1..2cc9e5a187 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index f9f003c6ed..40a702cca6 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 0e23719acf..7feb366961 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -11,7 +11,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index a37a90ce84..72b53f4077 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.0 +ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 84db4691c080384c8fbce44c722d46cedd6a384b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 31 Dec 2018 16:59:56 -0800 Subject: [PATCH 236/462] Adjust RUBYGEMS_VERSION to be fixed at either 3.0.1 or the Ruby-bundled version, whichever is newer This also adjusts Bundler to be explicitly fixed at either 1.17.2 or the Ruby/Rubygems-bundled version, whichever is newer -- this is slightly older than what we've already pushed (1.17.3), but nothing in the changelog appears to be relevant, so this seems fine: https://github.com/bundler/bundler/compare/v1.17.2...v1.17.3#diff-4ac32a78649ca5bdd8e0ba38b7006a1e For Ruby 2.6, this means we no longer do anything to the bundled Rubygems (or Bundler), and simply provide whatever comes with the Ruby release as-is, and it is now up to users to explicitly update if they need a newer version than is provided here. --- 2.3/alpine3.7/Dockerfile | 12 ++++++------ 2.3/alpine3.8/Dockerfile | 12 ++++++------ 2.3/jessie/Dockerfile | 12 ++++++------ 2.3/jessie/slim/Dockerfile | 12 ++++++------ 2.3/stretch/Dockerfile | 12 ++++++------ 2.3/stretch/slim/Dockerfile | 12 ++++++------ 2.4/alpine3.7/Dockerfile | 12 ++++++------ 2.4/alpine3.8/Dockerfile | 12 ++++++------ 2.4/jessie/Dockerfile | 12 ++++++------ 2.4/jessie/slim/Dockerfile | 12 ++++++------ 2.4/stretch/Dockerfile | 12 ++++++------ 2.4/stretch/slim/Dockerfile | 12 ++++++------ 2.5/alpine3.7/Dockerfile | 12 ++++++------ 2.5/alpine3.8/Dockerfile | 12 ++++++------ 2.5/stretch/Dockerfile | 12 ++++++------ 2.5/stretch/slim/Dockerfile | 12 ++++++------ 2.6/alpine3.7/Dockerfile | 8 ++------ 2.6/alpine3.8/Dockerfile | 8 ++------ 2.6/stretch/Dockerfile | 8 ++------ 2.6/stretch/slim/Dockerfile | 8 ++------ Dockerfile-alpine.template | 10 +++++----- Dockerfile-debian.template | 10 +++++----- Dockerfile-slim.template | 10 +++++----- update.sh | 15 +++++++++++---- 24 files changed, 130 insertions(+), 139 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 8005b2a159..04fd51e76f 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 934b2625b4..202caa1ffd 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 65aee4954e..50b813f002 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,10 +56,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index d7c60bc77d..ea4b0a9d0d 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -22,8 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 9e3552b553..628f4f5b33 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -59,10 +58,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 432d6cfc5c..c66127e5b2 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -22,8 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index 91d71449cd..d2fb67ce13 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 4c50050213..b45e328aa2 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 8c43a0107a..a47cc2f85e 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,10 +56,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index fcde488842..897c18cb97 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -22,8 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 52a72d58ec..4ba0cbb2b3 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,10 +56,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index fabd984c3e..263907995b 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -22,8 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index 64cbadc890..9a8771d916 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index e95d1e2800..0ce40e5586 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 027a1d6f12..8d9ab26924 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,8 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,10 +56,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index d1af5b1d51..e80f1b5387 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,8 +22,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 +ENV RUBYGEMS_VERSION 3.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index 2cc9e5a187..ea803bca17 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -10,8 +10,6 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +97,8 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 40a702cca6..e5290bb233 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -10,8 +10,6 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +97,8 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 7feb366961..dfd2a92cbe 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -10,8 +10,6 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -57,10 +55,8 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 72b53f4077..0176c5143f 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -22,8 +22,6 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.0 ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f -ENV RUBYGEMS_VERSION 3.0.2 -ENV BUNDLER_VERSION 2.0.1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +81,8 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 44d86c18da..2f891e6d91 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,7 +11,6 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% -ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -99,10 +98,11 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 3eb568b968..8cae1f1947 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -11,7 +11,6 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% -ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -59,10 +58,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 3c2846a417..d0d5e66291 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -23,7 +23,6 @@ ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% -ENV BUNDLER_VERSION %%BUNDLER%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,10 +82,11 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ - \ - && gem update --system "$RUBYGEMS_VERSION" \ - && gem install bundler --version "$BUNDLER_VERSION" --force \ - && rm -r /root/.gem/ +# 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/ \ +# rough smoke test + && ruby --version && gem --version && bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/update.sh b/update.sh index 0c1222932e..4117eefe8b 100755 --- a/update.sh +++ b/update.sh @@ -17,8 +17,12 @@ latest_gem_version() { curl -fsSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/' } -rubygems="$(latest_gem_version rubygems-update)" -bundler="$(latest_gem_version bundler)" +# https://github.com/docker-library/ruby/issues/246 +rubygems='3.0.1' +declare -A newEnoughRubygems=( + [2.6]=1 # 3.0.1+ +) +# TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely travisEnv= for version in "${versions[@]}"; do @@ -63,7 +67,7 @@ for version in "${versions[@]}"; do continue fi - echo "$version: $fullVersion; rubygems $rubygems, bundler $bundler; $shaVal" + echo "$version: $fullVersion; $shaVal" for v in \ alpine{3.6,3.7,3.8} \ @@ -86,7 +90,6 @@ for version in "${versions[@]}"; do -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ -e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ - -e 's!%%BUNDLER%%!'"$bundler"'!g' \ -e "$( if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then echo 's/libssl-dev/libssl1.0-dev/g' @@ -97,6 +100,10 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" + if [ -n "${newEnoughRubygems[$version]:-}" ]; then + sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" + fi + travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv" done done From da4b249e4ad5e521ba8c3d8b17119e9ac5af8df0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Jan 2019 15:53:12 -0800 Subject: [PATCH 237/462] Adjust "slim" variants to use "slim" Debian bases This saves ~50MB in my testing (2.6 went from ~175MB down to ~125MB and 2.3 went from ~250MB down to ~200MB). --- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- update.sh | 4 ++++ 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index ea4b0a9d0d..26278a605d 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:jessie-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index c66127e5b2..c72481c982 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:stretch-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 897c18cb97..6feb049e28 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:jessie-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 263907995b..0e8c1a2ee8 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:stretch-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index e80f1b5387..ce8ec63161 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:stretch-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 0176c5143f..d964846e3c 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:stretch-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/update.sh b/update.sh index 4117eefe8b..3c404d05a0 100755 --- a/update.sh +++ b/update.sh @@ -85,6 +85,10 @@ for version in "${versions[@]}"; do esac template="Dockerfile-${template}.template" + if [ "$variant" = 'slim' ]; then + tag+='-slim' + fi + sed -r \ -e 's!%%VERSION%%!'"$version"'!g' \ -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ From 3e2c9f3f3c34820dd38212f68c1d5f0300264711 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Jan 2019 18:03:14 +0000 Subject: [PATCH 238/462] Update to 2.6.1 --- 2.6/alpine3.7/Dockerfile | 4 ++-- 2.6/alpine3.8/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.7/Dockerfile index ea803bca17..a044df6611 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.7/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.0 -ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f +ENV RUBY_VERSION 2.6.1 +ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index e5290bb233..2fe3d4dd0e 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.0 -ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f +ENV RUBY_VERSION 2.6.1 +ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index dfd2a92cbe..bed003c72d 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.0 -ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f +ENV RUBY_VERSION 2.6.1 +ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index d964846e3c..03d34b18a1 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -20,8 +20,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.0 -ENV RUBY_DOWNLOAD_SHA256 acb00f04374899ba8ee74bbbcb9b35c5c6b1fd229f1876554ee76f0f1710ff5f +ENV RUBY_VERSION 2.6.1 +ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From f29d8d2181f8450ee1a5f08f82c21f66ebfde2cb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 30 Jan 2019 14:48:46 -0800 Subject: [PATCH 239/462] Update to Alpine 3.9 (dropping Alpine 3.7) This skips Ruby 2.3 since it doesn't support the OpenSSL version in Alpine 3.9, but it will be EOL soon anyhow (so it'll just stay on Alpine 3.7/3.8). --- .travis.yml | 6 +++--- 2.3/alpine3.7/Dockerfile | 4 ++-- 2.3/alpine3.8/Dockerfile | 4 ++-- 2.4/alpine3.8/Dockerfile | 4 ++-- 2.4/{alpine3.7 => alpine3.9}/Dockerfile | 6 +++--- 2.5/alpine3.8/Dockerfile | 4 ++-- 2.5/{alpine3.7 => alpine3.9}/Dockerfile | 6 +++--- 2.6/alpine3.8/Dockerfile | 4 ++-- 2.6/{alpine3.7 => alpine3.9}/Dockerfile | 6 +++--- Dockerfile-alpine.template | 4 ++-- generate-stackbrew-library.sh | 6 +++--- update.sh | 9 ++++++++- 12 files changed, 35 insertions(+), 28 deletions(-) rename 2.4/{alpine3.7 => alpine3.9}/Dockerfile (98%) rename 2.5/{alpine3.7 => alpine3.9}/Dockerfile (98%) rename 2.6/{alpine3.7 => alpine3.9}/Dockerfile (98%) diff --git a/.travis.yml b/.travis.yml index d927f535f8..cb1efe5697 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,18 +4,18 @@ services: docker env: - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim + - VERSION=2.6 VARIANT=alpine3.9 - VERSION=2.6 VARIANT=alpine3.8 - - VERSION=2.6 VARIANT=alpine3.7 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.9 - VERSION=2.5 VARIANT=alpine3.8 - - VERSION=2.5 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.9 - VERSION=2.4 VARIANT=alpine3.8 - - VERSION=2.4 VARIANT=alpine3.7 - VERSION=2.3 VARIANT=stretch - VERSION=2.3 VARIANT=stretch/slim - VERSION=2.3 VARIANT=jessie diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 04fd51e76f..f4ea5e884e 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + libressl \ + libressl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 202caa1ffd..ebf1b7ca0e 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + libressl \ + libressl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index b45e328aa2..fdba4725db 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + libressl \ + libressl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.9/Dockerfile similarity index 98% rename from 2.4/alpine3.7/Dockerfile rename to 2.4/alpine3.9/Dockerfile index d2fb67ce13..92c39fc29b 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.9 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 0ce40e5586..152c831972 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + libressl \ + libressl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.9/Dockerfile similarity index 98% rename from 2.5/alpine3.7/Dockerfile rename to 2.5/alpine3.9/Dockerfile index 9a8771d916..283f77b996 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.9 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 2fe3d4dd0e..c81f291ff6 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -29,13 +29,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + libressl \ + libressl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.7/Dockerfile b/2.6/alpine3.9/Dockerfile similarity index 98% rename from 2.6/alpine3.7/Dockerfile rename to 2.6/alpine3.9/Dockerfile index a044df6611..ab7dfbae80 100644 --- a/2.6/alpine3.7/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.9 # skip installing gem documentation RUN mkdir -p /usr/local/etc \ @@ -29,13 +29,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 2f891e6d91..5b28ebf81c 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,13 +30,13 @@ RUN set -ex \ glib-dev \ libc-dev \ libffi-dev \ - libressl \ - libressl-dev \ libxml2-dev \ libxslt-dev \ linux-headers \ make \ ncurses-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d036d0fbe7..d7ab11db74 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,9 +7,9 @@ declare -A aliases=( ) defaultDebianSuite='stretch' -defaultAlpineVersion='3.8' +defaultAlpineVersion='3.9' declare -A alpineVersion=( - #[2.5]='3.8' + [2.3]='3.8' ) self="$(basename "$BASH_SOURCE")" @@ -77,7 +77,7 @@ join() { for version in "${versions[@]}"; do for v in \ {stretch,jessie}{,/slim} \ - alpine{3.8,3.7,3.6} \ + alpine{3.9,3.8,3.7} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index 3c404d05a0..4cdddfbe3a 100755 --- a/update.sh +++ b/update.sh @@ -70,7 +70,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.6,3.7,3.8} \ + alpine{3.7,3.8,3.9} \ {jessie,stretch}{/slim,} \ ; do dir="$version/$v" @@ -104,6 +104,13 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" + case "$variant" in + alpine3.8 | alpine3.7) + # Alpine 3.9+ uses OpenSSL, but 3.8/3.7 still uses LibreSSL + sed -ri -e 's/openssl/libressl/g' "$dir/Dockerfile" + ;; + esac + if [ -n "${newEnoughRubygems[$version]:-}" ]; then sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi From 35cf993e41e8554876d61d5a438834086a5ae2ee Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 4 Feb 2019 15:30:17 -0800 Subject: [PATCH 240/462] Adjust base image exclusion in generate-stackbrew-library.sh --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d7ab11db74..c3bff027f2 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -49,7 +49,7 @@ getArches() { eval "declare -g -A parentRepoToArches=( $( find -name 'Dockerfile' -exec awk ' - toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ { + toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ { print "'"$officialImagesUrl"'" $2 } ' '{}' + \ From f35eefc3676315e3227702c312c63d0274c1b4a5 Mon Sep 17 00:00:00 2001 From: lsb Date: Tue, 26 Feb 2019 21:22:05 -0800 Subject: [PATCH 241/462] Add libgmp for faster Integer calculations. --- 2.3/jessie/Dockerfile | 2 ++ 2.3/stretch/Dockerfile | 2 ++ 2.4/jessie/Dockerfile | 2 ++ 2.4/stretch/Dockerfile | 2 ++ 2.5/stretch/Dockerfile | 2 ++ 2.6/stretch/Dockerfile | 2 ++ Dockerfile-debian.template | 2 ++ 7 files changed, 14 insertions(+) diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 50b813f002..7b593616d8 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -12,6 +12,8 @@ ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 628f4f5b33..7ab6389810 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -12,6 +12,8 @@ ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index a47cc2f85e..fb25106e31 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -12,6 +12,8 @@ ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 4ba0cbb2b3..cd45eb3794 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -12,6 +12,8 @@ ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 8d9ab26924..88b1913f2f 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -12,6 +12,8 @@ ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index bed003c72d..efc6829a78 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -11,6 +11,8 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8cae1f1947..ba6ab5ee1e 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -12,6 +12,8 @@ ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% +RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* + # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ From eae22dc2dfe30b48f1633912396110539e1b8d49 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 28 Feb 2019 16:24:23 -0800 Subject: [PATCH 242/462] Update "slim" and "alpine" variants to include libgmp --- 2.3/alpine3.7/Dockerfile | 1 + 2.3/alpine3.8/Dockerfile | 1 + 2.3/jessie/Dockerfile | 2 -- 2.3/jessie/slim/Dockerfile | 22 ++++++++++++++-------- 2.3/stretch/Dockerfile | 2 -- 2.3/stretch/slim/Dockerfile | 22 ++++++++++++++-------- 2.4/alpine3.8/Dockerfile | 1 + 2.4/alpine3.9/Dockerfile | 1 + 2.4/jessie/Dockerfile | 2 -- 2.4/jessie/slim/Dockerfile | 22 ++++++++++++++-------- 2.4/stretch/Dockerfile | 2 -- 2.4/stretch/slim/Dockerfile | 22 ++++++++++++++-------- 2.5/alpine3.8/Dockerfile | 1 + 2.5/alpine3.9/Dockerfile | 1 + 2.5/stretch/Dockerfile | 2 -- 2.5/stretch/slim/Dockerfile | 22 ++++++++++++++-------- 2.6/alpine3.8/Dockerfile | 1 + 2.6/alpine3.9/Dockerfile | 1 + 2.6/stretch/Dockerfile | 2 -- 2.6/stretch/slim/Dockerfile | 22 ++++++++++++++-------- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 2 -- Dockerfile-slim.template | 22 ++++++++++++++-------- 23 files changed, 107 insertions(+), 70 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index f4ea5e884e..118f76046f 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index ebf1b7ca0e..59e8105066 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 7b593616d8..50b813f002 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -12,8 +12,6 @@ ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 26278a605d..6605ade078 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION 3.0.1 # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 7ab6389810..628f4f5b33 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -12,8 +12,6 @@ ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe ENV RUBYGEMS_VERSION 3.0.1 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index c72481c982..365f2faf7c 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION 3.0.1 # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index fdba4725db..92779e4048 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 92c39fc29b..6ce8f4b06c 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index fb25106e31..a47cc2f85e 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -12,8 +12,6 @@ ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 6feb049e28..49ee44bd2b 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION 3.0.1 # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index cd45eb3794..4ba0cbb2b3 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -12,8 +12,6 @@ ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb ENV RUBYGEMS_VERSION 3.0.1 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 0e8c1a2ee8..34c9e302c5 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION 3.0.1 # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 152c831972..50dce149d8 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 283f77b996..ccf57d9a91 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 88b1913f2f..8d9ab26924 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -12,8 +12,6 @@ ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f ENV RUBYGEMS_VERSION 3.0.1 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index ce8ec63161..255b02db57 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION 3.0.1 # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index c81f291ff6..4bb66c7ca0 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -27,6 +27,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index ab7dfbae80..72826da6b5 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -27,6 +27,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index efc6829a78..bed003c72d 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -11,8 +11,6 @@ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 03d34b18a1..438bc8f4d6 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -27,7 +27,8 @@ ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25c # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -35,6 +36,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -43,9 +45,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -75,10 +74,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # rough smoke test diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 5b28ebf81c..7a07b247fb 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -28,6 +28,7 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index ba6ab5ee1e..8cae1f1947 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -12,8 +12,6 @@ ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% ENV RUBYGEMS_VERSION %%RUBYGEMS%% -RUN apt-get update && apt-get install -y libgmp3-dev && rm -rf /var/lib/apt/lists/* - # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index d0d5e66291..2fde2d1b37 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -28,7 +28,8 @@ ENV RUBYGEMS_VERSION %%RUBYGEMS%% # we purge system ruby later to make sure our final image uses what we just built RUN set -ex \ \ - && buildDeps=' \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -36,6 +37,7 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ @@ -44,9 +46,6 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ @@ -76,10 +75,17 @@ RUN set -ex \ && make -j "$(nproc)" \ && make install \ \ - && dpkg-query --show --showformat '${package}\n' \ - | grep -P '^libreadline\d+$' \ - | xargs apt-mark manual \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ && cd / \ && rm -r /usr/src/ruby \ # make sure bundled "rubygems" is older than RUBYGEMS_VERSION (https://github.com/docker-library/ruby/issues/246) From 73adf677cdb4b79ff4c98fb19aca11802e0d0ec9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 4 Mar 2019 08:02:36 -0800 Subject: [PATCH 243/462] Add "libgmp-dev" and "gmp-dev" persistently --- 2.3/alpine3.7/Dockerfile | 4 +++- 2.3/alpine3.8/Dockerfile | 4 +++- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 4 +++- 2.4/alpine3.9/Dockerfile | 4 +++- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 4 +++- 2.5/alpine3.9/Dockerfile | 4 +++- 2.5/stretch/slim/Dockerfile | 2 +- 2.6/alpine3.8/Dockerfile | 4 +++- 2.6/alpine3.9/Dockerfile | 4 +++- 2.6/stretch/slim/Dockerfile | 2 +- Dockerfile-alpine.template | 4 +++- Dockerfile-slim.template | 2 +- 16 files changed, 34 insertions(+), 16 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 118f76046f..1a9e4ab1d4 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.7 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 59e8105066..4bc0ab1adb 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.8 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 6605ade078..7748b65ac8 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 365f2faf7c..eea5ed4a65 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl1.0-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 92779e4048..feb58701a1 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.8 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 6ce8f4b06c..60d56dc10a 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.9 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 49ee44bd2b..6b59a23468 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 34c9e302c5..c48601e88d 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 50dce149d8..965b74a3f5 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.8 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index ccf57d9a91..130dd109c6 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.9 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 255b02db57..ccd90b43d1 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 4bb66c7ca0..73457f3c98 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.8 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -27,7 +30,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index 72826da6b5..5bb07bce8c 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -1,5 +1,8 @@ FROM alpine:3.9 +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -27,7 +30,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 438bc8f4d6..d992e2cbf4 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -36,7 +37,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 7a07b247fb..75bc220aad 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,8 @@ FROM alpine:%%PLACEHOLDER%% +RUN apk add --no-cache \ + gmp-dev + # skip installing gem documentation RUN mkdir -p /usr/local/etc \ && { \ @@ -28,7 +31,6 @@ RUN set -ex \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 2fde2d1b37..ccbe8b7285 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -6,6 +6,7 @@ RUN apt-get update \ ca-certificates \ libffi-dev \ libgdbm3 \ + libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ @@ -37,7 +38,6 @@ RUN set -ex \ libbz2-dev \ libgdbm-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ From 31f66490fdb837ddcc5896e3275f2188f2b7b6dd Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 5 Mar 2019 18:09:36 -0800 Subject: [PATCH 244/462] Bump RubyGems version for CVE fixes --- 2.3/alpine3.7/Dockerfile | 2 +- 2.3/alpine3.8/Dockerfile | 2 +- 2.3/jessie/Dockerfile | 2 +- 2.3/jessie/slim/Dockerfile | 2 +- 2.3/stretch/Dockerfile | 2 +- 2.3/stretch/slim/Dockerfile | 2 +- 2.4/alpine3.8/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.8/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- update.sh | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile index 1a9e4ab1d4..442ef6da1c 100644 --- a/2.3/alpine3.7/Dockerfile +++ b/2.3/alpine3.7/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile index 4bc0ab1adb..2dd27a6473 100644 --- a/2.3/alpine3.8/Dockerfile +++ b/2.3/alpine3.8/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 50b813f002..fd7a25119a 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 7748b65ac8..56b5b8d176 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 628f4f5b33..74ec5e57e5 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index eea5ed4a65..0d2a12d5da 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.8 ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index feb58701a1..776ec210f0 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 60d56dc10a..4ea6e17171 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index a47cc2f85e..994e5cceb0 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 6b59a23468..75518aba09 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 4ba0cbb2b3..ff2e64dc9e 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index c48601e88d..817447779e 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.5 ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 965b74a3f5..701959aca4 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 130dd109c6..d64e1df7d8 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 8d9ab26924..6927cf07aa 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,7 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index ccd90b43d1..989ab4fde1 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.3 ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f -ENV RUBYGEMS_VERSION 3.0.1 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/update.sh b/update.sh index 4cdddfbe3a..e684071dd7 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ latest_gem_version() { } # https://github.com/docker-library/ruby/issues/246 -rubygems='3.0.1' +rubygems='3.0.3' declare -A newEnoughRubygems=( [2.6]=1 # 3.0.1+ ) From 96fc06fb331a20ba823ecc11563a99d1eb94203f Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 7 Mar 2019 14:46:09 -0800 Subject: [PATCH 245/462] Update RubyGems to 3.0.3 on Ruby 2.6.1 --- 2.6/alpine3.8/Dockerfile | 4 ++++ 2.6/alpine3.9/Dockerfile | 4 ++++ 2.6/stretch/Dockerfile | 4 ++++ 2.6/stretch/slim/Dockerfile | 4 ++++ update.sh | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index 73457f3c98..eb82e9874e 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -13,6 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -100,6 +101,9 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ +# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index 5bb07bce8c..c76b708f39 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -13,6 +13,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -100,6 +101,9 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ +# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index bed003c72d..8c5a25f13b 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -10,6 +10,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -55,6 +56,9 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ +# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index d992e2cbf4..2b502533cf 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,6 +23,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.1 ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 +ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -87,6 +88,9 @@ RUN set -ex \ \ && cd / \ && rm -r /usr/src/ruby \ +# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/update.sh b/update.sh index e684071dd7..a9264c6f58 100755 --- a/update.sh +++ b/update.sh @@ -20,7 +20,7 @@ latest_gem_version() { # https://github.com/docker-library/ruby/issues/246 rubygems='3.0.3' declare -A newEnoughRubygems=( - [2.6]=1 # 3.0.1+ +# [2.6]=1 # 2.6.1 => gems 3.0.1 ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely From 72a056e4e603fdd3854dea2254eaf288b3742baa Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Mar 2019 14:30:59 -0700 Subject: [PATCH 246/462] Ruby 2.6.2 has RubyGems 3.0.3 --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index a9264c6f58..7d4fdfa0d8 100755 --- a/update.sh +++ b/update.sh @@ -20,7 +20,7 @@ latest_gem_version() { # https://github.com/docker-library/ruby/issues/246 rubygems='3.0.3' declare -A newEnoughRubygems=( -# [2.6]=1 # 2.6.1 => gems 3.0.1 + [2.6]=1 # 2.6.2 => gems 3.0.3 ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely From 0e7baa45a1ff640f8b6a744b8e9b76adb206aeb4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 13 Mar 2019 21:31:45 +0000 Subject: [PATCH 247/462] Update to 2.5.4, rubygems 3.0.3 --- 2.5/alpine3.8/Dockerfile | 4 ++-- 2.5/alpine3.9/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index 701959aca4..d54d444804 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.3 -ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f +ENV RUBY_VERSION 2.5.4 +ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index d64e1df7d8..91e69ad14e 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.3 -ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f +ENV RUBY_VERSION 2.5.4 +ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 6927cf07aa..f08673e1fe 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.3 -ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f +ENV RUBY_VERSION 2.5.4 +ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 989ab4fde1..9a35252f9d 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -21,8 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.3 -ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f +ENV RUBY_VERSION 2.5.4 +ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 995719add69339b78bd8cde46183b4902b761add Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 13 Mar 2019 21:31:45 +0000 Subject: [PATCH 248/462] Update to 2.6.2 --- 2.6/alpine3.8/Dockerfile | 8 ++------ 2.6/alpine3.9/Dockerfile | 8 ++------ 2.6/stretch/Dockerfile | 8 ++------ 2.6/stretch/slim/Dockerfile | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index eb82e9874e..deeff252eb 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -11,9 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.1 -ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 -ENV RUBYGEMS_VERSION 3.0.3 +ENV RUBY_VERSION 2.6.2 +ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -101,9 +100,6 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ -# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index c76b708f39..6820354fd0 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -11,9 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.1 -ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 -ENV RUBYGEMS_VERSION 3.0.3 +ENV RUBY_VERSION 2.6.2 +ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -101,9 +100,6 @@ RUN set -ex \ && apk del --no-network .ruby-builddeps \ && cd / \ && rm -r /usr/src/ruby \ -# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 8c5a25f13b..750cbbacd4 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -8,9 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.1 -ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 -ENV RUBYGEMS_VERSION 3.0.3 +ENV RUBY_VERSION 2.6.2 +ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -56,9 +55,6 @@ RUN set -ex \ && apt-get purge -y --auto-remove $buildDeps \ && cd / \ && rm -r /usr/src/ruby \ -# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 2b502533cf..b7fc298c47 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -21,9 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.1 -ENV RUBY_DOWNLOAD_SHA256 47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 -ENV RUBYGEMS_VERSION 3.0.3 +ENV RUBY_VERSION 2.6.2 +ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -88,9 +87,6 @@ RUN set -ex \ \ && cd / \ && rm -r /usr/src/ruby \ -# 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/ \ # rough smoke test && ruby --version && gem --version && bundle --version From 6f3497e40d44651802e1ec8a4647b23a3a63b355 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Mar 2019 05:03:52 +0000 Subject: [PATCH 249/462] Update to 2.5.5, rubygems 3.0.3 --- 2.5/alpine3.8/Dockerfile | 4 ++-- 2.5/alpine3.9/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.8/Dockerfile index d54d444804..5b36deb8db 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.8/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.4 -ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 91e69ad14e..cecf2549b8 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.4 -ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f08673e1fe..1d93f626ec 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.4 -ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 9a35252f9d..bceec186f8 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -21,8 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.4 -ENV RUBY_DOWNLOAD_SHA256 46f6eff655a6be1939f70c7a4c1bf58f76663e7e804738bc52f4d47ca31dee3d +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 5dc3cbb5f208a899f70e6baad6645f2cf8fa4907 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 2 Apr 2019 14:51:34 -0700 Subject: [PATCH 250/462] Fix "update.sh" handling of whitespace on SHA256 scraping See view-source:https://www.ruby-lang.org//en/news/2019/04/01/ruby-2-4-6-released/ ("SHA256:" has whitespace before it) --- update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 7d4fdfa0d8..85d8100a6b 100755 --- a/update.sh +++ b/update.sh @@ -45,15 +45,15 @@ for version in "${versions[@]}"; do for tryVersion in "${allVersions[@]}"; do if \ { - versionReleasePage="$(echo "$releasesPage" | grep "Ruby $tryVersion" -A 2 | awk -F '"' '$1 == "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ && [ "$versionReleasePage" ] \ - && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '/^SHA256:/ { print $2; exit }')" \ + && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '$1 == "SHA256:" { print $2; exit }')" \ && [ "$shaVal" ] } \ ; then From 802421922ef50cfa05c89a3c619992acf4329986 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 2 Apr 2019 21:52:51 +0000 Subject: [PATCH 251/462] Update to 2.4.6, rubygems 3.0.3 --- 2.4/alpine3.8/Dockerfile | 4 ++-- 2.4/alpine3.9/Dockerfile | 4 ++-- 2.4/jessie/Dockerfile | 4 ++-- 2.4/jessie/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.8/Dockerfile index 776ec210f0..5eb2365291 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.8/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 4ea6e17171..7abb94f212 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 994e5cceb0..f41b7df15e 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 75518aba09..57e226605b 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -21,8 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index ff2e64dc9e..1c11182d76 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 817447779e..11e26ab5e5 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -21,8 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.5 -ENV RUBY_DOWNLOAD_SHA256 2f0cdcce9989f63ef7c2939bdb17b1ef244c4f384d85b8531d60e73d8cc31eeb +ENV RUBY_VERSION 2.4.6 +ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 5d977ba3d1c509e3e094f8e98650c6ce25603f71 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 Apr 2019 10:16:10 -0700 Subject: [PATCH 252/462] Remove Ruby 2.3 (EOL) See https://www.ruby-lang.org/en/news/2019/03/31/support-of-ruby-2-3-has-ended/ (official EOL announcement saying there will be no more fixes in 2.3). --- .travis.yml | 6 -- 2.3/alpine3.7/Dockerfile | 122 ---------------------------------- 2.3/alpine3.8/Dockerfile | 122 ---------------------------------- 2.3/jessie/Dockerfile | 77 --------------------- 2.3/jessie/slim/Dockerfile | 109 ------------------------------ 2.3/stretch/Dockerfile | 79 ---------------------- 2.3/stretch/slim/Dockerfile | 109 ------------------------------ Dockerfile-debian.template | 2 - generate-stackbrew-library.sh | 2 +- update.sh | 7 -- 10 files changed, 1 insertion(+), 634 deletions(-) delete mode 100644 2.3/alpine3.7/Dockerfile delete mode 100644 2.3/alpine3.8/Dockerfile delete mode 100644 2.3/jessie/Dockerfile delete mode 100644 2.3/jessie/slim/Dockerfile delete mode 100644 2.3/stretch/Dockerfile delete mode 100644 2.3/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index cb1efe5697..39f159fee2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,6 @@ env: - VERSION=2.4 VARIANT=jessie/slim - VERSION=2.4 VARIANT=alpine3.9 - VERSION=2.4 VARIANT=alpine3.8 - - VERSION=2.3 VARIANT=stretch - - VERSION=2.3 VARIANT=stretch/slim - - VERSION=2.3 VARIANT=jessie - - VERSION=2.3 VARIANT=jessie/slim - - VERSION=2.3 VARIANT=alpine3.8 - - VERSION=2.3 VARIANT=alpine3.7 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.3/alpine3.7/Dockerfile b/2.3/alpine3.7/Dockerfile deleted file mode 100644 index 442ef6da1c..0000000000 --- a/2.3/alpine3.7/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -FROM alpine:3.7 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - libressl \ - libressl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.3/alpine3.8/Dockerfile b/2.3/alpine3.8/Dockerfile deleted file mode 100644 index 2dd27a6473..0000000000 --- a/2.3/alpine3.8/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -FROM alpine:3.8 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - libressl \ - libressl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile deleted file mode 100644 index fd7a25119a..0000000000 --- a/2.3/jessie/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -FROM buildpack-deps:jessie - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile deleted file mode 100644 index 56b5b8d176..0000000000 --- a/2.3/jessie/slim/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -FROM debian:jessie-slim - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgdbm3 \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile deleted file mode 100644 index 74ec5e57e5..0000000000 --- a/2.3/stretch/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -FROM buildpack-deps:stretch - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && buildDeps=' \ - bison \ - dpkg-dev \ - libgdbm-dev \ - # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) - libssl1.0-dev \ - ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile deleted file mode 100644 index 0d2a12d5da..0000000000 --- a/2.3/stretch/slim/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -FROM debian:stretch-slim - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgdbm3 \ - libgmp-dev \ - libssl1.0-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.3 -ENV RUBY_VERSION 2.3.8 -ENV RUBY_DOWNLOAD_SHA256 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ - \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - && rm -rf /var/lib/apt/lists/* \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - \ - && cd / \ - && rm -r /usr/src/ruby \ -# 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/ \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8cae1f1947..785213f529 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -20,8 +20,6 @@ RUN set -ex \ bison \ dpkg-dev \ libgdbm-dev \ - # ruby 2.3 on stretch can only support libssl1.0-dev (libssl dev from buildpack-deps is 1.1.x) - libssl1.0-dev \ ruby \ ' \ && apt-get update \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c3bff027f2..f1adcbe097 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,7 +9,7 @@ declare -A aliases=( defaultDebianSuite='stretch' defaultAlpineVersion='3.9' declare -A alpineVersion=( - [2.3]='3.8' + #[2.3]='3.8' ) self="$(basename "$BASH_SOURCE")" diff --git a/update.sh b/update.sh index 85d8100a6b..0102506f7b 100755 --- a/update.sh +++ b/update.sh @@ -94,13 +94,6 @@ for version in "${versions[@]}"; do -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ -e 's!%%SHA256%%!'"$shaVal"'!g' \ -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ - -e "$( - if [ "$version" = 2.3 ] && [[ "$v" = stretch* ]]; then - echo 's/libssl-dev/libssl1.0-dev/g' - else - echo '/libssl1.0-dev/d' - fi - )" \ -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" From 9ae0943fa2935b3a13c72ae7d6afa2439145d7fa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Apr 2019 17:03:14 +0000 Subject: [PATCH 253/462] Update to 2.6.3 --- 2.6/alpine3.8/Dockerfile | 4 ++-- 2.6/alpine3.9/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.8/Dockerfile index deeff252eb..0fe771b349 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.8/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.2 -ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index 6820354fd0..d81fcee655 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.2 -ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 750cbbacd4..c6045ad41a 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -8,8 +8,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.2 -ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index b7fc298c47..74a2c32926 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -21,8 +21,8 @@ RUN mkdir -p /usr/local/etc \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.2 -ENV RUBY_DOWNLOAD_SHA256 91fcde77eea8e6206d775a48ac58450afe4883af1a42e5b358320beb33a445fa +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From b0c1b3c89142267912d8d0b532e206463c7d8ee0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 30 May 2019 13:23:26 -0700 Subject: [PATCH 254/462] Add 2.7.0-preview1 --- .travis.yml | 3 + 2.7-rc/alpine3.9/Dockerfile | 118 +++++++++++++++++++++++++++++++++ 2.7-rc/stretch/Dockerfile | 73 ++++++++++++++++++++ 2.7-rc/stretch/slim/Dockerfile | 105 +++++++++++++++++++++++++++++ update.sh | 5 +- 5 files changed, 302 insertions(+), 2 deletions(-) create mode 100644 2.7-rc/alpine3.9/Dockerfile create mode 100644 2.7-rc/stretch/Dockerfile create mode 100644 2.7-rc/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 39f159fee2..ce2782d846 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: bash services: docker env: + - VERSION=2.7-rc VARIANT=stretch + - VERSION=2.7-rc VARIANT=stretch/slim + - VERSION=2.7-rc VARIANT=alpine3.9 - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim - VERSION=2.6 VARIANT=alpine3.9 diff --git a/2.7-rc/alpine3.9/Dockerfile b/2.7-rc/alpine3.9/Dockerfile new file mode 100644 index 0000000000..a1a581c75c --- /dev/null +++ b/2.7-rc/alpine3.9/Dockerfile @@ -0,0 +1,118 @@ +FROM alpine:3.9 + +RUN apk add --no-cache \ + gmp-dev + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.7-rc +ENV RUBY_VERSION 2.7.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del --no-network .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ +# rough smoke test + && ruby --version && gem --version && bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.7-rc/stretch/Dockerfile b/2.7-rc/stretch/Dockerfile new file mode 100644 index 0000000000..196faae5a1 --- /dev/null +++ b/2.7-rc/stretch/Dockerfile @@ -0,0 +1,73 @@ +FROM buildpack-deps:stretch + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.7-rc +ENV RUBY_VERSION 2.7.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && buildDeps=' \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ' \ + && apt-get update \ + && apt-get install -y --no-install-recommends $buildDeps \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-get purge -y --auto-remove $buildDeps \ + && cd / \ + && rm -r /usr/src/ruby \ +# rough smoke test + && ruby --version && gem --version && bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.7-rc/stretch/slim/Dockerfile b/2.7-rc/stretch/slim/Dockerfile new file mode 100644 index 0000000000..6bdca75b0e --- /dev/null +++ b/2.7-rc/stretch/slim/Dockerfile @@ -0,0 +1,105 @@ +FROM debian:stretch-slim + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgdbm3 \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.7-rc +ENV RUBY_VERSION 2.7.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -ex \ + \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y --no-install-recommends \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && apt-mark auto '.*' > /dev/null \ + && apt-mark manual $savedAptMark \ + && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + \ + && cd / \ + && rm -r /usr/src/ruby \ +# rough smoke test + && ruby --version && gem --version && bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/update.sh b/update.sh index 0102506f7b..9403605891 100755 --- a/update.sh +++ b/update.sh @@ -20,7 +20,8 @@ latest_gem_version() { # https://github.com/docker-library/ruby/issues/246 rubygems='3.0.3' declare -A newEnoughRubygems=( - [2.6]=1 # 2.6.2 => gems 3.0.3 + [2.6]=1 # 2.6.3 => gems 3.0.3 (https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems.rb#L12) + [2.7]=1 # 2.7.0-preview1 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12) ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely @@ -104,7 +105,7 @@ for version in "${versions[@]}"; do ;; esac - if [ -n "${newEnoughRubygems[$version]:-}" ]; then + if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi From 8435142277b4aead5a1d04c2e35a856a82bbb1c5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 13 Jun 2019 16:23:12 -0700 Subject: [PATCH 255/462] Update generated README Especially to link to the new FAQ entry (https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what) --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d6008dd121..10ab212428 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,24 @@ ## Maintained by: [the Docker Community](https://github.com/docker-library/ruby) -This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [ruby](https://hub.docker.com/_/ruby/) (not to be confused with any official ruby image provided by ruby upstream). See [the Docker Hub page](https://hub.docker.com/_/ruby/) for the full readme on how to use this Docker image and for information regarding contributing and issues. +This is the Git repo of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`ruby`](https://hub.docker.com/_/ruby/) (not to be confused with any official `ruby` image provided by `ruby` upstream). See [the Docker Hub page](https://hub.docker.com/_/ruby/) for the full readme on how to use this Docker image and for information regarding contributing and issues. -The [full description from Docker Hub](https://hub.docker.com/_/ruby/) is generated over in [docker-library/docs](https://github.com/docker-library/docs), specifically in [docker-library/docs/ruby](https://github.com/docker-library/docs/tree/master/ruby). +The [full image description on Docker Hub](https://hub.docker.com/_/ruby/) is generated/maintained over in [the docker-library/docs repository](https://github.com/docker-library/docs), specifically in [the `ruby` directory](https://github.com/docker-library/docs/tree/master/ruby). ## See a change merged here that doesn't show up on Docker Hub yet? -Check [the "library/ruby" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/ruby), especially [PRs with the "library/ruby" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fruby). +For more information about the full official images change lifecycle, see [the "An image's source changed in Git, now what?" FAQ entry](https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what). -For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md). +For outstanding `ruby` image PRs, check [PRs with the "library/ruby" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fruby). For the current "source of truth" for [`ruby`](https://hub.docker.com/_/ruby/), see [the `library/ruby` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/ruby). --- -- [Travis CI: - ![build status badge](https://img.shields.io/travis/docker-library/ruby/master.svg)](https://travis-ci.org/docker-library/ruby/branches) -- [Automated `update.sh`: - ![build status badge](https://doi-janky.infosiftr.net/job/update.sh/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby) +- [![build status badge](https://img.shields.io/travis/docker-library/ruby/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/ruby/branches) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/ruby.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [`amd64`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby) | [`arm32v5`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby) | [`arm32v6`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby) | [`arm32v7`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby) | -| [`arm64v8`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby) | [`i386`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby) | [`ppc64le`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby) | [`s390x`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby) | +| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby) | From 486c3159dbd4d832ae30fedeba525b9b2425d060 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 20 Jun 2019 15:15:30 +0200 Subject: [PATCH 256/462] Add Alpine 3.10 and remove Alpine 3.8 --- .travis.yml | 7 +- 2.4/{alpine3.8 => alpine3.10}/Dockerfile | 6 +- 2.5/{alpine3.8 => alpine3.10}/Dockerfile | 6 +- 2.6/{alpine3.8 => alpine3.10}/Dockerfile | 6 +- 2.7-rc/alpine3.10/Dockerfile | 118 +++++++++++++++++++++++ update.sh | 9 +- 6 files changed, 132 insertions(+), 20 deletions(-) rename 2.4/{alpine3.8 => alpine3.10}/Dockerfile (98%) rename 2.5/{alpine3.8 => alpine3.10}/Dockerfile (98%) rename 2.6/{alpine3.8 => alpine3.10}/Dockerfile (98%) create mode 100644 2.7-rc/alpine3.10/Dockerfile diff --git a/.travis.yml b/.travis.yml index ce2782d846..2b5ebb15e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,22 @@ services: docker env: - VERSION=2.7-rc VARIANT=stretch - VERSION=2.7-rc VARIANT=stretch/slim + - VERSION=2.7-rc VARIANT=alpine3.10 - VERSION=2.7-rc VARIANT=alpine3.9 - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim + - VERSION=2.6 VARIANT=alpine3.10 - VERSION=2.6 VARIANT=alpine3.9 - - VERSION=2.6 VARIANT=alpine3.8 - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.10 - VERSION=2.5 VARIANT=alpine3.9 - - VERSION=2.5 VARIANT=alpine3.8 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie - VERSION=2.4 VARIANT=jessie/slim + - VERSION=2.4 VARIANT=alpine3.10 - VERSION=2.4 VARIANT=alpine3.9 - - VERSION=2.4 VARIANT=alpine3.8 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.4/alpine3.8/Dockerfile b/2.4/alpine3.10/Dockerfile similarity index 98% rename from 2.4/alpine3.8/Dockerfile rename to 2.4/alpine3.10/Dockerfile index 5eb2365291..b182eb5d64 100644 --- a/2.4/alpine3.8/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.10 RUN apk add --no-cache \ gmp-dev @@ -38,8 +38,8 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.5/alpine3.8/Dockerfile b/2.5/alpine3.10/Dockerfile similarity index 98% rename from 2.5/alpine3.8/Dockerfile rename to 2.5/alpine3.10/Dockerfile index 5b36deb8db..efa5ddbaaf 100644 --- a/2.5/alpine3.8/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.10 RUN apk add --no-cache \ gmp-dev @@ -38,8 +38,8 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.8/Dockerfile b/2.6/alpine3.10/Dockerfile similarity index 98% rename from 2.6/alpine3.8/Dockerfile rename to 2.6/alpine3.10/Dockerfile index 0fe771b349..2611f102e7 100644 --- a/2.6/alpine3.8/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.10 RUN apk add --no-cache \ gmp-dev @@ -37,8 +37,8 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ procps \ readline-dev \ ruby \ diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile new file mode 100644 index 0000000000..032dcebf6a --- /dev/null +++ b/2.7-rc/alpine3.10/Dockerfile @@ -0,0 +1,118 @@ +FROM alpine:3.10 + +RUN apk add --no-cache \ + gmp-dev + +# skip installing gem documentation +RUN mkdir -p /usr/local/etc \ + && { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.7-rc +ENV RUBY_VERSION 2.7.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -ex \ + \ + && apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + \ + && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ + && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + \ + && mkdir -p /usr/src/ruby \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ + \ + && cd /usr/src/ruby \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ + && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ + && patch -p1 -i thread-stack-fix.patch \ + && rm thread-stack-fix.patch \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + && { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new \ + && mv file.c.new file.c \ + \ + && autoconf \ + && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ +# the configure script does not detect isnan/isinf as macros + && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ + && ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + && make -j "$(nproc)" \ + && make install \ + \ + && runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )" \ + && apk add --no-network --virtual .ruby-rundeps $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + && apk del --no-network .ruby-builddeps \ + && cd / \ + && rm -r /usr/src/ruby \ +# rough smoke test + && ruby --version && gem --version && bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/update.sh b/update.sh index 9403605891..4298b5ad30 100755 --- a/update.sh +++ b/update.sh @@ -71,7 +71,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.7,3.8,3.9} \ + alpine{3.9,3.10} \ {jessie,stretch}{/slim,} \ ; do dir="$version/$v" @@ -98,13 +98,6 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" - case "$variant" in - alpine3.8 | alpine3.7) - # Alpine 3.9+ uses OpenSSL, but 3.8/3.7 still uses LibreSSL - sed -ri -e 's/openssl/libressl/g' "$dir/Dockerfile" - ;; - esac - if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi From 7f8c50648ecee18c8a47ab898708c2cea0013316 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 21 Jun 2019 23:21:00 +0200 Subject: [PATCH 257/462] Add tag for Alpine 3.10 --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index f1adcbe097..5767788853 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,7 +7,7 @@ declare -A aliases=( ) defaultDebianSuite='stretch' -defaultAlpineVersion='3.9' +defaultAlpineVersion='3.10' declare -A alpineVersion=( #[2.3]='3.8' ) @@ -77,7 +77,7 @@ join() { for version in "${versions[@]}"; do for v in \ {stretch,jessie}{,/slim} \ - alpine{3.9,3.8,3.7} \ + alpine{3.10,3.9} \ ; do dir="$version/$v" variant="$(basename "$v")" From c718c72e1c122feefa8ff8f1a7c84c9c08495bdd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 24 Jun 2019 15:09:34 -0700 Subject: [PATCH 258/462] Replace "stretch" with "buster" for Ruby 2.7-rc given the imminent Debian release (and ditch Alpine 3.9 in 2.7-rc) --- .travis.yml | 5 +- 2.7-rc/alpine3.9/Dockerfile | 118 --------------------- 2.7-rc/{stretch => buster}/Dockerfile | 2 +- 2.7-rc/{stretch => buster}/slim/Dockerfile | 2 +- generate-stackbrew-library.sh | 14 ++- update.sh | 2 +- 6 files changed, 14 insertions(+), 129 deletions(-) delete mode 100644 2.7-rc/alpine3.9/Dockerfile rename 2.7-rc/{stretch => buster}/Dockerfile (98%) rename 2.7-rc/{stretch => buster}/slim/Dockerfile (99%) diff --git a/.travis.yml b/.travis.yml index 2b5ebb15e1..27d6f57a3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,9 @@ language: bash services: docker env: - - VERSION=2.7-rc VARIANT=stretch - - VERSION=2.7-rc VARIANT=stretch/slim + - VERSION=2.7-rc VARIANT=buster + - VERSION=2.7-rc VARIANT=buster/slim - VERSION=2.7-rc VARIANT=alpine3.10 - - VERSION=2.7-rc VARIANT=alpine3.9 - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim - VERSION=2.6 VARIANT=alpine3.10 diff --git a/2.7-rc/alpine3.9/Dockerfile b/2.7-rc/alpine3.9/Dockerfile deleted file mode 100644 index a1a581c75c..0000000000 --- a/2.7-rc/alpine3.9/Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -FROM alpine:3.9 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ - \ - && apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ - \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ - \ - && cd /usr/src/ruby \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - && { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ - \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ -# the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - && make -j "$(nproc)" \ - && make install \ - \ - && runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ -# rough smoke test - && ruby --version && gem --version && bundle --version - -# install things globally, for great justice -# and don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) - -CMD [ "irb" ] diff --git a/2.7-rc/stretch/Dockerfile b/2.7-rc/buster/Dockerfile similarity index 98% rename from 2.7-rc/stretch/Dockerfile rename to 2.7-rc/buster/Dockerfile index 196faae5a1..49d769933f 100644 --- a/2.7-rc/stretch/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:stretch +FROM buildpack-deps:buster # skip installing gem documentation RUN mkdir -p /usr/local/etc \ diff --git a/2.7-rc/stretch/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile similarity index 99% rename from 2.7-rc/stretch/slim/Dockerfile rename to 2.7-rc/buster/slim/Dockerfile index 6bdca75b0e..521df09d0b 100644 --- a/2.7-rc/stretch/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch-slim +FROM debian:buster-slim RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5767788853..155204ba75 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,7 +6,10 @@ declare -A aliases=( [2.7-rc]='rc' ) -defaultDebianSuite='stretch' +defaultDebianSuite='stretch' # TODO buster +declare -A debianSuites=( + [2.7-rc]='buster' +) defaultAlpineVersion='3.10' declare -A alpineVersion=( #[2.3]='3.8' @@ -76,7 +79,7 @@ join() { for version in "${versions[@]}"; do for v in \ - {stretch,jessie}{,/slim} \ + {buster,stretch,jessie}{,/slim} \ alpine{3.10,3.9} \ ; do dir="$version/$v" @@ -101,12 +104,13 @@ for version in "${versions[@]}"; do ) variantAliases=( "${versionAliases[@]/%/-$variant}" ) + debianSuite="${debianSuites[$version]:-$defaultDebianSuite}" case "$variant" in - "$defaultDebianSuite") + "$debianSuite") variantAliases+=( "${versionAliases[@]}" ) ;; - *-"$defaultDebianSuite") - variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianSuite}}" ) + *-"$debianSuite") + variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" ) ;; "alpine${alpineVersion[$version]:-$defaultAlpineVersion}") variantAliases+=( "${versionAliases[@]/%/-alpine}" ) diff --git a/update.sh b/update.sh index 4298b5ad30..c1d110fd29 100755 --- a/update.sh +++ b/update.sh @@ -72,7 +72,7 @@ for version in "${versions[@]}"; do for v in \ alpine{3.9,3.10} \ - {jessie,stretch}{/slim,} \ + {jessie,stretch,buster}{/slim,} \ ; do dir="$version/$v" variant="$(basename "$v")" From f8c82561047f40174b8ea1272ed79c841f61d594 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Jun 2019 12:12:14 -0700 Subject: [PATCH 259/462] Switch from "&&" to ";" and use "apt-mark showmanual"+"ldd" method for non-slim Debian too --- 2.4/alpine3.10/Dockerfile | 72 +++++++++++++++++++--------------- 2.4/alpine3.9/Dockerfile | 72 +++++++++++++++++++--------------- 2.4/jessie/Dockerfile | 71 ++++++++++++++++++++------------- 2.4/jessie/slim/Dockerfile | 74 +++++++++++++++++++---------------- 2.4/stretch/Dockerfile | 71 ++++++++++++++++++++------------- 2.4/stretch/slim/Dockerfile | 74 +++++++++++++++++++---------------- 2.5/alpine3.10/Dockerfile | 72 +++++++++++++++++++--------------- 2.5/alpine3.9/Dockerfile | 72 +++++++++++++++++++--------------- 2.5/stretch/Dockerfile | 71 ++++++++++++++++++++------------- 2.5/stretch/slim/Dockerfile | 74 +++++++++++++++++++---------------- 2.6/alpine3.10/Dockerfile | 68 ++++++++++++++++++-------------- 2.6/alpine3.9/Dockerfile | 68 ++++++++++++++++++-------------- 2.6/stretch/Dockerfile | 67 +++++++++++++++++++------------ 2.6/stretch/slim/Dockerfile | 70 ++++++++++++++++++--------------- 2.7-rc/alpine3.10/Dockerfile | 68 ++++++++++++++++++-------------- 2.7-rc/buster/Dockerfile | 67 +++++++++++++++++++------------ 2.7-rc/buster/slim/Dockerfile | 70 ++++++++++++++++++--------------- Dockerfile-alpine.template | 72 +++++++++++++++++++--------------- Dockerfile-debian.template | 71 ++++++++++++++++++++------------- Dockerfile-slim.template | 74 +++++++++++++++++++---------------- 20 files changed, 810 insertions(+), 608 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index b182eb5d64..08ca7fbefb 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -18,9 +19,9 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -47,65 +48,72 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 7abb94f212..c435191f26 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -18,9 +19,9 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -47,65 +48,72 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index f41b7df15e..80a2c8e53e 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -1,8 +1,9 @@ FROM buildpack-deps:jessie # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -14,53 +15,67 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index 57e226605b..e0babe4418 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -1,21 +1,23 @@ FROM debian:jessie-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -27,10 +29,11 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -46,53 +49,58 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 1c11182d76..3175d6ce2e 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -1,8 +1,9 @@ FROM buildpack-deps:stretch # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -14,53 +15,67 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 11e26ab5e5..1e418ef3de 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -1,21 +1,23 @@ FROM debian:stretch-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -27,10 +29,11 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -46,53 +49,58 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index efa5ddbaaf..88c7be0256 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -18,9 +19,9 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -47,65 +48,72 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index cecf2549b8..07e6937038 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -18,9 +19,9 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -47,65 +48,72 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 1d93f626ec..6347b537b9 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -1,8 +1,9 @@ FROM buildpack-deps:stretch # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -14,53 +15,67 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index bceec186f8..03847ac5cf 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -1,21 +1,23 @@ FROM debian:stretch-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -27,10 +29,11 @@ ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -46,53 +49,58 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 2611f102e7..fb887eb329 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -17,9 +18,9 @@ ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -46,62 +47,69 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index d81fcee655..8dd0c7f262 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -17,9 +18,9 @@ ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -46,62 +47,69 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index c6045ad41a..2c5077d519 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -1,8 +1,9 @@ FROM buildpack-deps:stretch # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -13,50 +14,64 @@ ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 74a2c32926..567adb12c3 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -1,21 +1,23 @@ FROM debian:stretch-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -26,10 +28,11 @@ ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -45,50 +48,55 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 032dcebf6a..ebd926faa2 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -17,9 +18,9 @@ ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -46,62 +47,69 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 49d769933f..bd0b20b94a 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -1,8 +1,9 @@ FROM buildpack-deps:buster # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -13,50 +14,64 @@ ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index 521df09d0b..31c85c1e33 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -1,21 +1,23 @@ FROM debian:buster-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -26,10 +28,11 @@ ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -45,50 +48,55 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 75bc220aad..47346ccf78 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -4,8 +4,9 @@ RUN apk add --no-cache \ gmp-dev # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -18,9 +19,9 @@ ENV RUBYGEMS_VERSION %%RUBYGEMS%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -ex \ +RUN set -eux; \ \ - && apk add --no-cache --virtual .ruby-builddeps \ + apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ bzip2 \ @@ -47,65 +48,72 @@ RUN set -ex \ xz \ yaml-dev \ zlib-dev \ + ; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - && wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch' \ - && echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum -c - \ - && patch -p1 -i thread-stack-fix.patch \ - && rm thread-stack-fix.patch \ + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ # the configure script does not detect isnan/isinf as macros - && export ac_cv_func_isnan=yes ac_cv_func_isinf=yes \ - && ./configure \ + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && runDeps="$( \ + runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )" \ - && apk add --no-network --virtual .ruby-rundeps $runDeps \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ bzip2 \ ca-certificates \ libffi-dev \ procps \ yaml-dev \ zlib-dev \ - && apk del --no-network .ruby-builddeps \ - && cd / \ - && rm -r /usr/src/ruby \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 785213f529..e955dc9696 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,8 +1,9 @@ FROM buildpack-deps:%%PLACEHOLDER%% # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -14,53 +15,67 @@ ENV RUBYGEMS_VERSION %%RUBYGEMS%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && buildDeps=' \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bison \ dpkg-dev \ libgdbm-dev \ ruby \ - ' \ - && apt-get update \ - && apt-get install -y --no-install-recommends $buildDeps \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-get purge -y --auto-remove $buildDeps \ - && cd / \ - && rm -r /usr/src/ruby \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ccbe8b7285..979eba296d 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,21 +1,23 @@ FROM debian:%%PLACEHOLDER%% -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ bzip2 \ ca-certificates \ libffi-dev \ - libgdbm3 \ libgmp-dev \ libssl-dev \ libyaml-dev \ procps \ zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* + ; \ + rm -rf /var/lib/apt/lists/* # skip installing gem documentation -RUN mkdir -p /usr/local/etc \ - && { \ +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -27,10 +29,11 @@ ENV RUBYGEMS_VERSION %%RUBYGEMS%% # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -RUN set -ex \ +RUN set -eux; \ \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y --no-install-recommends \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ autoconf \ bison \ dpkg-dev \ @@ -46,53 +49,58 @@ RUN set -ex \ ruby \ wget \ xz-utils \ - && rm -rf /var/lib/apt/lists/* \ + ; \ + rm -rf /var/lib/apt/lists/*; \ \ - && wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum -c - \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ - && mkdir -p /usr/src/ruby \ - && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.xz \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ \ - && cd /usr/src/ruby \ + cd /usr/src/ruby; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir - && { \ + { \ echo '#define ENABLE_PATH_CHECK 0'; \ echo; \ cat file.c; \ - } > file.c.new \ - && mv file.c.new file.c \ + } > file.c.new; \ + mv file.c.new file.c; \ \ - && autoconf \ - && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \ - && ./configure \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - && make -j "$(nproc)" \ - && make install \ + ; \ + make -j "$(nproc)"; \ + make install; \ \ - && apt-mark auto '.*' > /dev/null \ - && apt-mark manual $savedAptMark \ - && find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ \ - && cd / \ - && rm -r /usr/src/ruby \ + cd /; \ + rm -r /usr/src/ruby; \ # 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/ \ + ruby -e 'exit(Gem::Version.create(ENV["RUBYGEMS_VERSION"]) > Gem::Version.create(Gem::VERSION))'; \ + gem update --system "$RUBYGEMS_VERSION" && rm -r /root/.gem/; \ # rough smoke test - && ruby --version && gem --version && bundle --version + ruby --version; \ + gem --version; \ + bundle --version # install things globally, for great justice # and don't create ".bundle" in all our apps From e46b04d695a0740da90072aa17d9880244012ba7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Jun 2019 12:40:06 -0700 Subject: [PATCH 260/462] Add "libgdbm-compat-dev" explicitly in Buster+ on Slim variants This makes "require 'dbm'" work -- it uses "ndbm.h" to detect support (which is provided by this package in Buster+). --- 2.7-rc/buster/slim/Dockerfile | 1 + Dockerfile-slim.template | 1 + update.sh | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index 31c85c1e33..79cac5b192 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -38,6 +38,7 @@ RUN set -eux; \ dpkg-dev \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 979eba296d..88ca961e92 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -39,6 +39,7 @@ RUN set -eux; \ dpkg-dev \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ diff --git a/update.sh b/update.sh index c1d110fd29..0e32d07175 100755 --- a/update.sh +++ b/update.sh @@ -98,6 +98,13 @@ for version in "${versions[@]}"; do -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" + case "$v" in + # https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) + jessie/slim | stretch/slim) + sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile" + ;; + esac + if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi From aacff4398185738d84232f1685df12306be13114 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Jun 2019 16:03:12 -0700 Subject: [PATCH 261/462] Add some verification that we have no "distro ruby" packages --- 2.4/alpine3.10/Dockerfile | 6 ++++++ 2.4/alpine3.9/Dockerfile | 6 ++++++ 2.4/jessie/Dockerfile | 3 +++ 2.4/jessie/slim/Dockerfile | 3 +++ 2.4/stretch/Dockerfile | 3 +++ 2.4/stretch/slim/Dockerfile | 3 +++ 2.5/alpine3.10/Dockerfile | 6 ++++++ 2.5/alpine3.9/Dockerfile | 6 ++++++ 2.5/stretch/Dockerfile | 3 +++ 2.5/stretch/slim/Dockerfile | 3 +++ 2.6/alpine3.10/Dockerfile | 6 ++++++ 2.6/alpine3.9/Dockerfile | 6 ++++++ 2.6/stretch/Dockerfile | 3 +++ 2.6/stretch/slim/Dockerfile | 3 +++ 2.7-rc/alpine3.10/Dockerfile | 6 ++++++ 2.7-rc/buster/Dockerfile | 3 +++ 2.7-rc/buster/slim/Dockerfile | 3 +++ Dockerfile-alpine.template | 6 ++++++ Dockerfile-debian.template | 3 +++ Dockerfile-slim.template | 3 +++ 20 files changed, 84 insertions(+) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 08ca7fbefb..cd0d8e41f7 100644 --- 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 index c435191f26..74b6dfed5e 100644 --- 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 index 80a2c8e53e..2d3da5b9f2 100644 --- 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 index e0babe4418..c8ade3a350 100644 --- 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 index 3175d6ce2e..e2a875af56 100644 --- 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 index 1e418ef3de..8c2881acb2 100644 --- 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 index 88c7be0256..af24b23289 100644 --- 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 index 07e6937038..017f7349ab 100644 --- 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 index 6347b537b9..cc2b49c307 100644 --- 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 index 03847ac5cf..d16ab21713 100644 --- 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 index fb887eb329..2d73ec872f 100644 --- 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 index 8dd0c7f262..6d506ef53a 100644 --- 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 index 2c5077d519..1d58f9f4db 100644 --- 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 index 567adb12c3..dbd3ca76ae 100644 --- 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 index ebd926faa2..88a95e147e 100644 --- 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 index bd0b20b94a..d9d01c8463 100644 --- 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 index 79cac5b192..faf5ca5e09 100644 --- 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 index 47346ccf78..dd9f0d86dd 100644 --- 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 index e955dc9696..8f2c9fcac0 100644 --- 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 index 88ca961e92..1bb46314b3 100644 --- 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; \ From e040029c82501556371e9d84a9db607dfb1bba51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 26 Jun 2019 13:03:31 +0200 Subject: [PATCH 262/462] Prefer `BUNDLE_PATH__SYSTEM=true` --- 2.4/alpine3.10/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2.4/jessie/Dockerfile | 2 +- 2.4/jessie/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.10/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 2.6/alpine3.10/Dockerfile | 2 +- 2.6/alpine3.9/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 2.7-rc/alpine3.10/Dockerfile | 2 +- 2.7-rc/buster/Dockerfile | 2 +- 2.7-rc/buster/slim/Dockerfile | 2 +- Dockerfile-alpine.template | 4 ++-- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index cd0d8e41f7..753b053fa5 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 74b6dfed5e..40c2fdbf88 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 2d3da5b9f2..9343b3cb54 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index c8ade3a350..1f36ddc3ab 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e2a875af56..d0ee63f35a 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 8c2881acb2..3870f5587f 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index af24b23289..7c1958cd76 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 017f7349ab..52d621602a 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index cc2b49c307..1a7091ed84 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index d16ab21713..f965d1cb05 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 2d73ec872f..516b96f994 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index 6d506ef53a..ad0a98ddba 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 1d58f9f4db..5bb3d678ed 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index dbd3ca76ae..870b4c16bc 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -104,7 +104,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 88a95e147e..1759627e69 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index d9d01c8463..758d272cd4 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index faf5ca5e09..285ce88ae2 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -105,7 +105,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index dd9f0d86dd..8c01af63f7 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8f2c9fcac0..4f1d55e7f7 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 1bb46314b3..78bdd42967 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ +ENV BUNDLE_PATH__SYSTEM=true \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 From b08d6b8f9f54062384cf91a5e6b513c77e7b9852 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 9 Jul 2019 23:03:28 +0000 Subject: [PATCH 263/462] Update to 2.5.5, rubygems 3.0.3 --- 2.5/alpine3.10/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 7c1958cd76..ea5757c0e4 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 52d621602a..5c6459185d 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc From 89bfa0ef37445f7069a70a960af9e2731cceac6f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 9 Jul 2019 23:03:29 +0000 Subject: [PATCH 264/462] Update to 2.6.3 --- 2.6/alpine3.10/Dockerfile | 2 +- 2.6/alpine3.9/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 516b96f994..a85a351e7b 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index ad0a98ddba..f2bb1fe0fc 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc From a37d0c0d62cb17a8f61f7bc6356296f86aa2ad29 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 9 Jul 2019 23:03:29 +0000 Subject: [PATCH 265/462] Update to 2.7.0-preview1 --- 2.7-rc/alpine3.10/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 1759627e69..d4a0f8ff9d 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc From 04002dd327f7a726cf7ec7fedde1d203c6603176 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 9 Jul 2019 23:03:29 +0000 Subject: [PATCH 266/462] Update to 2.4.6, rubygems 3.0.3 --- 2.4/alpine3.10/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 753b053fa5..2e085145c6 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 40c2fdbf88..21d5fa4981 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc From 3b767347867328b98aefa48e60de95b2190f631e Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 10 Jul 2019 18:33:20 +0200 Subject: [PATCH 267/462] Add Debian Buster and remove Jessie --- .travis.yml | 8 +- 2.4/{jessie => buster}/Dockerfile | 2 +- 2.4/{jessie => buster}/slim/Dockerfile | 3 +- 2.5/buster/Dockerfile | 95 +++++++++++++++++++ 2.5/buster/slim/Dockerfile | 121 +++++++++++++++++++++++++ 2.6/buster/Dockerfile | 91 +++++++++++++++++++ 2.6/buster/slim/Dockerfile | 117 ++++++++++++++++++++++++ generate-stackbrew-library.sh | 8 +- update.sh | 4 +- 9 files changed, 439 insertions(+), 10 deletions(-) rename 2.4/{jessie => buster}/Dockerfile (99%) rename 2.4/{jessie => buster}/slim/Dockerfile (98%) create mode 100644 2.5/buster/Dockerfile create mode 100644 2.5/buster/slim/Dockerfile create mode 100644 2.6/buster/Dockerfile create mode 100644 2.6/buster/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 27d6f57a3d..2b8deb64c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,22 @@ env: - VERSION=2.7-rc VARIANT=buster - VERSION=2.7-rc VARIANT=buster/slim - VERSION=2.7-rc VARIANT=alpine3.10 + - VERSION=2.6 VARIANT=buster + - VERSION=2.6 VARIANT=buster/slim - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim - VERSION=2.6 VARIANT=alpine3.10 - VERSION=2.6 VARIANT=alpine3.9 + - VERSION=2.5 VARIANT=buster + - VERSION=2.5 VARIANT=buster/slim - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim - VERSION=2.5 VARIANT=alpine3.10 - VERSION=2.5 VARIANT=alpine3.9 + - VERSION=2.4 VARIANT=buster + - VERSION=2.4 VARIANT=buster/slim - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - - VERSION=2.4 VARIANT=jessie - - VERSION=2.4 VARIANT=jessie/slim - VERSION=2.4 VARIANT=alpine3.10 - VERSION=2.4 VARIANT=alpine3.9 diff --git a/2.4/jessie/Dockerfile b/2.4/buster/Dockerfile similarity index 99% rename from 2.4/jessie/Dockerfile rename to 2.4/buster/Dockerfile index 9343b3cb54..6c45422b46 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/buster/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie +FROM buildpack-deps:buster # skip installing gem documentation RUN set -eux; \ diff --git a/2.4/jessie/slim/Dockerfile b/2.4/buster/slim/Dockerfile similarity index 98% rename from 2.4/jessie/slim/Dockerfile rename to 2.4/buster/slim/Dockerfile index 1f36ddc3ab..7081feac96 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie-slim +FROM debian:buster-slim RUN set -eux; \ apt-get update; \ @@ -39,6 +39,7 @@ RUN set -eux; \ dpkg-dev \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile new file mode 100644 index 0000000000..ce5b1a9744 --- /dev/null +++ b/2.5/buster/Dockerfile @@ -0,0 +1,95 @@ +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBYGEMS_VERSION 3.0.3 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# 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; \ + bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH__SYSTEM=true \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile new file mode 100644 index 0000000000..70d3437b95 --- /dev/null +++ b/2.5/buster/slim/Dockerfile @@ -0,0 +1,121 @@ +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.5 +ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBYGEMS_VERSION 3.0.3 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# 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; \ + bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH__SYSTEM=true \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile new file mode 100644 index 0000000000..975ff8f453 --- /dev/null +++ b/2.6/buster/Dockerfile @@ -0,0 +1,91 @@ +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + 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; \ + bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH__SYSTEM=true \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile new file mode 100644 index 0000000000..3adf1a4249 --- /dev/null +++ b/2.6/buster/slim/Dockerfile @@ -0,0 +1,117 @@ +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.6 +ENV RUBY_VERSION 2.6.3 +ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + 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; \ + bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH__SYSTEM=true \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 155204ba75..d3ae012566 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,9 +6,9 @@ declare -A aliases=( [2.7-rc]='rc' ) -defaultDebianSuite='stretch' # TODO buster +defaultDebianSuite='buster' declare -A debianSuites=( - [2.7-rc]='buster' + #[2.7-rc]='buster' ) defaultAlpineVersion='3.10' declare -A alpineVersion=( @@ -79,14 +79,14 @@ join() { for version in "${versions[@]}"; do for v in \ - {buster,stretch,jessie}{,/slim} \ + {buster,stretch}{,/slim} \ alpine{3.10,3.9} \ ; do dir="$version/$v" variant="$(basename "$v")" if [ "$variant" = 'slim' ]; then - # convert "slim" into "slim-jessie" + # convert "slim" into "slim-buster" # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 variant="$variant-$(basename "$(dirname "$v")")" fi diff --git a/update.sh b/update.sh index 0e32d07175..f4415323a2 100755 --- a/update.sh +++ b/update.sh @@ -72,7 +72,7 @@ for version in "${versions[@]}"; do for v in \ alpine{3.9,3.10} \ - {jessie,stretch,buster}{/slim,} \ + {stretch,buster}{/slim,} \ ; do dir="$version/$v" variant="$(basename "$v")" @@ -100,7 +100,7 @@ for version in "${versions[@]}"; do case "$v" in # https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - jessie/slim | stretch/slim) + stretch/slim) sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile" ;; esac From b7e190bed1efc2521fc51e6dee7243c6aaa974e6 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 11 Jul 2019 15:11:09 -0700 Subject: [PATCH 268/462] Whitespace fix in alpine images --- 2.4/alpine3.10/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2.5/alpine3.10/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2.6/alpine3.10/Dockerfile | 2 +- 2.6/alpine3.9/Dockerfile | 2 +- 2.7-rc/alpine3.10/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 2e085145c6..753b053fa5 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 21d5fa4981..40c2fdbf88 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index ea5757c0e4..7c1958cd76 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 5c6459185d..52d621602a 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index a85a351e7b..516b96f994 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index f2bb1fe0fc..ad0a98ddba 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index d4a0f8ff9d..1759627e69 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8c01af63f7..ab6b53dc76 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -7,7 +7,7 @@ RUN apk add --no-cache \ RUN set -eux; \ mkdir -p /usr/local/etc; \ { \ - echo 'install: --no-document'; \ + echo 'install: --no-document'; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc From 4e90a92eb25fd7527f8eb5b6cede5f217f93ab57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 12 Jul 2019 11:16:20 +0200 Subject: [PATCH 269/462] Revert "Prefer `BUNDLE_PATH__SYSTEM=true`" This reverts commit e040029c82501556371e9d84a9db607dfb1bba51. --- 2.4/alpine3.10/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2.4/buster/Dockerfile | 2 +- 2.4/buster/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.10/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 2.6/alpine3.10/Dockerfile | 2 +- 2.6/alpine3.9/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 2.7-rc/alpine3.10/Dockerfile | 2 +- 2.7-rc/buster/Dockerfile | 2 +- 2.7-rc/buster/slim/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 753b053fa5..cd0d8e41f7 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 40c2fdbf88..74b6dfed5e 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 6c45422b46..bfa2c957bc 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 7081feac96..57075aca5a 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index d0ee63f35a..e2a875af56 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 3870f5587f..8c2881acb2 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 7c1958cd76..af24b23289 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 52d621602a..017f7349ab 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 1a7091ed84..cc2b49c307 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index f965d1cb05..d16ab21713 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 516b96f994..2d73ec872f 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index ad0a98ddba..6d506ef53a 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 5bb3d678ed..1d58f9f4db 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 870b4c16bc..dbd3ca76ae 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -104,7 +104,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 1759627e69..88a95e147e 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 758d272cd4..d9d01c8463 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index 285ce88ae2..faf5ca5e09 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -105,7 +105,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ab6b53dc76..dd9f0d86dd 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4f1d55e7f7..8f2c9fcac0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 78bdd42967..1bb46314b3 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 From bffb6ff1fbe37874ed506a15eb1bb7faffca589b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 12 Jul 2019 07:20:55 -0700 Subject: [PATCH 270/462] Apply #289 revert to new Buster variants too --- 2.5/buster/Dockerfile | 2 +- 2.5/buster/slim/Dockerfile | 2 +- 2.6/buster/Dockerfile | 2 +- 2.6/buster/slim/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index ce5b1a9744..d19b7bb2f5 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 70d3437b95..3baae09d12 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 975ff8f453..6dcbc3bcea 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index 3adf1a4249..c773ca0fa6 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -105,7 +105,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" # path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 From 32f51b68da57933c7ed66fde184e29846345a445 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Aug 2019 11:03:16 +0000 Subject: [PATCH 271/462] Update to 2.5.6, rubygems 3.0.3 --- 2.5/alpine3.10/Dockerfile | 4 ++-- 2.5/alpine3.9/Dockerfile | 4 ++-- 2.5/buster/Dockerfile | 4 ++-- 2.5/buster/slim/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index af24b23289..8bd783d13f 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 017f7349ab..8d93c9b462 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index d19b7bb2f5..f4afef1538 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 3baae09d12..c27fb8d928 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index cc2b49c307..a0031ad1be 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index d16ab21713..15a34f6373 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.5 -ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d +ENV RUBY_VERSION 2.5.6 +ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From a54569998bc011d4f79c25e532f21200bbf64dbb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Aug 2019 11:03:16 +0000 Subject: [PATCH 272/462] Update to 2.4.7, rubygems 3.0.3 --- 2.4/alpine3.10/Dockerfile | 4 ++-- 2.4/alpine3.9/Dockerfile | 4 ++-- 2.4/buster/Dockerfile | 4 ++-- 2.4/buster/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index cd0d8e41f7..d116558f28 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 74b6dfed5e..e88df02a84 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index bfa2c957bc..dbc559d49b 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 57075aca5a..5b7891890a 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index e2a875af56..320f266d08 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 8c2881acb2..fe7b636191 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.6 -ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c +ENV RUBY_VERSION 2.4.7 +ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 6a7df7a72b4a3d1b3e06ead303841b3fdaca560e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Aug 2019 11:03:17 +0000 Subject: [PATCH 273/462] Update to 2.6.4 --- 2.6/alpine3.10/Dockerfile | 4 ++-- 2.6/alpine3.9/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/buster/slim/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 2d73ec872f..db337f489a 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index 6d506ef53a..c57d93978f 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 6dcbc3bcea..fe801b0d49 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index c773ca0fa6..793c8d329e 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 1d58f9f4db..05eb9d2566 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index dbd3ca76ae..615d4b5a79 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.3 -ENV RUBY_DOWNLOAD_SHA256 11a83f85c03d3f0fc9b8a9b6cad1b2674f26c5aaa43ba858d4b0fcc2b54171e1 +ENV RUBY_VERSION 2.6.4 +ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 704b155d67dc893dfe0ecedb0819f58634fd8189 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 3 Sep 2019 15:10:49 -0700 Subject: [PATCH 274/462] Update generated README Especially to link to put-shared jobs (https://doi-janky.infosiftr.net/job/put-shared/) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 10ab212428..74ca5de3cf 100644 --- a/README.md +++ b/README.md @@ -21,5 +21,6 @@ For outstanding `ruby` image PRs, check [PRs with the "library/ruby" label on th |:-:|:-:|:-:|:-:| | [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby) | | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby) | +| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby) | From bf0e16e7511c97fdf351fdfc2e7e17478a4eaf16 Mon Sep 17 00:00:00 2001 From: Jan van der Pas Date: Tue, 1 Oct 2019 16:03:37 +0200 Subject: [PATCH 275/462] Update ruby 2.5.x to 2.5.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mitigates the following vulnerabilities: - CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test - CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) - CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? - CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick’s Digest access authentication --- 2.5/alpine3.10/Dockerfile | 4 ++-- 2.5/alpine3.9/Dockerfile | 4 ++-- 2.5/buster/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 8bd783d13f..6e6a73cac6 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 8d93c9b462..8f47b1d865 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index f4afef1538..4c3f7cc269 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index a0031ad1be..f613b2fae1 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 5c9e21cbf79b7f36d505555c9ecd62cf0f7e07f8 Mon Sep 17 00:00:00 2001 From: Jan van der Pas Date: Tue, 1 Oct 2019 16:05:03 +0200 Subject: [PATCH 276/462] Update ruby 2.6.x to 2.6.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mitigates the following vulnerabilities: - CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test - CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) - CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? - CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick’s Digest access authentication --- 2.6/alpine3.10/Dockerfile | 4 ++-- 2.6/alpine3.9/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index db337f489a..4bd3c78c07 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index c57d93978f..b7585d1299 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index fe801b0d49..f134bd88b4 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 05eb9d2566..f1454c0fbb 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 5a3b107c520261d867811ac417ce28f3f89f8404 Mon Sep 17 00:00:00 2001 From: Jan van der Pas Date: Tue, 1 Oct 2019 16:06:09 +0200 Subject: [PATCH 277/462] Update ruby 2.4.x to 2.4.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mitigates the following vulnerabilities: - CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test - CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix) - CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch? - CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick’s Digest access authentication --- 2.4/alpine3.10/Dockerfile | 4 ++-- 2.4/alpine3.9/Dockerfile | 4 ++-- 2.4/buster/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index d116558f28..c14e5d4851 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index e88df02a84..3055bda7c5 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index dbc559d49b..8a58d6b14c 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 320f266d08..ae9d414321 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 8565a59602d3a95f5e858eb758aba0dcd6fce007 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 1 Oct 2019 15:24:21 +0000 Subject: [PATCH 278/462] Update to 2.6.5 --- 2.6/buster/slim/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index 793c8d329e..c836d9913e 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 615d4b5a79..7c8ab08a7a 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.4 -ENV RUBY_DOWNLOAD_SHA256 df593cd4c017de19adf5d0154b8391bb057cef1b72ecdd4a8ee30d3235c65f09 +ENV RUBY_VERSION 2.6.5 +ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 21c98da485e331cdc2518e80ff91e48335041dec Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 1 Oct 2019 15:24:21 +0000 Subject: [PATCH 279/462] Update to 2.5.7, rubygems 3.0.3 --- 2.5/buster/slim/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index c27fb8d928..99fc79c015 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 15a34f6373..53f7bc0462 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.6 -ENV RUBY_DOWNLOAD_SHA256 7601e4b83f4f17bc1affe091502dd465282ffba0761dea57c071ead21b132cee +ENV RUBY_VERSION 2.5.7 +ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From d6c177822be0198eb410c210912dcd7e2c04fd3f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 1 Oct 2019 15:24:21 +0000 Subject: [PATCH 280/462] Update to 2.4.8, rubygems 3.0.3 --- 2.4/buster/slim/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 5b7891890a..8984d59280 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index fe7b636191..1205344c8b 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.7 -ENV RUBY_DOWNLOAD_SHA256 a249193c7e79b891a4783f951cad8160fa5fe985c385b4628db8e9913bff1f98 +ENV RUBY_VERSION 2.4.8 +ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 924602dc917e27f8af6b35f838d11e7f3f39b2dc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Oct 2019 11:03:26 +0000 Subject: [PATCH 281/462] Update to 2.4.9, rubygems 3.0.3 --- 2.4/alpine3.10/Dockerfile | 4 ++-- 2.4/alpine3.9/Dockerfile | 4 ++-- 2.4/buster/Dockerfile | 4 ++-- 2.4/buster/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index c14e5d4851..24ce4ed20a 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 3055bda7c5..14dd31fd65 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 8a58d6b14c..a515de0f5a 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 8984d59280..47ea51403c 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index ae9d414321..f56da95d1e 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 1205344c8b..86de609748 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.8 -ENV RUBY_DOWNLOAD_SHA256 a2a8f53ef14b891821dbbf67b081d7b9e223007a347000ff4a86a226a4708272 +ENV RUBY_VERSION 2.4.9 +ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby From 1dd5c255325fa0d5c3761f5238bbe1a9f50e9596 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Oct 2019 05:03:23 +0000 Subject: [PATCH 282/462] Update to 2.7.0-preview2 --- 2.7-rc/alpine3.10/Dockerfile | 4 ++-- 2.7-rc/buster/Dockerfile | 4 ++-- 2.7-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 88a95e147e..981480b157 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index d9d01c8463..883da70d02 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index faf5ca5e09..e9be1c2c22 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 7c4fcc4ac15d1471be0622c001728b14d8ea266f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Sun, 27 Oct 2019 23:05:01 +0000 Subject: [PATCH 283/462] Update 2.7 to preview2 version --- 2.7-rc/alpine3.10/Dockerfile | 4 ++-- 2.7-rc/buster/Dockerfile | 4 ++-- 2.7-rc/buster/slim/Dockerfile | 4 ++-- update.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 88a95e147e..981480b157 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index d9d01c8463..883da70d02 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index faf5ca5e09..e9be1c2c22 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 8c546df3345398b3edc9d0ab097846f033783d33762889fd0f3dc8bb465c3354 +ENV RUBY_VERSION 2.7.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/update.sh b/update.sh index f4415323a2..ae810072fb 100755 --- a/update.sh +++ b/update.sh @@ -21,7 +21,7 @@ latest_gem_version() { rubygems='3.0.3' declare -A newEnoughRubygems=( [2.6]=1 # 2.6.3 => gems 3.0.3 (https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems.rb#L12) - [2.7]=1 # 2.7.0-preview1 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12) + [2.7]=1 # 2.7.0-preview2 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12) ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely From 5e9c75e51671c0ed661b8654618596602a21fae0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 24 Nov 2019 18:03:27 +0000 Subject: [PATCH 284/462] Update to 2.7.0-preview3 --- 2.7-rc/alpine3.10/Dockerfile | 4 ++-- 2.7-rc/buster/Dockerfile | 4 ++-- 2.7-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 981480b157..14e7166535 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 +ENV RUBY_VERSION 2.7.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 883da70d02..400fa03919 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 +ENV RUBY_VERSION 2.7.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index e9be1c2c22..b07559185f 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 fa39f088331f6d505154aa9d025aab177fdffedfbbabccd900b8c02e745bc077 +ENV RUBY_VERSION 2.7.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 158d90b04f0dfeac68001c54dde423100d2aad33 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Dec 2019 22:21:28 +0000 Subject: [PATCH 285/462] Update to 2.7.0-rc1 --- 2.7-rc/alpine3.10/Dockerfile | 4 ++-- 2.7-rc/buster/Dockerfile | 4 ++-- 2.7-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 14e7166535..b129b23de2 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c +ENV RUBY_VERSION 2.7.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 400fa03919..49c6d5a656 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c +ENV RUBY_VERSION 2.7.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index b07559185f..222cfdea83 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 ad9d61e55ac224e3447a762e001965839846f9658f87a0e792840887cfe61b8c +ENV RUBY_VERSION 2.7.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 16829e92bbb20e82331691f32437e11394db3fa1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 24 Dec 2019 11:13:06 -0800 Subject: [PATCH 286/462] Update to 2.7.0-rc2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Normally, @docker-library-bot would get this but it's (hilariously) failing due to https://github.com/docker-library/official-images/pull/7166. 🙂 --- 2.7-rc/alpine3.10/Dockerfile | 4 ++-- 2.7-rc/buster/Dockerfile | 4 ++-- 2.7-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index b129b23de2..15257e982d 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 +ENV RUBY_VERSION 2.7.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 49c6d5a656..47b442dc23 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 +ENV RUBY_VERSION 2.7.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index 222cfdea83..ad44792817 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 7528db87df7a8cbfdcbd053073839f5a00b2a38f807771e3e45000e72fc86732 +ENV RUBY_VERSION 2.7.0-rc2 +ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From e0f00b9a0841c8b0f78faecd07afb4c5754b3c27 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 28 Dec 2019 01:27:26 +0800 Subject: [PATCH 287/462] Upgrade to Ruby 2.7.0 GA (#301) --- .travis.yml | 6 +++--- {2.7-rc => 2.7}/alpine3.10/Dockerfile | 6 +++--- {2.7-rc => 2.7}/buster/Dockerfile | 6 +++--- {2.7-rc => 2.7}/buster/slim/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) rename {2.7-rc => 2.7}/alpine3.10/Dockerfile (96%) rename {2.7-rc => 2.7}/buster/Dockerfile (94%) rename {2.7-rc => 2.7}/buster/slim/Dockerfile (95%) diff --git a/.travis.yml b/.travis.yml index 2b8deb64c9..a5ac920f57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=2.7-rc VARIANT=buster - - VERSION=2.7-rc VARIANT=buster/slim - - VERSION=2.7-rc VARIANT=alpine3.10 + - VERSION=2.7 VARIANT=buster + - VERSION=2.7 VARIANT=buster/slim + - VERSION=2.7 VARIANT=alpine3.10 - VERSION=2.6 VARIANT=buster - VERSION=2.6 VARIANT=buster/slim - VERSION=2.6 VARIANT=stretch diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile similarity index 96% rename from 2.7-rc/alpine3.10/Dockerfile rename to 2.7/alpine3.10/Dockerfile index 15257e982d..7062c3e642 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -11,9 +11,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/Dockerfile b/2.7/buster/Dockerfile similarity index 94% rename from 2.7-rc/buster/Dockerfile rename to 2.7/buster/Dockerfile index 47b442dc23..a97947efba 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -8,9 +8,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile similarity index 95% rename from 2.7-rc/buster/slim/Dockerfile rename to 2.7/buster/slim/Dockerfile index ad44792817..6eb2a2cc2e 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -22,9 +22,9 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.7-rc -ENV RUBY_VERSION 2.7.0-rc2 -ENV RUBY_DOWNLOAD_SHA256 c90d29fba655b2dd577ff755f084e4d1fe0673cfcd888af7ff5d0b2d2f449bb7 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d3ae012566..d4c817faa7 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,13 +2,13 @@ set -Eeuo pipefail declare -A aliases=( - [2.6]='2 latest' - [2.7-rc]='rc' + [2.8-rc]='rc' + [2.7]='2 latest' ) defaultDebianSuite='buster' declare -A debianSuites=( - #[2.7-rc]='buster' + #[2.7]='buster' ) defaultAlpineVersion='3.10' declare -A alpineVersion=( From defb10adcd6dd2178be3cd9c884fd035b52d42fb Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 2 Jan 2020 21:41:20 +0000 Subject: [PATCH 288/462] Add Alpine 3.11 (#300) --- .travis.yml | 7 +- 2.4/{alpine3.9 => alpine3.11}/Dockerfile | 2 +- 2.5/{alpine3.9 => alpine3.11}/Dockerfile | 2 +- 2.6/{alpine3.9 => alpine3.11}/Dockerfile | 2 +- 2.7/alpine3.11/Dockerfile | 132 +++++++++++++++++++++++ generate-stackbrew-library.sh | 4 +- update.sh | 2 +- 7 files changed, 142 insertions(+), 9 deletions(-) rename 2.4/{alpine3.9 => alpine3.11}/Dockerfile (99%) rename 2.5/{alpine3.9 => alpine3.11}/Dockerfile (99%) rename 2.6/{alpine3.9 => alpine3.11}/Dockerfile (99%) create mode 100644 2.7/alpine3.11/Dockerfile diff --git a/.travis.yml b/.travis.yml index a5ac920f57..30d9b7fc23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,25 +4,26 @@ services: docker env: - VERSION=2.7 VARIANT=buster - VERSION=2.7 VARIANT=buster/slim + - VERSION=2.7 VARIANT=alpine3.11 - VERSION=2.7 VARIANT=alpine3.10 - VERSION=2.6 VARIANT=buster - VERSION=2.6 VARIANT=buster/slim - VERSION=2.6 VARIANT=stretch - VERSION=2.6 VARIANT=stretch/slim + - VERSION=2.6 VARIANT=alpine3.11 - VERSION=2.6 VARIANT=alpine3.10 - - VERSION=2.6 VARIANT=alpine3.9 - VERSION=2.5 VARIANT=buster - VERSION=2.5 VARIANT=buster/slim - VERSION=2.5 VARIANT=stretch - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.11 - VERSION=2.5 VARIANT=alpine3.10 - - VERSION=2.5 VARIANT=alpine3.9 - VERSION=2.4 VARIANT=buster - VERSION=2.4 VARIANT=buster/slim - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim + - VERSION=2.4 VARIANT=alpine3.11 - VERSION=2.4 VARIANT=alpine3.10 - - VERSION=2.4 VARIANT=alpine3.9 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.11/Dockerfile similarity index 99% rename from 2.4/alpine3.9/Dockerfile rename to 2.4/alpine3.11/Dockerfile index 14dd31fd65..ec121f5095 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.11 RUN apk add --no-cache \ gmp-dev diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.11/Dockerfile similarity index 99% rename from 2.5/alpine3.9/Dockerfile rename to 2.5/alpine3.11/Dockerfile index 8f47b1d865..e7fd3bcf4a 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.11 RUN apk add --no-cache \ gmp-dev diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.11/Dockerfile similarity index 99% rename from 2.6/alpine3.9/Dockerfile rename to 2.6/alpine3.11/Dockerfile index b7585d1299..84c35b1486 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM alpine:3.11 RUN apk add --no-cache \ gmp-dev diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile new file mode 100644 index 0000000000..c5f06f6498 --- /dev/null +++ b/2.7/alpine3.11/Dockerfile @@ -0,0 +1,132 @@ +FROM alpine:3.11 + +RUN apk add --no-cache \ + gmp-dev + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.0 +ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + 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; \ + bundle --version + +# install things globally, for great justice +# and don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_PATH="$GEM_HOME" \ + BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 +ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d4c817faa7..b6bdf9868a 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuites=( #[2.7]='buster' ) -defaultAlpineVersion='3.10' +defaultAlpineVersion='3.11' declare -A alpineVersion=( #[2.3]='3.8' ) @@ -80,7 +80,7 @@ join() { for version in "${versions[@]}"; do for v in \ {buster,stretch}{,/slim} \ - alpine{3.10,3.9} \ + alpine{3.11,3.10} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index ae810072fb..5be166cbd4 100755 --- a/update.sh +++ b/update.sh @@ -71,7 +71,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.9,3.10} \ + alpine{3.10,3.11} \ {stretch,buster}{/slim,} \ ; do dir="$version/$v" From 8f3650c2eaa81946c8bf878e3ed55efb0af7790f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 3 Jan 2020 14:31:14 +0100 Subject: [PATCH 289/462] Remove unnecessary PATH modification I don't think that folder exists :/ --- 2.4/alpine3.10/Dockerfile | 3 +-- 2.4/alpine3.11/Dockerfile | 3 +-- 2.4/buster/Dockerfile | 3 +-- 2.4/buster/slim/Dockerfile | 3 +-- 2.4/stretch/Dockerfile | 3 +-- 2.4/stretch/slim/Dockerfile | 3 +-- 2.5/alpine3.10/Dockerfile | 3 +-- 2.5/alpine3.11/Dockerfile | 3 +-- 2.5/buster/Dockerfile | 3 +-- 2.5/buster/slim/Dockerfile | 3 +-- 2.5/stretch/Dockerfile | 3 +-- 2.5/stretch/slim/Dockerfile | 3 +-- 2.6/alpine3.10/Dockerfile | 3 +-- 2.6/alpine3.11/Dockerfile | 3 +-- 2.6/buster/Dockerfile | 3 +-- 2.6/buster/slim/Dockerfile | 3 +-- 2.6/stretch/Dockerfile | 3 +-- 2.6/stretch/slim/Dockerfile | 3 +-- 2.7/alpine3.10/Dockerfile | 3 +-- 2.7/alpine3.11/Dockerfile | 3 +-- 2.7/buster/Dockerfile | 3 +-- 2.7/buster/slim/Dockerfile | 3 +-- Dockerfile-alpine.template | 3 +-- Dockerfile-debian.template | 3 +-- Dockerfile-slim.template | 3 +-- 25 files changed, 25 insertions(+), 50 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 24ce4ed20a..d7a0721b7e 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile index ec121f5095..94068dc726 100644 --- a/2.4/alpine3.11/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index a515de0f5a..47981d772f 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 47ea51403c..20ab5f2474 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index f56da95d1e..20937aff2a 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 86de609748..9db409eb78 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -111,8 +111,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 6e6a73cac6..bcd3fa1db6 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index e7fd3bcf4a..ea601eb4a4 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index 4c3f7cc269..0914805800 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 99fc79c015..7e59996f15 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f613b2fae1..fa5e92cb29 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 53f7bc0462..7977096b07 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -111,8 +111,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 4bd3c78c07..24548e1383 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 84c35b1486..68e293a427 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index f134bd88b4..559a30e31c 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index c836d9913e..afc80b3e14 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -108,8 +108,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index f1454c0fbb..c0aa205800 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 7c8ab08a7a..845951c429 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -107,8 +107,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile index 7062c3e642..16818edb57 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index c5f06f6498..6368046c91 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index a97947efba..39d1f683fe 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 6eb2a2cc2e..684ce5fb14 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -108,8 +108,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index dd9f0d86dd..46a46b9a3c 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8f2c9fcac0..2cab186d9d 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 1bb46314b3..0e7b0bdfba 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) From 7df74adde38bb34445bdcf8b25319ec41d3a1b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 3 Jan 2020 14:43:33 +0100 Subject: [PATCH 290/462] Add paths scoped to ruby version to PATH and GEM_PATH Newer bundler versions install gems to `$GEM_HOME/ruby/`, instead of directly to `$GEM_HOME`. So we need to add the proper paths to `GEM_PATH` and `PATH` so that gems and their executables are properly found. --- 2.4/alpine3.10/Dockerfile | 3 ++- 2.4/alpine3.11/Dockerfile | 3 ++- 2.4/buster/Dockerfile | 3 ++- 2.4/buster/slim/Dockerfile | 3 ++- 2.4/stretch/Dockerfile | 3 ++- 2.4/stretch/slim/Dockerfile | 3 ++- 2.5/alpine3.10/Dockerfile | 3 ++- 2.5/alpine3.11/Dockerfile | 3 ++- 2.5/buster/Dockerfile | 3 ++- 2.5/buster/slim/Dockerfile | 3 ++- 2.5/stretch/Dockerfile | 3 ++- 2.5/stretch/slim/Dockerfile | 3 ++- 2.6/alpine3.10/Dockerfile | 3 ++- 2.6/alpine3.11/Dockerfile | 3 ++- 2.6/buster/Dockerfile | 3 ++- 2.6/buster/slim/Dockerfile | 3 ++- 2.6/stretch/Dockerfile | 3 ++- 2.6/stretch/slim/Dockerfile | 3 ++- 2.7/alpine3.10/Dockerfile | 3 ++- 2.7/alpine3.11/Dockerfile | 3 ++- 2.7/buster/Dockerfile | 3 ++- 2.7/buster/slim/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- Dockerfile-slim.template | 3 ++- 25 files changed, 50 insertions(+), 25 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index d7a0721b7e..3251bb268d 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -124,10 +124,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile index 94068dc726..65508ec3d3 100644 --- a/2.4/alpine3.11/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -124,10 +124,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 47981d772f..7cb34416d6 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -83,10 +83,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 20ab5f2474..0cc5b7af3c 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -109,10 +109,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 20937aff2a..7321ea9b00 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -83,10 +83,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 9db409eb78..aabd30346d 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -108,10 +108,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index bcd3fa1db6..5175e0a32e 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -124,10 +124,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index ea601eb4a4..b52762cac1 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -124,10 +124,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index 0914805800..7e2b1ba018 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -83,10 +83,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 7e59996f15..b88a447214 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -109,10 +109,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index fa5e92cb29..53d033686b 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -83,10 +83,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 7977096b07..cc662a43fd 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -108,10 +108,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 24548e1383..ad381731fd 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -120,10 +120,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 68e293a427..80a4896caa 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -120,10 +120,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 559a30e31c..d51ee86416 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -79,10 +79,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index afc80b3e14..94c9740bd9 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -105,10 +105,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index c0aa205800..15b3049bd5 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -79,10 +79,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 845951c429..6e9bd98cce 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -104,10 +104,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile index 16818edb57..9fea344b0a 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -120,10 +120,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index 6368046c91..34197588b4 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -120,10 +120,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 39d1f683fe..53d79a952d 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -79,10 +79,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 684ce5fb14..c7622cabc7 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -105,10 +105,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 46a46b9a3c..e3c1aea537 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -124,10 +124,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 2cab186d9d..7321e22dc9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -83,10 +83,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 0e7b0bdfba..95ff01a24a 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -109,10 +109,11 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle +ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH +ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) From 82eecb7596c3cb466dd87d4b0350d189a330b925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 3 Jan 2020 16:49:48 +0100 Subject: [PATCH 291/462] Alternative fix Stop setting `BUNDLE_PATH`. All default bundler versions shipped with all supported rubies install gems to `GEM_HOME` by default, so this shouldn't be a breaking change and it's a less surprising behavior because it does not deviate from how bundler is configured by default. Future versions will probably install locally by default, but that hasn't happened yet. I think leaving bundler "unconfigured" also matches the direction of the recent change where the images no longer explicitly install `bundler` but simply leave whatever version comes with ruby. Similarly, it makes sense to me to leave whatever configuration comes by default with `bundler` in place. --- 2.4/alpine3.10/Dockerfile | 10 +++------- 2.4/alpine3.11/Dockerfile | 10 +++------- 2.4/buster/Dockerfile | 10 +++------- 2.4/buster/slim/Dockerfile | 10 +++------- 2.4/stretch/Dockerfile | 10 +++------- 2.4/stretch/slim/Dockerfile | 10 +++------- 2.5/alpine3.10/Dockerfile | 10 +++------- 2.5/alpine3.11/Dockerfile | 10 +++------- 2.5/buster/Dockerfile | 10 +++------- 2.5/buster/slim/Dockerfile | 10 +++------- 2.5/stretch/Dockerfile | 10 +++------- 2.5/stretch/slim/Dockerfile | 10 +++------- 2.6/alpine3.10/Dockerfile | 10 +++------- 2.6/alpine3.11/Dockerfile | 10 +++------- 2.6/buster/Dockerfile | 10 +++------- 2.6/buster/slim/Dockerfile | 10 +++------- 2.6/stretch/Dockerfile | 10 +++------- 2.6/stretch/slim/Dockerfile | 10 +++------- 2.7/alpine3.10/Dockerfile | 10 +++------- 2.7/alpine3.11/Dockerfile | 10 +++------- 2.7/buster/Dockerfile | 10 +++------- 2.7/buster/slim/Dockerfile | 10 +++------- Dockerfile-alpine.template | 10 +++------- Dockerfile-debian.template | 10 +++------- Dockerfile-slim.template | 10 +++------- 25 files changed, 75 insertions(+), 175 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 3251bb268d..0d8ad7728d 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -121,16 +121,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile index 65508ec3d3..063754cd22 100644 --- a/2.4/alpine3.11/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -121,16 +121,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 7cb34416d6..1ecd8300d4 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -80,16 +80,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 0cc5b7af3c..fbe2173228 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -106,16 +106,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 7321ea9b00..61eeb47f1f 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -80,16 +80,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index aabd30346d..cda7d3db9a 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -105,16 +105,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 5175e0a32e..58839f007d 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -121,16 +121,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index b52762cac1..5f6221819e 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -121,16 +121,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index 7e2b1ba018..d6f4a4995b 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -80,16 +80,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index b88a447214..600f0879e9 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -106,16 +106,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 53d033686b..acc9c60713 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -80,16 +80,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index cc662a43fd..cf6a31990e 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -105,16 +105,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index ad381731fd..002cdac271 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -117,16 +117,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 80a4896caa..a1705f4095 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -117,16 +117,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index d51ee86416..c933cbd4f6 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -76,16 +76,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index 94c9740bd9..c22da5c666 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -102,16 +102,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 15b3049bd5..7e1988b4ca 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -76,16 +76,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 6e9bd98cce..524cb9fd28 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -101,16 +101,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile index 9fea344b0a..26a0394a60 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -117,16 +117,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index 34197588b4..31f09e31a4 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -117,16 +117,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 53d79a952d..fbe54e26d9 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -76,16 +76,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index c7622cabc7..470a521e1f 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -102,16 +102,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index e3c1aea537..8b46d6afc6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -121,16 +121,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 7321e22dc9..33314a1356 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -80,16 +80,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 95ff01a24a..e286ccc349 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -106,16 +106,12 @@ RUN set -eux; \ gem --version; \ bundle --version -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV GEM_PATH $GEM_HOME/ruby/$RUBY_MAJOR.0:$GEM_PATH -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$GEM_HOME/ruby/$RUBY_MAJOR.0/bin:$PATH +ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" -# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) CMD [ "irb" ] From a564feaaee4c8647c299ab11d41498468bb9af7b Mon Sep 17 00:00:00 2001 From: Nathan Ehresman Date: Tue, 31 Mar 2020 12:21:12 -0400 Subject: [PATCH 292/462] Upgrade Ruby version 2.4.9 to 2.4.10, 2.5.7 to 2.5.8, 2.6.5 to 2.6.6, 2.7.0 to 2.7.1 (#310) * Upgrade Ruby version 2.4.9 to 2.4.10, 2.5.7 to 2.5.8, 2.6.5 to 2.6.6, 2.7.0 to 2.7.1 * correct SHA256 hash values for the .tar.xz files * updating Ruby version/hashes in a few missed files --- 2.4/alpine3.10/Dockerfile | 4 ++-- 2.4/alpine3.11/Dockerfile | 4 ++-- 2.4/buster/Dockerfile | 4 ++-- 2.4/buster/slim/Dockerfile | 4 ++-- 2.4/stretch/Dockerfile | 4 ++-- 2.4/stretch/slim/Dockerfile | 4 ++-- 2.5/alpine3.10/Dockerfile | 4 ++-- 2.5/alpine3.11/Dockerfile | 4 ++-- 2.5/buster/Dockerfile | 4 ++-- 2.5/buster/slim/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 2.6/alpine3.10/Dockerfile | 4 ++-- 2.6/alpine3.11/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/buster/slim/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 2.7/alpine3.10/Dockerfile | 4 ++-- 2.7/alpine3.11/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/buster/slim/Dockerfile | 4 ++-- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 0d8ad7728d..0529f0daf0 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile index 063754cd22..25b4cc6fe9 100644 --- a/2.4/alpine3.11/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 1ecd8300d4..8b79d29287 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index fbe2173228..7346987f8e 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index 61eeb47f1f..e45b9c24d2 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index cda7d3db9a..8a078383e9 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.9 -ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614 +ENV RUBY_VERSION 2.4.10 +ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 58839f007d..0b50fa1c06 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index 5f6221819e..9707bb7738 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index d6f4a4995b..69889c0f2d 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 600f0879e9..cbb641b636 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index acc9c60713..7c461bbeba 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index cf6a31990e..eff91d0d2f 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.7 -ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95 +ENV RUBY_VERSION 2.5.8 +ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 002cdac271..dda82a06f6 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index a1705f4095..0fa1ca0569 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index c933cbd4f6..a674f91ec7 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index c22da5c666..22c3b4f383 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 7e1988b4ca..d1f91b35ef 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 524cb9fd28..49b5d1c0d6 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.5 -ENV RUBY_DOWNLOAD_SHA256 d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62 +ENV RUBY_VERSION 2.6.6 +ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile index 26a0394a60..d237a1ad4f 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.0 -ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 +ENV RUBY_VERSION 2.7.1 +ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index 31f09e31a4..e075c99ded 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -12,8 +12,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.0 -ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 +ENV RUBY_VERSION 2.7.1 +ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index fbe54e26d9..87d102d00b 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -9,8 +9,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.0 -ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 +ENV RUBY_VERSION 2.7.1 +ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 470a521e1f..e1a9bdbcae 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -23,8 +23,8 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.0 -ENV RUBY_DOWNLOAD_SHA256 27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343 +ENV RUBY_VERSION 2.7.1 +ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From c27ff1e843711e3717b9163f643a93038a015126 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 13 Apr 2020 13:24:41 -0700 Subject: [PATCH 293/462] Remove 2.4 (EOL) See https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/ --- .travis.yml | 6 -- 2.4/alpine3.10/Dockerfile | 132 ------------------------------------ 2.4/alpine3.11/Dockerfile | 132 ------------------------------------ 2.4/buster/Dockerfile | 91 ------------------------- 2.4/buster/slim/Dockerfile | 117 -------------------------------- 2.4/stretch/Dockerfile | 91 ------------------------- 2.4/stretch/slim/Dockerfile | 116 ------------------------------- 7 files changed, 685 deletions(-) delete mode 100644 2.4/alpine3.10/Dockerfile delete mode 100644 2.4/alpine3.11/Dockerfile delete mode 100644 2.4/buster/Dockerfile delete mode 100644 2.4/buster/slim/Dockerfile delete mode 100644 2.4/stretch/Dockerfile delete mode 100644 2.4/stretch/slim/Dockerfile diff --git a/.travis.yml b/.travis.yml index 30d9b7fc23..cbd03ade36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,6 @@ env: - VERSION=2.5 VARIANT=stretch/slim - VERSION=2.5 VARIANT=alpine3.11 - VERSION=2.5 VARIANT=alpine3.10 - - VERSION=2.4 VARIANT=buster - - VERSION=2.4 VARIANT=buster/slim - - VERSION=2.4 VARIANT=stretch - - VERSION=2.4 VARIANT=stretch/slim - - VERSION=2.4 VARIANT=alpine3.11 - - VERSION=2.4 VARIANT=alpine3.10 install: - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile deleted file mode 100644 index 0529f0daf0..0000000000 --- a/2.4/alpine3.10/Dockerfile +++ /dev/null @@ -1,132 +0,0 @@ -FROM alpine:3.10 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile deleted file mode 100644 index 25b4cc6fe9..0000000000 --- a/2.4/alpine3.11/Dockerfile +++ /dev/null @@ -1,132 +0,0 @@ -FROM alpine:3.11 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile deleted file mode 100644 index 8b79d29287..0000000000 --- a/2.4/buster/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -FROM buildpack-deps:buster - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile deleted file mode 100644 index 7346987f8e..0000000000 --- a/2.4/buster/slim/Dockerfile +++ /dev/null @@ -1,117 +0,0 @@ -FROM debian:buster-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile deleted file mode 100644 index e45b9c24d2..0000000000 --- a/2.4/stretch/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -FROM buildpack-deps:stretch - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile deleted file mode 100644 index 8a078383e9..0000000000 --- a/2.4/stretch/slim/Dockerfile +++ /dev/null @@ -1,116 +0,0 @@ -FROM debian:stretch-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV RUBY_MAJOR 2.4 -ENV RUBY_VERSION 2.4.10 -ENV RUBY_DOWNLOAD_SHA256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] From 3bda762014de29eb12759413226eee2fb2dc3394 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 28 Apr 2020 16:04:33 -0700 Subject: [PATCH 294/462] Add initial GitHub Actions CI --- .github/workflows/ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 42 ----------------------------------- README.md | 10 ++++----- update.sh | 6 ----- 4 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..155ef3165b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,48 @@ +name: GitHub CI + +on: + pull_request: + push: + schedule: + - cron: 0 0 * * 0 + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + + generate-jobs: + name: Generate Jobs + runs-on: ubuntu-latest + outputs: + strategy: ${{ steps.generate-jobs.outputs.strategy }} + steps: + - uses: actions/checkout@v1 + - id: generate-jobs + name: Generate Jobs + run: | + git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew + strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + jq . <<<"$strategy" # sanity check / debugging aid + echo "::set-output name=strategy::$strategy" + + test: + needs: generate-jobs + strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }} + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - name: Prepare Environment + run: ${{ matrix.runs.prepare }} + - name: Pull Dependencies + run: ${{ matrix.runs.pull }} + - name: Build ${{ matrix.name }} + run: ${{ matrix.runs.build }} + - name: History ${{ matrix.name }} + run: ${{ matrix.runs.history }} + - name: Test ${{ matrix.name }} + run: ${{ matrix.runs.test }} + - name: '"docker images"' + run: ${{ matrix.runs.images }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index cbd03ade36..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -language: bash -services: docker - -env: - - VERSION=2.7 VARIANT=buster - - VERSION=2.7 VARIANT=buster/slim - - VERSION=2.7 VARIANT=alpine3.11 - - VERSION=2.7 VARIANT=alpine3.10 - - VERSION=2.6 VARIANT=buster - - VERSION=2.6 VARIANT=buster/slim - - VERSION=2.6 VARIANT=stretch - - VERSION=2.6 VARIANT=stretch/slim - - VERSION=2.6 VARIANT=alpine3.11 - - VERSION=2.6 VARIANT=alpine3.10 - - VERSION=2.5 VARIANT=buster - - VERSION=2.5 VARIANT=buster/slim - - VERSION=2.5 VARIANT=stretch - - VERSION=2.5 VARIANT=stretch/slim - - VERSION=2.5 VARIANT=alpine3.11 - - VERSION=2.5 VARIANT=alpine3.10 - -install: - - git clone --depth 1 https://github.com/docker-library/official-images.git ~/official-images - -before_script: - - env | sort - - cd "$VERSION/$VARIANT" - - slash='/'; image="ruby:${VERSION}-${VARIANT//$slash/-}" - -script: - - | - ( - set -Eeuo pipefail - set -x - travis_retry docker build -t "$image" . - ~/official-images/test/run.sh "$image" - ) - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index 74ca5de3cf..d77a68e19e 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,13 @@ For outstanding `ruby` image PRs, check [PRs with the "library/ruby" label on th --- -- [![build status badge](https://img.shields.io/travis/docker-library/ruby/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/ruby/branches) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/ruby.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/ruby/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/ruby/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/ruby.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby/) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby) | -| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby) | -| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby/) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby/) | +| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby/) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby/) | [![mips64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/ruby.svg?label=mips64le)](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/ruby/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby/) | +| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby/) | diff --git a/update.sh b/update.sh index 5be166cbd4..48a3f3cf39 100755 --- a/update.sh +++ b/update.sh @@ -25,7 +25,6 @@ declare -A newEnoughRubygems=( ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely -travisEnv= for version in "${versions[@]}"; do rcGrepV='-v' rcVersion="${version%-rc}" @@ -108,10 +107,5 @@ for version in "${versions[@]}"; do if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi - - travisEnv='\n - VERSION='"$version VARIANT=$v$travisEnv" done done - -travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml From 27938afac28fcb1fc167ddf6ee15520e88d90259 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 10 Jun 2020 23:23:05 +0200 Subject: [PATCH 295/462] Add Alpine 3.12 --- 2.5/alpine3.11/Dockerfile | 1 + 2.5/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- 2.6/alpine3.11/Dockerfile | 1 + 2.6/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- 2.7/alpine3.11/Dockerfile | 1 + 2.7/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- Dockerfile-alpine.template | 1 + generate-stackbrew-library.sh | 4 ++-- update.sh | 2 +- 9 files changed, 13 insertions(+), 6 deletions(-) rename 2.5/{alpine3.10 => alpine3.12}/Dockerfile (99%) rename 2.6/{alpine3.10 => alpine3.12}/Dockerfile (99%) rename 2.7/{alpine3.10 => alpine3.12}/Dockerfile (99%) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index 9707bb7738..9c077a2e84 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.12/Dockerfile similarity index 99% rename from 2.5/alpine3.10/Dockerfile rename to 2.5/alpine3.12/Dockerfile index 0b50fa1c06..4e72886b1c 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 0fa1ca0569..5f78e80591 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.12/Dockerfile similarity index 99% rename from 2.6/alpine3.10/Dockerfile rename to 2.6/alpine3.12/Dockerfile index dda82a06f6..f59cd698ab 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index e075c99ded..0936248b6c 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.12/Dockerfile similarity index 99% rename from 2.7/alpine3.10/Dockerfile rename to 2.7/alpine3.12/Dockerfile index d237a1ad4f..6f45f215f7 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8b46d6afc6..1a72213bd8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b6bdf9868a..e1b2fe0e2d 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuites=( #[2.7]='buster' ) -defaultAlpineVersion='3.11' +defaultAlpineVersion='3.12' declare -A alpineVersion=( #[2.3]='3.8' ) @@ -80,7 +80,7 @@ join() { for version in "${versions[@]}"; do for v in \ {buster,stretch}{,/slim} \ - alpine{3.11,3.10} \ + alpine{3.12,3.11} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index 48a3f3cf39..1df7ba411e 100755 --- a/update.sh +++ b/update.sh @@ -70,7 +70,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.10,3.11} \ + alpine{3.12,3.11} \ {stretch,buster}{/slim,} \ ; do dir="$version/$v" From 8e49e25b591d4cfa6324b6dada4f16629a1e51ce Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Sat, 13 Jun 2020 13:37:45 +0900 Subject: [PATCH 296/462] Set LANG by default Ruby docker images officially provided by ruby-lang.org set `LANG` as `C.UTF-8` by default. https://hub.docker.com/r/rubylang/ruby/ https://github.com/ruby/ruby-docker-images/blob/36c5d8b68eb91e34825500e50ca677f5574401f7/Dockerfile#L3 https://github.com/docker-library/ruby/issues/45#issuecomment-117298344 > I'd rather see something more official from either Ruby or Rails upstreams > recommending a UTF-8 locale by default than just the anecdote that it's > "more common" or "more convenient". I think it's the one so we should set it by default. --- 2.5/alpine3.11/Dockerfile | 1 + 2.5/alpine3.12/Dockerfile | 1 + 2.5/buster/Dockerfile | 1 + 2.5/buster/slim/Dockerfile | 1 + 2.5/stretch/Dockerfile | 1 + 2.5/stretch/slim/Dockerfile | 1 + 2.6/alpine3.11/Dockerfile | 1 + 2.6/alpine3.12/Dockerfile | 1 + 2.6/buster/Dockerfile | 1 + 2.6/buster/slim/Dockerfile | 1 + 2.6/stretch/Dockerfile | 1 + 2.6/stretch/slim/Dockerfile | 1 + 2.7/alpine3.11/Dockerfile | 1 + 2.7/alpine3.12/Dockerfile | 1 + 2.7/buster/Dockerfile | 1 + 2.7/buster/slim/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + Dockerfile-slim.template | 1 + 19 files changed, 19 insertions(+) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index 9c077a2e84..ead925c040 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.5/alpine3.12/Dockerfile b/2.5/alpine3.12/Dockerfile index 4e72886b1c..ae82cee2fc 100644 --- a/2.5/alpine3.12/Dockerfile +++ b/2.5/alpine3.12/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index 69889c0f2d..cee7ea7bae 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index cbb641b636..05c0daa250 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 7c461bbeba..2edae2c2d4 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index eff91d0d2f..4297e7a4a0 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 ENV RUBY_VERSION 2.5.8 ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 5f78e80591..b0aa8d8601 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.12/Dockerfile index f59cd698ab..5ab1287e4c 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index a674f91ec7..6b805a515a 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index 22c3b4f383..50bb840912 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index d1f91b35ef..c750094399 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 49b5d1c0d6..f48b28a98d 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 ENV RUBY_VERSION 2.6.6 ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index 0936248b6c..d79df1ee7c 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 ENV RUBY_VERSION 2.7.1 ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.12/Dockerfile index 6f45f215f7..3bee12933d 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 ENV RUBY_VERSION 2.7.1 ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 87d102d00b..12efa7fb27 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 ENV RUBY_VERSION 2.7.1 ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index e1a9bdbcae..bf5a4aee8f 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 ENV RUBY_VERSION 2.7.1 ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1a72213bd8..71bff794d5 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,6 +11,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 33314a1356..6df3acde71 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -8,6 +8,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index e286ccc349..4ba64e7eaa 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -22,6 +22,7 @@ RUN set -eux; \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc +ENV LANG C.UTF-8 ENV RUBY_MAJOR %%VERSION%% ENV RUBY_VERSION %%FULL_VERSION%% ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% From 57a8df4f141840757a74c6caf8d8bae7010cc512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Sun, 27 Sep 2020 12:28:37 +0100 Subject: [PATCH 297/462] Add ruby 3.0.0-preview1 --- 3.0-rc/alpine3.12/Dockerfile | 130 ++++++++++++++++++++++++++++++++++ 3.0-rc/buster/Dockerfile | 88 +++++++++++++++++++++++ 3.0-rc/buster/slim/Dockerfile | 114 +++++++++++++++++++++++++++++ update.sh | 1 + 4 files changed, 333 insertions(+) create mode 100644 3.0-rc/alpine3.12/Dockerfile create mode 100644 3.0-rc/buster/Dockerfile create mode 100644 3.0-rc/buster/slim/Dockerfile diff --git a/3.0-rc/alpine3.12/Dockerfile b/3.0-rc/alpine3.12/Dockerfile new file mode 100644 index 0000000000..6880b16458 --- /dev/null +++ b/3.0-rc/alpine3.12/Dockerfile @@ -0,0 +1,130 @@ +FROM alpine:3.12 + +RUN apk add --no-cache \ + gmp-dev + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0-rc +ENV RUBY_VERSION 3.0.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + 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; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.0-rc/buster/Dockerfile b/3.0-rc/buster/Dockerfile new file mode 100644 index 0000000000..fa9b0208b6 --- /dev/null +++ b/3.0-rc/buster/Dockerfile @@ -0,0 +1,88 @@ +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0-rc +ENV RUBY_VERSION 3.0.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + 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; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.0-rc/buster/slim/Dockerfile b/3.0-rc/buster/slim/Dockerfile new file mode 100644 index 0000000000..af1347fad9 --- /dev/null +++ b/3.0-rc/buster/slim/Dockerfile @@ -0,0 +1,114 @@ +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0-rc +ENV RUBY_VERSION 3.0.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + autoconf \ + bison \ + dpkg-dev \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libgdbm-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + ruby \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + 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; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/update.sh b/update.sh index 1df7ba411e..fae7a3dcdf 100755 --- a/update.sh +++ b/update.sh @@ -22,6 +22,7 @@ rubygems='3.0.3' declare -A newEnoughRubygems=( [2.6]=1 # 2.6.3 => gems 3.0.3 (https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems.rb#L12) [2.7]=1 # 2.7.0-preview2 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12) + [3.0]=1 # 3.0.0-preview1 => gems 3.2.0.rc.1 (https://github.com/ruby/ruby/blob/v3_0_0_preview1/lib/rubygems.rb#L11) ) # TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely From 4deeb55ed067883f446e427f2d599476abf2d0c9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 28 Sep 2020 13:56:39 -0700 Subject: [PATCH 298/462] Simplify update.sh handling of rubygems now that 2.5 is our only remaining instance --- update.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/update.sh b/update.sh index fae7a3dcdf..42181d9061 100755 --- a/update.sh +++ b/update.sh @@ -13,19 +13,6 @@ releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) # TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well -latest_gem_version() { - curl -fsSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/' -} - -# https://github.com/docker-library/ruby/issues/246 -rubygems='3.0.3' -declare -A newEnoughRubygems=( - [2.6]=1 # 2.6.3 => gems 3.0.3 (https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems.rb#L12) - [2.7]=1 # 2.7.0-preview2 => gems 3.1.0.pre1 (https://github.com/ruby/ruby/blob/v2_7_0_preview1/lib/rubygems.rb#L12) - [3.0]=1 # 3.0.0-preview1 => gems 3.2.0.rc.1 (https://github.com/ruby/ruby/blob/v3_0_0_preview1/lib/rubygems.rb#L11) -) -# TODO once all versions are in this family of "new enough", remove RUBYGEMS_VERSION code entirely - for version in "${versions[@]}"; do rcGrepV='-v' rcVersion="${version%-rc}" @@ -94,7 +81,6 @@ for version in "${versions[@]}"; do -e 's!%%VERSION%%!'"$version"'!g' \ -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ -e 's!%%SHA256%%!'"$shaVal"'!g' \ - -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$template" > "$dir/Dockerfile" @@ -105,7 +91,13 @@ for version in "${versions[@]}"; do ;; esac - if [ -n "${newEnoughRubygems[$rcVersion]:-}" ]; then + # https://github.com/docker-library/ruby/issues/246 + if [ "$rcVersion" = '2.5' ]; then + rubygems='3.0.3' + sed -ri \ + -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ + "$dir/Dockerfile" + else sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" fi done From 5a4e2d8d9fae6681ac3e2344eac547f0e2cdc598 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Oct 2020 17:03:10 +0000 Subject: [PATCH 299/462] Update to 2.7.2 --- 2.7/alpine3.11/Dockerfile | 4 ++-- 2.7/alpine3.12/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/buster/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index d79df1ee7c..2ba5bfc8e9 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.1 -ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 +ENV RUBY_VERSION 2.7.2 +ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.12/Dockerfile index 3bee12933d..a5586042d1 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.1 -ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 +ENV RUBY_VERSION 2.7.2 +ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 12efa7fb27..4bac22c379 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.1 -ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 +ENV RUBY_VERSION 2.7.2 +ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index bf5a4aee8f..0e60e9a796 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.1 -ENV RUBY_DOWNLOAD_SHA256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 +ENV RUBY_VERSION 2.7.2 +ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 886df6b547e4c61c113ba05dfd88eff4d94de9b4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 8 Dec 2020 12:03:11 +0000 Subject: [PATCH 300/462] Update to 3.0.0-preview2 --- 3.0-rc/alpine3.12/Dockerfile | 4 ++-- 3.0-rc/buster/Dockerfile | 4 ++-- 3.0-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.0-rc/alpine3.12/Dockerfile b/3.0-rc/alpine3.12/Dockerfile index 6880b16458..33b6c6dfc4 100644 --- a/3.0-rc/alpine3.12/Dockerfile +++ b/3.0-rc/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a +ENV RUBY_VERSION 3.0.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/Dockerfile b/3.0-rc/buster/Dockerfile index fa9b0208b6..91bde92c34 100644 --- a/3.0-rc/buster/Dockerfile +++ b/3.0-rc/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a +ENV RUBY_VERSION 3.0.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/slim/Dockerfile b/3.0-rc/buster/slim/Dockerfile index af1347fad9..bd301c4f70 100644 --- a/3.0-rc/buster/slim/Dockerfile +++ b/3.0-rc/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 aa7cce0c99f4ea2145fef9b78d74a44857754396790cd23bad75d759811e7a2a +ENV RUBY_VERSION 3.0.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From cb97d24839bb1b446f55fac5e14573e62a94d6b2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 21 Dec 2020 17:42:26 +0000 Subject: [PATCH 301/462] Update to 3.0.0-rc1 --- 3.0-rc/alpine3.12/Dockerfile | 4 ++-- 3.0-rc/buster/Dockerfile | 4 ++-- 3.0-rc/buster/slim/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.0-rc/alpine3.12/Dockerfile b/3.0-rc/alpine3.12/Dockerfile index 33b6c6dfc4..0e3634a8ea 100644 --- a/3.0-rc/alpine3.12/Dockerfile +++ b/3.0-rc/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 +ENV RUBY_VERSION 3.0.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/Dockerfile b/3.0-rc/buster/Dockerfile index 91bde92c34..1022e69193 100644 --- a/3.0-rc/buster/Dockerfile +++ b/3.0-rc/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 +ENV RUBY_VERSION 3.0.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/slim/Dockerfile b/3.0-rc/buster/slim/Dockerfile index bd301c4f70..1401f3739c 100644 --- a/3.0-rc/buster/slim/Dockerfile +++ b/3.0-rc/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 03078e82d4fb55c13837c69e56565fc49c451d11b1ca5e1b075d990d0957f181 +ENV RUBY_VERSION 3.0.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 921f2e68671461785e822aa437b68433278263b9 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Fri, 25 Dec 2020 15:24:09 +0900 Subject: [PATCH 302/462] Ruby 3.0.0 is released --- {3.0-rc => 3.0}/alpine3.12/Dockerfile | 6 +++--- {3.0-rc => 3.0}/buster/Dockerfile | 6 +++--- {3.0-rc => 3.0}/buster/slim/Dockerfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename {3.0-rc => 3.0}/alpine3.12/Dockerfile (96%) rename {3.0-rc => 3.0}/buster/Dockerfile (94%) rename {3.0-rc => 3.0}/buster/slim/Dockerfile (95%) diff --git a/3.0-rc/alpine3.12/Dockerfile b/3.0/alpine3.12/Dockerfile similarity index 96% rename from 3.0-rc/alpine3.12/Dockerfile rename to 3.0/alpine3.12/Dockerfile index 0e3634a8ea..ff7bf6dca1 100644 --- a/3.0-rc/alpine3.12/Dockerfile +++ b/3.0/alpine3.12/Dockerfile @@ -12,9 +12,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.0 +ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/Dockerfile b/3.0/buster/Dockerfile similarity index 94% rename from 3.0-rc/buster/Dockerfile rename to 3.0/buster/Dockerfile index 1022e69193..0f81bb7e13 100644 --- a/3.0-rc/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -9,9 +9,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.0 +ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0-rc/buster/slim/Dockerfile b/3.0/buster/slim/Dockerfile similarity index 95% rename from 3.0-rc/buster/slim/Dockerfile rename to 3.0/buster/slim/Dockerfile index 1401f3739c..df682c5712 100644 --- a/3.0-rc/buster/slim/Dockerfile +++ b/3.0/buster/slim/Dockerfile @@ -23,9 +23,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0-rc -ENV RUBY_VERSION 3.0.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 f1adda082f9291e394d25ed32975abbef90962dc4c8b11130586a0151558e79a +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.0 +ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From f5aa18521c3b73f92ae340d14dc9d24555d02f43 Mon Sep 17 00:00:00 2001 From: Fumiaki MATSUSHIMA Date: Fri, 25 Dec 2020 15:51:22 +0900 Subject: [PATCH 303/462] Update generate-stackbrew-library.sh for Ruby 3.0 --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e1b2fe0e2d..c179d37a21 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,8 @@ set -Eeuo pipefail declare -A aliases=( - [2.8-rc]='rc' - [2.7]='2 latest' + [3.0]='3 latest' + [2.7]='2' ) defaultDebianSuite='buster' From 8ec0fe3a4d9bf9243a2b3247927169c139d5a1a1 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 15 Jan 2021 16:52:20 -0800 Subject: [PATCH 304/462] Add alpine:3.13 images; Drop alpine:3.11 Only two versions of alpine are supported at a time --- 2.5/{alpine3.11 => alpine3.13}/Dockerfile | 2 +- 2.6/{alpine3.11 => alpine3.13}/Dockerfile | 2 +- 2.7/{alpine3.11 => alpine3.13}/Dockerfile | 2 +- 3.0/alpine3.13/Dockerfile | 130 ++++++++++++++++++++++ generate-stackbrew-library.sh | 4 +- update.sh | 2 +- 6 files changed, 136 insertions(+), 6 deletions(-) rename 2.5/{alpine3.11 => alpine3.13}/Dockerfile (99%) rename 2.6/{alpine3.11 => alpine3.13}/Dockerfile (99%) rename 2.7/{alpine3.11 => alpine3.13}/Dockerfile (99%) create mode 100644 3.0/alpine3.13/Dockerfile diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.13/Dockerfile similarity index 99% rename from 2.5/alpine3.11/Dockerfile rename to 2.5/alpine3.13/Dockerfile index ead925c040..e6b003f46d 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.13/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache \ gmp-dev diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.13/Dockerfile similarity index 99% rename from 2.6/alpine3.11/Dockerfile rename to 2.6/alpine3.13/Dockerfile index b0aa8d8601..85186cf3bb 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache \ gmp-dev diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.13/Dockerfile similarity index 99% rename from 2.7/alpine3.11/Dockerfile rename to 2.7/alpine3.13/Dockerfile index 2ba5bfc8e9..f1600e8a21 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache \ gmp-dev diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile new file mode 100644 index 0000000000..77dabff95c --- /dev/null +++ b/3.0/alpine3.13/Dockerfile @@ -0,0 +1,130 @@ +FROM alpine:3.13 + +RUN apk add --no-cache \ + gmp-dev + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.0 +ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps \ + $runDeps \ + bzip2 \ + ca-certificates \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; \ + apk del --no-network .ruby-builddeps; \ + \ + 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; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c179d37a21..3067c43953 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuites=( #[2.7]='buster' ) -defaultAlpineVersion='3.12' +defaultAlpineVersion='3.13' declare -A alpineVersion=( #[2.3]='3.8' ) @@ -80,7 +80,7 @@ join() { for version in "${versions[@]}"; do for v in \ {buster,stretch}{,/slim} \ - alpine{3.12,3.11} \ + alpine{3.13,3.12} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index 42181d9061..f34bdc8fab 100755 --- a/update.sh +++ b/update.sh @@ -58,7 +58,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.12,3.11} \ + alpine{3.13,3.12} \ {stretch,buster}{/slim,} \ ; do dir="$version/$v" From 3904524e5d9e538b33525a602a4bcb7618aff8b6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 5 Apr 2021 09:23:27 -0700 Subject: [PATCH 305/462] Update to 3.0.1, 2.7.3, 2.6.7, 2.5.9 --- 2.5/alpine3.12/Dockerfile | 4 ++-- 2.5/alpine3.13/Dockerfile | 4 ++-- 2.5/buster/Dockerfile | 4 ++-- 2.5/buster/slim/Dockerfile | 4 ++-- 2.5/stretch/Dockerfile | 4 ++-- 2.5/stretch/slim/Dockerfile | 4 ++-- 2.6/alpine3.12/Dockerfile | 4 ++-- 2.6/alpine3.13/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/buster/slim/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 2.7/alpine3.12/Dockerfile | 4 ++-- 2.7/alpine3.13/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/buster/slim/Dockerfile | 4 ++-- 3.0/alpine3.12/Dockerfile | 4 ++-- 3.0/alpine3.13/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/buster/slim/Dockerfile | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/2.5/alpine3.12/Dockerfile b/2.5/alpine3.12/Dockerfile index ae82cee2fc..704f51b6b9 100644 --- a/2.5/alpine3.12/Dockerfile +++ b/2.5/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/alpine3.13/Dockerfile b/2.5/alpine3.13/Dockerfile index e6b003f46d..efd6b579c7 100644 --- a/2.5/alpine3.13/Dockerfile +++ b/2.5/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index cee7ea7bae..18c7a658be 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 05c0daa250..374c0deda0 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 2edae2c2d4..c7dfbd9a55 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 4297e7a4a0..a15caacc73 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.8 -ENV RUBY_DOWNLOAD_SHA256 0391b2ffad3133e274469f9953ebfd0c9f7c186238968cbdeeb0651aa02a4d6d +ENV RUBY_VERSION 2.5.9 +ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 ENV RUBYGEMS_VERSION 3.0.3 # some of ruby's build scripts are written in ruby diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.12/Dockerfile index 5ab1287e4c..7c8a8c5abb 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 85186cf3bb..2af400dc1c 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 6b805a515a..66fb452f58 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index 50bb840912..e8d2864935 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index c750094399..f09cb4c92f 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index f48b28a98d..c97bf66f32 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.6 -ENV RUBY_DOWNLOAD_SHA256 5db187882b7ac34016cd48d7032e197f07e4968f406b0690e20193b9b424841f +ENV RUBY_VERSION 2.6.7 +ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.12/Dockerfile index a5586042d1..8b636daa03 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.2 -ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 +ENV RUBY_VERSION 2.7.3 +ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index f1600e8a21..1a1363e921 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.2 -ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 +ENV RUBY_VERSION 2.7.3 +ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 4bac22c379..900fd6dd85 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.2 -ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 +ENV RUBY_VERSION 2.7.3 +ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 0e60e9a796..4054a1f1e1 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.2 -ENV RUBY_DOWNLOAD_SHA256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 +ENV RUBY_VERSION 2.7.3 +ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.12/Dockerfile b/3.0/alpine3.12/Dockerfile index ff7bf6dca1..bcfb673e62 100644 --- a/3.0/alpine3.12/Dockerfile +++ b/3.0/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.0 -ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 +ENV RUBY_VERSION 3.0.1 +ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 77dabff95c..98d05ceffa 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.0 -ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 +ENV RUBY_VERSION 3.0.1 +ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 0f81bb7e13..a82b23a9cd 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.0 -ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 +ENV RUBY_VERSION 3.0.1 +ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/slim/Dockerfile b/3.0/buster/slim/Dockerfile index df682c5712..c2c3c7bce9 100644 --- a/3.0/buster/slim/Dockerfile +++ b/3.0/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.0 -ENV RUBY_DOWNLOAD_SHA256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 +ENV RUBY_VERSION 3.0.1 +ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 6fe76a8f5019f63ecb0bb3843a5832cb588bcdfe Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 25 Jun 2021 15:29:27 -0700 Subject: [PATCH 306/462] Remove 2.5 (EOL) https://www.ruby-lang.org/en/downloads/branches/ https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-5-9-released/ > After this release, Ruby 2.5 reaches EOL. In other words, this is the last release of Ruby 2.5 series. We will not release Ruby 2.5.10 even if a security vulnerability is found. We recommend all Ruby 2.5 users to upgrade to Ruby 3.0, 2.7 or 2.6 immediately. --- 2.5/alpine3.12/Dockerfile | 134 ------------------------------------ 2.5/alpine3.13/Dockerfile | 134 ------------------------------------ 2.5/buster/Dockerfile | 92 ------------------------- 2.5/buster/slim/Dockerfile | 118 ------------------------------- 2.5/stretch/Dockerfile | 92 ------------------------- 2.5/stretch/slim/Dockerfile | 117 ------------------------------- 6 files changed, 687 deletions(-) delete mode 100644 2.5/alpine3.12/Dockerfile delete mode 100644 2.5/alpine3.13/Dockerfile delete mode 100644 2.5/buster/Dockerfile delete mode 100644 2.5/buster/slim/Dockerfile delete mode 100644 2.5/stretch/Dockerfile delete mode 100644 2.5/stretch/slim/Dockerfile diff --git a/2.5/alpine3.12/Dockerfile b/2.5/alpine3.12/Dockerfile deleted file mode 100644 index 704f51b6b9..0000000000 --- a/2.5/alpine3.12/Dockerfile +++ /dev/null @@ -1,134 +0,0 @@ -FROM alpine:3.12 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.5/alpine3.13/Dockerfile b/2.5/alpine3.13/Dockerfile deleted file mode 100644 index efd6b579c7..0000000000 --- a/2.5/alpine3.13/Dockerfile +++ /dev/null @@ -1,134 +0,0 @@ -FROM alpine:3.13 - -RUN apk add --no-cache \ - gmp-dev - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile deleted file mode 100644 index 18c7a658be..0000000000 --- a/2.5/buster/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM buildpack-deps:buster - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile deleted file mode 100644 index 374c0deda0..0000000000 --- a/2.5/buster/slim/Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -FROM debian:buster-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile deleted file mode 100644 index c7dfbd9a55..0000000000 --- a/2.5/stretch/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM buildpack-deps:stretch - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile deleted file mode 100644 index a15caacc73..0000000000 --- a/2.5/stretch/slim/Dockerfile +++ /dev/null @@ -1,117 +0,0 @@ -FROM debian:stretch-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.5 -ENV RUBY_VERSION 2.5.9 -ENV RUBY_DOWNLOAD_SHA256 a87f2fa901408cc77652c1a55ff976695bbe54830ff240e370039eca14b358f0 -ENV RUBYGEMS_VERSION 3.0.3 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] From 9b48d740b4d936bfbffd04f8a7255771cbda0656 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Jul 2021 09:29:09 -0700 Subject: [PATCH 307/462] Update to 2.7.4 --- 2.7/alpine3.12/Dockerfile | 4 ++-- 2.7/alpine3.13/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/buster/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.12/Dockerfile index 8b636daa03..99be65f317 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.3 -ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index 1a1363e921..f6bdcda93e 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.3 -ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 900fd6dd85..f23ce77230 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.3 -ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 4054a1f1e1..99edf237a5 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.3 -ENV RUBY_DOWNLOAD_SHA256 5e91d1650857d43cd6852e05ac54683351e9c301811ee0bef43a67c4605e7db1 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 108e3c2f9cdcfd1a4aeab5169e394b1d738e8c84 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Jul 2021 09:29:09 -0700 Subject: [PATCH 308/462] Update to 2.6.8 --- 2.6/alpine3.12/Dockerfile | 4 ++-- 2.6/alpine3.13/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/buster/slim/Dockerfile | 4 ++-- 2.6/stretch/Dockerfile | 4 ++-- 2.6/stretch/slim/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.12/Dockerfile index 7c8a8c5abb..f6a5902f53 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 2af400dc1c..f3e13f3fd8 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 66fb452f58..6fc6427cd7 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index e8d2864935..3afd6ff916 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index f09cb4c92f..d535bea94c 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index c97bf66f32..0142280393 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.7 -ENV RUBY_DOWNLOAD_SHA256 f43ead5626202d5432d2050eeab606e547f0554299cc1e5cf573d45670e59611 +ENV RUBY_VERSION 2.6.8 +ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 5fccac58c3d04a118b65053a0b7d9f9e5df2f68a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Jul 2021 09:29:09 -0700 Subject: [PATCH 309/462] Update to 3.0.2 --- 3.0/alpine3.12/Dockerfile | 4 ++-- 3.0/alpine3.13/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/buster/slim/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3.0/alpine3.12/Dockerfile b/3.0/alpine3.12/Dockerfile index bcfb673e62..52ccc65880 100644 --- a/3.0/alpine3.12/Dockerfile +++ b/3.0/alpine3.12/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.1 -ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 98d05ceffa..1f004c44e1 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -13,8 +13,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.1 -ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index a82b23a9cd..953b8455de 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -10,8 +10,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.1 -ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/slim/Dockerfile b/3.0/buster/slim/Dockerfile index c2c3c7bce9..a63dc2262e 100644 --- a/3.0/buster/slim/Dockerfile +++ b/3.0/buster/slim/Dockerfile @@ -24,8 +24,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.1 -ENV RUBY_DOWNLOAD_SHA256 d06bccd382d03724b69f674bc46cd6957ba08ed07522694ce44b9e8ffc9c48e2 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built From 761ae37f67acc54d49f085dc4e5a2443a77700e6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 2 Jul 2021 15:41:13 -0700 Subject: [PATCH 310/462] Add initial jq-based templating engine --- .gitattributes | 2 + .github/workflows/verify-templating.yml | 22 +++ .gitignore | 1 + 2.6/alpine3.12/Dockerfile | 46 +++--- 2.6/alpine3.13/Dockerfile | 46 +++--- 2.6/buster/Dockerfile | 9 +- 2.6/{buster/slim => slim-buster}/Dockerfile | 18 ++- 2.6/{stretch/slim => slim-stretch}/Dockerfile | 15 +- 2.6/stretch/Dockerfile | 9 +- 2.7/alpine3.12/Dockerfile | 46 +++--- 2.7/alpine3.13/Dockerfile | 46 +++--- 2.7/buster/Dockerfile | 9 +- 2.7/{buster/slim => slim-buster}/Dockerfile | 18 ++- 3.0/alpine3.12/Dockerfile | 46 +++--- 3.0/alpine3.13/Dockerfile | 46 +++--- 3.0/buster/Dockerfile | 9 +- 3.0/{buster/slim => slim-buster}/Dockerfile | 18 ++- Dockerfile-debian.template | 92 ------------ Dockerfile-slim.template | 118 ---------------- ...ile-alpine.template => Dockerfile.template | 132 ++++++++++++++---- apply-templates.sh | 51 +++++++ generate-stackbrew-library.sh | 89 ++++++------ update.sh | 101 +------------- versions.json | 34 +++++ versions.sh | 85 +++++++++++ 25 files changed, 601 insertions(+), 507 deletions(-) create mode 100644 .gitattributes create mode 100644 .github/workflows/verify-templating.yml create mode 100644 .gitignore rename 2.6/{buster/slim => slim-buster}/Dockerfile (90%) rename 2.6/{stretch/slim => slim-stretch}/Dockerfile (93%) rename 2.7/{buster/slim => slim-buster}/Dockerfile (90%) rename 3.0/{buster/slim => slim-buster}/Dockerfile (90%) delete mode 100644 Dockerfile-debian.template delete mode 100644 Dockerfile-slim.template rename Dockerfile-alpine.template => Dockerfile.template (58%) create mode 100755 apply-templates.sh create mode 100644 versions.json create mode 100755 versions.sh diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..90ec81cf7c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/*/**/Dockerfile linguist-generated +/Dockerfile*.template linguist-language=Dockerfile diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml new file mode 100644 index 0000000000..7e833f1c7d --- /dev/null +++ b/.github/workflows/verify-templating.yml @@ -0,0 +1,22 @@ +name: Verify Templating + +on: + pull_request: + push: + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + apply-templates: + name: Check For Uncomitted Changes + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Apply Templates + run: ./apply-templates.sh + - name: Check Git Status + run: | + status="$(git status --short)" + [ -z "$status" ] diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..d548f66de0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.jq-template.awk diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.12/Dockerfile index f6a5902f53..f1a226b480 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.12 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fca # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index f3e13f3fd8..7d623a8866 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.13 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fca # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 6fc6427cd7..b9824a208b 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM buildpack-deps:buster # skip installing gem documentation @@ -60,6 +66,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -70,7 +77,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.6/buster/slim/Dockerfile b/2.6/slim-buster/Dockerfile similarity index 90% rename from 2.6/buster/slim/Dockerfile rename to 2.6/slim-buster/Dockerfile index 3afd6ff916..2925c5159f 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/slim-buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:buster-slim RUN set -eux; \ @@ -34,22 +40,23 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ bison \ dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ gcc \ libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ - ruby \ wget \ xz-utils \ +# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) + libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -86,6 +93,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -96,7 +104,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.6/stretch/slim/Dockerfile b/2.6/slim-stretch/Dockerfile similarity index 93% rename from 2.6/stretch/slim/Dockerfile rename to 2.6/slim-stretch/Dockerfile index 0142280393..b4be19356d 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/slim-stretch/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:stretch-slim RUN set -eux; \ @@ -34,19 +40,19 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ bison \ dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ gcc \ libbz2-dev \ - libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ - ruby \ wget \ xz-utils \ ; \ @@ -85,6 +91,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -95,7 +102,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index d535bea94c..73f9cfd911 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM buildpack-deps:stretch # skip installing gem documentation @@ -60,6 +66,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -70,7 +77,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.12/Dockerfile index 99be65f317..b3328fa463 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.12 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index f6bdcda93e..090e0fc716 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.13 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index f23ce77230..f3780636dc 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM buildpack-deps:buster # skip installing gem documentation @@ -60,6 +66,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -70,7 +77,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/2.7/buster/slim/Dockerfile b/2.7/slim-buster/Dockerfile similarity index 90% rename from 2.7/buster/slim/Dockerfile rename to 2.7/slim-buster/Dockerfile index 99edf237a5..c8edc041bd 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:buster-slim RUN set -eux; \ @@ -34,22 +40,23 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ bison \ dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ gcc \ libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ - ruby \ wget \ xz-utils \ +# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) + libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -86,6 +93,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -96,7 +104,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/3.0/alpine3.12/Dockerfile b/3.0/alpine3.12/Dockerfile index 52ccc65880..ea092b9cd2 100644 --- a/3.0/alpine3.12/Dockerfile +++ b/3.0/alpine3.12/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.12 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 1f004c44e1..76a77f9c91 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -1,7 +1,21 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.13 -RUN apk add --no-cache \ - gmp-dev +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; # skip installing gem documentation RUN set -eux; \ @@ -18,9 +32,9 @@ ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -68,6 +82,9 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -79,8 +96,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -95,24 +110,19 @@ RUN set -eux; \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ \ 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 \ - ; \ + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 953b8455de..fe137bc19d 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM buildpack-deps:buster # skip installing gem documentation @@ -60,6 +66,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -70,7 +77,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/3.0/buster/slim/Dockerfile b/3.0/slim-buster/Dockerfile similarity index 90% rename from 3.0/buster/slim/Dockerfile rename to 3.0/slim-buster/Dockerfile index a63dc2262e..91affedd37 100644 --- a/3.0/buster/slim/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM debian:buster-slim RUN set -eux; \ @@ -34,22 +40,23 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ bison \ dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ gcc \ libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ - ruby \ wget \ xz-utils \ +# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) + libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -86,6 +93,7 @@ RUN set -eux; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ + | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ @@ -96,7 +104,7 @@ RUN set -eux; \ cd /; \ rm -r /usr/src/ruby; \ # verify we have no "ruby" packages installed - ! dpkg -l | grep -i ruby; \ + if dpkg -l | grep -i ruby; then exit 1; fi; \ [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template deleted file mode 100644 index 6df3acde71..0000000000 --- a/Dockerfile-debian.template +++ /dev/null @@ -1,92 +0,0 @@ -FROM buildpack-deps:%%PLACEHOLDER%% - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR %%VERSION%% -ENV RUBY_VERSION %%FULL_VERSION%% -ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% -ENV RUBYGEMS_VERSION %%RUBYGEMS%% - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template deleted file mode 100644 index 4ba64e7eaa..0000000000 --- a/Dockerfile-slim.template +++ /dev/null @@ -1,118 +0,0 @@ -FROM debian:%%PLACEHOLDER%% - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR %%VERSION%% -ENV RUBY_VERSION %%FULL_VERSION%% -ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% -ENV RUBYGEMS_VERSION %%RUBYGEMS%% - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - bison \ - dpkg-dev \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - ruby \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# 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; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile-alpine.template b/Dockerfile.template similarity index 58% rename from Dockerfile-alpine.template rename to Dockerfile.template index 71bff794d5..cdbe4aa3b5 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile.template @@ -1,8 +1,46 @@ -FROM alpine:%%PLACEHOLDER%% +{{ + def is_alpine: + env.variant | startswith("alpine") + ; + def is_slim: + env.variant | startswith("slim-") +-}} +{{ if is_alpine then ( -}} +FROM alpine:{{ env.variant | ltrimstr("alpine") }} +{{ ) elif is_slim then ( -}} +FROM debian:{{ env.variant | ltrimstr("slim-") }}-slim +{{ ) else ( -}} +FROM buildpack-deps:{{ env.variant }} +{{ ) end -}} -RUN apk add --no-cache \ - gmp-dev +{{ if is_alpine then ( -}} +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; +{{ ) elif is_slim then ( -}} +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +{{ ) else "" end -}} # skip installing gem documentation RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -12,16 +50,16 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR %%VERSION%% -ENV RUBY_VERSION %%FULL_VERSION%% -ENV RUBY_DOWNLOAD_SHA256 %%SHA256%% -ENV RUBYGEMS_VERSION %%RUBYGEMS%% +ENV RUBY_MAJOR {{ env.version }} +ENV RUBY_VERSION {{ .version }} +ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }} # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 RUN set -eux; \ \ +{{ if is_alpine then ( -}} +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -51,6 +89,34 @@ RUN set -eux; \ yaml-dev \ zlib-dev \ ; \ +{{ ) else ( -}} + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ +{{ if is_slim then ( -}} + autoconf \ + gcc \ + libbz2-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ +{{ if env.variant | endswith("stretch") then "" else ( -}} +# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) + libgdbm-compat-dev \ +{{ ) end -}} +{{ ) else "" end -}} + ; \ + rm -rf /var/lib/apt/lists/*; \ +{{ ) end -}} \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ @@ -61,6 +127,7 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ +{{ if is_alpine then ( -}} # https://github.com/docker-library/ruby/issues/196 # https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) # https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) @@ -69,6 +136,10 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +{{ ) else "" end -}} # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ @@ -80,8 +151,6 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ @@ -90,33 +159,44 @@ RUN set -eux; \ make -j "$(nproc)"; \ make install; \ \ +{{ if is_alpine then ( -}} runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ | sort -u \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ )"; \ - apk add --no-network --virtual .ruby-rundeps \ - $runDeps \ - bzip2 \ - ca-certificates \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ apk del --no-network .ruby-builddeps; \ +{{ ) else ( -}} + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ +{{ ) end -}} \ cd /; \ rm -r /usr/src/ruby; \ -# 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 \ - ; \ +{{ if is_alpine then ( -}} + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ +{{ ) else ( -}} + if dpkg -l | grep -i ruby; then exit 1; fi; \ +{{ ) end -}} [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ # rough smoke test ruby --version; \ diff --git a/apply-templates.sh b/apply-templates.sh new file mode 100755 index 0000000000..9e27242306 --- /dev/null +++ b/apply-templates.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +[ -f versions.json ] # run "versions.sh" first + +jqt='.jq-template.awk' +if [ -n "${BASHBREW_SCRIPTS:-}" ]; then + jqt="$BASHBREW_SCRIPTS/jq-template.awk" +elif [ "$BASH_SOURCE" -nt "$jqt" ]; then + # # https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk + wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/00e281f36edd19f52541a6ba2f215cc3c4645128/scripts/jq-template.awk' +fi + +if [ "$#" -eq 0 ]; then + versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + eval "set -- $versions" +fi + +generated_warning() { + cat <<-EOH + # + # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" + # + # PLEASE DO NOT EDIT IT DIRECTLY. + # + + EOH +} + +for version; do + export version + + rm -rf "$version/" + + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" + eval "variants=( $variants )" + + for variant in "${variants[@]}"; do + export variant + + dir="$version/$variant" + mkdir -p "$dir" + + echo "processing $dir ..." + + { + generated_warning + gawk -f "$jqt" Dockerfile.template + } > "$dir/Dockerfile" + done +done diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 3067c43953..cb39569cdf 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,23 +6,16 @@ declare -A aliases=( [2.7]='2' ) -defaultDebianSuite='buster' -declare -A debianSuites=( - #[2.7]='buster' -) -defaultAlpineVersion='3.13' -declare -A alpineVersion=( - #[2.3]='3.8' -) - self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" -versions=( */ ) -versions=( "${versions[@]%/}" ) +if [ "$#" -eq 0 ]; then + versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + eval "set -- $versions" +fi # sort version numbers with highest first -IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS +IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS # get the most recent commit which modified any of "$@" fileCommit() { @@ -34,15 +27,19 @@ dirCommit() { local dir="$1"; shift ( cd "$dir" - fileCommit \ - Dockerfile \ - $(git show HEAD:./Dockerfile | awk ' + files="$( + git show HEAD:./Dockerfile | awk ' toupper($1) == "COPY" { for (i = 2; i < NF; i++) { + if ($i ~ /^--from=/) { + next + } print $i } } - ') + ' + )" + fileCommit Dockerfile $files ) } @@ -77,42 +74,52 @@ join() { echo "${out#$sep}" } -for version in "${versions[@]}"; do - for v in \ - {buster,stretch}{,/slim} \ - alpine{3.13,3.12} \ - ; do - dir="$version/$v" - variant="$(basename "$v")" +for version; do + export version + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" + eval "variants=( $variants )" - if [ "$variant" = 'slim' ]; then - # convert "slim" into "slim-buster" - # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 - variant="$variant-$(basename "$(dirname "$v")")" - fi + fullVersion="$(jq -r '.[env.version].version' versions.json)" + versionAliases=( + $fullVersion + $version + ${aliases[$version]:-} + ) + + defaultDebianVariant="$(jq -r ' + .[env.version].variants + | map(select( + startswith("alpine") + or startswith("slim-") + | not + )) + | .[0] + ' versions.json)" + defaultAlpineVariant="$(jq -r ' + .[env.version].variants + | map(select( + startswith("alpine") + )) + | .[0] + ' versions.json)" + + for v in "${variants[@]}"; do + dir="$version/$v" [ -f "$dir/Dockerfile" ] || continue + variant="$(basename "$v")" commit="$(dirCommit "$dir")" - fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "RUBY_VERSION" { print $3; exit }')" - - versionAliases=( - $fullVersion - $version - ${aliases[$version]:-} - ) - variantAliases=( "${versionAliases[@]/%/-$variant}" ) - debianSuite="${debianSuites[$version]:-$defaultDebianSuite}" case "$variant" in - "$debianSuite") + "$defaultDebianVariant") variantAliases+=( "${versionAliases[@]}" ) ;; - *-"$debianSuite") - variantAliases+=( "${versionAliases[@]/%/-${variant%-$debianSuite}}" ) + *-"$defaultDebianVariant") + variantAliases+=( "${versionAliases[@]/%/-${variant%-$defaultDebianVariant}}" ) ;; - "alpine${alpineVersion[$version]:-$defaultAlpineVersion}") + "$defaultAlpineVariant") variantAliases+=( "${versionAliases[@]/%/-alpine}" ) ;; esac diff --git a/update.sh b/update.sh index f34bdc8fab..bac2d7581c 100755 --- a/update.sh +++ b/update.sh @@ -3,102 +3,5 @@ set -Eeuo pipefail cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" -versions=( "$@" ) -if [ ${#versions[@]} -eq 0 ]; then - versions=( */ ) -fi -versions=( "${versions[@]%/}" ) - -releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" -newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) -# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well - -for version in "${versions[@]}"; do - rcGrepV='-v' - rcVersion="${version%-rc}" - if [ "$rcVersion" != "$version" ]; then - rcGrepV= - fi - - IFS=$'\n'; allVersions=( $( - curl -fsSL --compressed "https://cache.ruby-lang.org/pub/ruby/$rcVersion/" \ - | grep -oE '["/]ruby-'"$rcVersion"'.[^"]+\.tar\.xz' \ - | sed -r 's!^["/]ruby-([^"]+)[.]tar[.]xz!\1!' \ - | grep $rcGrepV -E 'preview|rc' \ - | sort -ruV - ) ); unset IFS - - fullVersion= - shaVal= - for tryVersion in "${allVersions[@]}"; do - if \ - { - versionReleasePage="$(grep "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ - && [ "$versionReleasePage" ] \ - && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '$1 == "SHA256:" { print $2; exit }')" \ - && [ "$shaVal" ] - } \ - ; then - fullVersion="$tryVersion" - break - fi - done - - if [ -z "$fullVersion" ]; then - echo >&2 "warning: cannot determine sha for $version (tried all of ${allVersions[*]}); skipping" - continue - fi - - echo "$version: $fullVersion; $shaVal" - - for v in \ - alpine{3.13,3.12} \ - {stretch,buster}{/slim,} \ - ; do - dir="$version/$v" - variant="$(basename "$v")" - - [ -d "$dir" ] || continue - - case "$variant" in - slim|windowsservercore) template="$variant"; tag="$(basename "$(dirname "$dir")")" ;; - alpine*) template='alpine'; tag="${variant#alpine}" ;; - *) template='debian'; tag="$variant" ;; - esac - template="Dockerfile-${template}.template" - - if [ "$variant" = 'slim' ]; then - tag+='-slim' - fi - - sed -r \ - -e 's!%%VERSION%%!'"$version"'!g' \ - -e 's!%%FULL_VERSION%%!'"$fullVersion"'!g' \ - -e 's!%%SHA256%%!'"$shaVal"'!g' \ - -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ - "$template" > "$dir/Dockerfile" - - case "$v" in - # https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - stretch/slim) - sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile" - ;; - esac - - # https://github.com/docker-library/ruby/issues/246 - if [ "$rcVersion" = '2.5' ]; then - rubygems='3.0.3' - sed -ri \ - -e 's!%%RUBYGEMS%%!'"$rubygems"'!g' \ - "$dir/Dockerfile" - else - sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile" - fi - done -done +./versions.sh "$@" +./apply-templates.sh "$@" diff --git a/versions.json b/versions.json new file mode 100644 index 0000000000..1c50698e85 --- /dev/null +++ b/versions.json @@ -0,0 +1,34 @@ +{ + "2.6": { + "sha256": "8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb", + "variants": [ + "buster", + "slim-buster", + "stretch", + "slim-stretch", + "alpine3.13", + "alpine3.12" + ], + "version": "2.6.8" + }, + "2.7": { + "sha256": "2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7", + "variants": [ + "buster", + "slim-buster", + "alpine3.13", + "alpine3.12" + ], + "version": "2.7.4" + }, + "3.0": { + "sha256": "570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40", + "variants": [ + "buster", + "slim-buster", + "alpine3.13", + "alpine3.12" + ], + "version": "3.0.2" + } +} diff --git a/versions.sh b/versions.sh new file mode 100755 index 0000000000..6f55ed7aad --- /dev/null +++ b/versions.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" + +versions=( "$@" ) +if [ ${#versions[@]} -eq 0 ]; then + versions=( */ ) + json='{}' +else + json="$(< versions.json)" +fi +versions=( "${versions[@]%/}" ) + +releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" +newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) +# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well + +for version in "${versions[@]}"; do + rcGrepV='-v' + rcVersion="${version%-rc}" + if [ "$rcVersion" != "$version" ]; then + rcGrepV= + fi + export version rcVersion + + IFS=$'\n'; allVersions=( $( + curl -fsSL --compressed "https://cache.ruby-lang.org/pub/ruby/$rcVersion/" \ + | grep -oE '["/]ruby-'"$rcVersion"'.[^"]+\.tar\.xz' \ + | sed -r 's!^["/]ruby-([^"]+)[.]tar[.]xz!\1!' \ + | grep $rcGrepV -E 'preview|rc' \ + | sort -ruV + ) ); unset IFS + + fullVersion= + shaVal= + for tryVersion in "${allVersions[@]}"; do + if \ + { + versionReleasePage="$(grep "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ + && [ "$versionReleasePage" ] \ + && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '$1 == "SHA256:" { print $2; exit }')" \ + && [ "$shaVal" ] + } \ + ; then + fullVersion="$tryVersion" + break + fi + done + + if [ -z "$fullVersion" ]; then + echo >&2 "error: cannot determine sha for $version (tried all of ${allVersions[*]})" + exit 1 + fi + + echo "$version: $fullVersion; $shaVal" + + export fullVersion shaVal + json="$(jq <<<"$json" -c ' + .[env.version] = { + version: env.fullVersion, + sha256: env.shaVal, + variants: [ + ( + "buster", + if env.rcVersion == "2.6" then + "stretch" + else empty end + | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 + ( + "3.13", + "3.12" + | "alpine" + .) + ], + } + ')" +done + +jq <<<"$json" -S . > versions.json From 0c5948bcce84b1829a554209c777f0ef6a357dd2 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 16 Jun 2021 23:04:12 +0200 Subject: [PATCH 311/462] Add Alpine 3.14 Also add "g++" during compilation (the upstream configure script looks for it, even though it doesn't appear to be used). --- 2.6/alpine3.13/Dockerfile | 1 + 2.6/{alpine3.12 => alpine3.14}/Dockerfile | 10 +++++++++- 2.6/slim-buster/Dockerfile | 1 + 2.6/slim-stretch/Dockerfile | 1 + 2.7/alpine3.13/Dockerfile | 1 + 2.7/{alpine3.12 => alpine3.14}/Dockerfile | 3 ++- 2.7/slim-buster/Dockerfile | 1 + 3.0/alpine3.13/Dockerfile | 1 + 3.0/{alpine3.12 => alpine3.14}/Dockerfile | 3 ++- 3.0/slim-buster/Dockerfile | 1 + Dockerfile.template | 19 +++++++++++++++++++ versions.json | 12 ++++++------ versions.sh | 4 ++-- 13 files changed, 47 insertions(+), 11 deletions(-) rename 2.6/{alpine3.12 => alpine3.14}/Dockerfile (89%) rename 2.7/{alpine3.12 => alpine3.14}/Dockerfile (99%) rename 3.0/{alpine3.12 => alpine3.14}/Dockerfile (99%) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 7d623a8866..1c1feafe1b 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.14/Dockerfile similarity index 89% rename from 2.6/alpine3.12/Dockerfile rename to 2.6/alpine3.14/Dockerfile index f1a226b480..53d1aef8a6 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 RUN set -eux; \ apk add --no-cache \ @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ @@ -82,6 +83,13 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) +# https://github.com/ruby/ruby/pull/3773 + wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ + echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \ + patch -p1 -i autoconf-2.70.patch; \ + rm autoconf-2.70.patch; \ + \ # the configure script does not detect isnan/isinf as macros export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ \ diff --git a/2.6/slim-buster/Dockerfile b/2.6/slim-buster/Dockerfile index 2925c5159f..0c3b1a98f9 100644 --- a/2.6/slim-buster/Dockerfile +++ b/2.6/slim-buster/Dockerfile @@ -45,6 +45,7 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + g++ \ gcc \ libbz2-dev \ libglib2.0-dev \ diff --git a/2.6/slim-stretch/Dockerfile b/2.6/slim-stretch/Dockerfile index b4be19356d..88d1609db9 100644 --- a/2.6/slim-stretch/Dockerfile +++ b/2.6/slim-stretch/Dockerfile @@ -45,6 +45,7 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + g++ \ gcc \ libbz2-dev \ libglib2.0-dev \ diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index 090e0fc716..38cc86ca70 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.14/Dockerfile similarity index 99% rename from 2.7/alpine3.12/Dockerfile rename to 2.7/alpine3.14/Dockerfile index b3328fa463..31be848cb2 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 RUN set -eux; \ apk add --no-cache \ @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index c8edc041bd..e63c047267 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -45,6 +45,7 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + g++ \ gcc \ libbz2-dev \ libglib2.0-dev \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 76a77f9c91..ba573d215a 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/3.0/alpine3.12/Dockerfile b/3.0/alpine3.14/Dockerfile similarity index 99% rename from 3.0/alpine3.12/Dockerfile rename to 3.0/alpine3.14/Dockerfile index ea092b9cd2..e574b85d62 100644 --- a/3.0/alpine3.12/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.14 RUN set -eux; \ apk add --no-cache \ @@ -43,6 +43,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 91affedd37..88b4e02422 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -45,6 +45,7 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + g++ \ gcc \ libbz2-dev \ libglib2.0-dev \ diff --git a/Dockerfile.template b/Dockerfile.template index cdbe4aa3b5..666ae9b911 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -68,6 +68,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ @@ -99,6 +100,7 @@ RUN set -eux; \ ruby \ {{ if is_slim then ( -}} autoconf \ + g++ \ gcc \ libbz2-dev \ libglib2.0-dev \ @@ -136,6 +138,23 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +{{ + { + "2.6": { + url: "https://github.com/ruby/ruby/pull/3773", + commit: "fcc88da5eb162043adcba552646677d2ab5adf55", + sha256: "62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54", + }, + }[env.version] | if . and env.variant != "alpine3.13" then ( +-}} +# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) +# {{ .url }} + wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \ + echo '{{ .sha256 }} *autoconf-2.70.patch' | sha256sum --check --strict; \ + patch -p1 -i autoconf-2.70.patch; \ + rm autoconf-2.70.patch; \ + \ +{{ ) else "" end -}} # the configure script does not detect isnan/isinf as macros export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ \ diff --git a/versions.json b/versions.json index 1c50698e85..729a7acb45 100644 --- a/versions.json +++ b/versions.json @@ -6,8 +6,8 @@ "slim-buster", "stretch", "slim-stretch", - "alpine3.13", - "alpine3.12" + "alpine3.14", + "alpine3.13" ], "version": "2.6.8" }, @@ -16,8 +16,8 @@ "variants": [ "buster", "slim-buster", - "alpine3.13", - "alpine3.12" + "alpine3.14", + "alpine3.13" ], "version": "2.7.4" }, @@ -26,8 +26,8 @@ "variants": [ "buster", "slim-buster", - "alpine3.13", - "alpine3.12" + "alpine3.14", + "alpine3.13" ], "version": "3.0.2" } diff --git a/versions.sh b/versions.sh index 6f55ed7aad..92290eb347 100755 --- a/versions.sh +++ b/versions.sh @@ -74,8 +74,8 @@ for version in "${versions[@]}"; do else empty end | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - "3.13", - "3.12" + "3.14", + "3.13" | "alpine" + .) ], } From e43959905d886946628d89f8e28d276af14a44a0 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Mon, 16 Aug 2021 11:31:57 -0700 Subject: [PATCH 312/462] Update patch file shasum In some way, GitHub changed how they present the .patch file --- 2.6/alpine3.14/Dockerfile | 2 +- Dockerfile.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index 53d1aef8a6..cb90863960 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -86,7 +86,7 @@ RUN set -eux; \ # https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) # https://github.com/ruby/ruby/pull/3773 wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ - echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \ + echo '95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64 *autoconf-2.70.patch' | sha256sum --check --strict; \ patch -p1 -i autoconf-2.70.patch; \ rm autoconf-2.70.patch; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index 666ae9b911..dfc9a32476 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -143,7 +143,7 @@ RUN set -eux; \ "2.6": { url: "https://github.com/ruby/ruby/pull/3773", commit: "fcc88da5eb162043adcba552646677d2ab5adf55", - sha256: "62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54", + sha256: "95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64", }, }[env.version] | if . and env.variant != "alpine3.13" then ( -}} From 49168590766ac3eb0ad286154b2e01760b79f4b2 Mon Sep 17 00:00:00 2001 From: ojab Date: Sun, 15 Aug 2021 07:24:21 +0000 Subject: [PATCH 313/462] Add `bullseye` & `bullseye-slim` versions, drop `stretch` & `stretch-slim` --- 2.6/{stretch => bullseye}/Dockerfile | 2 +- .../Dockerfile | 3 +- 2.6/slim-buster/Dockerfile | 3 +- 2.7/bullseye/Dockerfile | 95 ++++++++++++++ 2.7/slim-bullseye/Dockerfile | 122 ++++++++++++++++++ 2.7/slim-buster/Dockerfile | 3 +- 3.0/bullseye/Dockerfile | 95 ++++++++++++++ 3.0/slim-bullseye/Dockerfile | 122 ++++++++++++++++++ 3.0/slim-buster/Dockerfile | 3 +- Dockerfile.template | 5 +- versions.json | 8 +- versions.sh | 6 +- 12 files changed, 449 insertions(+), 18 deletions(-) rename 2.6/{stretch => bullseye}/Dockerfile (98%) rename 2.6/{slim-stretch => slim-bullseye}/Dockerfile (98%) create mode 100644 2.7/bullseye/Dockerfile create mode 100644 2.7/slim-bullseye/Dockerfile create mode 100644 3.0/bullseye/Dockerfile create mode 100644 3.0/slim-bullseye/Dockerfile diff --git a/2.6/stretch/Dockerfile b/2.6/bullseye/Dockerfile similarity index 98% rename from 2.6/stretch/Dockerfile rename to 2.6/bullseye/Dockerfile index 73f9cfd911..387c39d5b1 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/bullseye/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:stretch +FROM buildpack-deps:bullseye # skip installing gem documentation RUN set -eux; \ diff --git a/2.6/slim-stretch/Dockerfile b/2.6/slim-bullseye/Dockerfile similarity index 98% rename from 2.6/slim-stretch/Dockerfile rename to 2.6/slim-bullseye/Dockerfile index 88d1609db9..b2aa2cca9e 100644 --- a/2.6/slim-stretch/Dockerfile +++ b/2.6/slim-bullseye/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:stretch-slim +FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ @@ -48,6 +48,7 @@ RUN set -eux; \ g++ \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ diff --git a/2.6/slim-buster/Dockerfile b/2.6/slim-buster/Dockerfile index 0c3b1a98f9..1e50d8fd72 100644 --- a/2.6/slim-buster/Dockerfile +++ b/2.6/slim-buster/Dockerfile @@ -48,6 +48,7 @@ RUN set -eux; \ g++ \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ @@ -56,8 +57,6 @@ RUN set -eux; \ make \ wget \ xz-utils \ -# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile new file mode 100644 index 0000000000..6ebfaa002d --- /dev/null +++ b/2.7/bullseye/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..05e01bad4f --- /dev/null +++ b/2.7/slim-bullseye/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 2.7 +ENV RUBY_VERSION 2.7.4 +ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index e63c047267..3b1825a1c6 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -48,6 +48,7 @@ RUN set -eux; \ g++ \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ @@ -56,8 +57,6 @@ RUN set -eux; \ make \ wget \ xz-utils \ -# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile new file mode 100644 index 0000000000..6cf1732b42 --- /dev/null +++ b/3.0/bullseye/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..a17b866a8f --- /dev/null +++ b/3.0/slim-bullseye/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.0 +ENV RUBY_VERSION 3.0.2 +ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 88b4e02422..feef07b491 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -48,6 +48,7 @@ RUN set -eux; \ g++ \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ @@ -56,8 +57,6 @@ RUN set -eux; \ make \ wget \ xz-utils \ -# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - libgdbm-compat-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index dfc9a32476..6798d02485 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -103,6 +103,7 @@ RUN set -eux; \ g++ \ gcc \ libbz2-dev \ + libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ libreadline-dev \ @@ -111,10 +112,6 @@ RUN set -eux; \ make \ wget \ xz-utils \ -{{ if env.variant | endswith("stretch") then "" else ( -}} -# https://packages.debian.org/sid/libgdbm-compat-dev (needed for "dbm" core module, but only in Buster+) - libgdbm-compat-dev \ -{{ ) end -}} {{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/versions.json b/versions.json index 729a7acb45..c428c8c021 100644 --- a/versions.json +++ b/versions.json @@ -2,10 +2,10 @@ "2.6": { "sha256": "8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb", "variants": [ + "bullseye", + "slim-bullseye", "buster", "slim-buster", - "stretch", - "slim-stretch", "alpine3.14", "alpine3.13" ], @@ -14,6 +14,8 @@ "2.7": { "sha256": "2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7", "variants": [ + "bullseye", + "slim-bullseye", "buster", "slim-buster", "alpine3.14", @@ -24,6 +26,8 @@ "3.0": { "sha256": "570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40", "variants": [ + "bullseye", + "slim-bullseye", "buster", "slim-buster", "alpine3.14", diff --git a/versions.sh b/versions.sh index 92290eb347..51d1803e20 100755 --- a/versions.sh +++ b/versions.sh @@ -68,10 +68,8 @@ for version in "${versions[@]}"; do sha256: env.shaVal, variants: [ ( - "buster", - if env.rcVersion == "2.6" then - "stretch" - else empty end + "bullseye", + "buster" | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( "3.14", From 659f4ab3a26e8538db6a690e6bf8491930da3e37 Mon Sep 17 00:00:00 2001 From: yosifkit Date: Mon, 23 Aug 2021 09:10:27 -0700 Subject: [PATCH 314/462] Remove sha256sum from GitHub patch file We pull it via https, and thus can generally trust that we get the right thing -- we've had *many* instances of the sha256sum flopping back and forth based on minor adjustments to the generated patch format GitHub generates. --- 2.6/alpine3.14/Dockerfile | 1 - Dockerfile.template | 2 -- 2 files changed, 3 deletions(-) diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index cb90863960..5a86b56098 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -86,7 +86,6 @@ RUN set -eux; \ # https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) # https://github.com/ruby/ruby/pull/3773 wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ - echo '95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64 *autoconf-2.70.patch' | sha256sum --check --strict; \ patch -p1 -i autoconf-2.70.patch; \ rm autoconf-2.70.patch; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index 6798d02485..534cf98cdc 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -140,14 +140,12 @@ RUN set -eux; \ "2.6": { url: "https://github.com/ruby/ruby/pull/3773", commit: "fcc88da5eb162043adcba552646677d2ab5adf55", - sha256: "95565a8a8f0eddd39d76fe8af63fc34b6429c956c8f8fe0aa17282d37adced64", }, }[env.version] | if . and env.variant != "alpine3.13" then ( -}} # https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) # {{ .url }} wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \ - echo '{{ .sha256 }} *autoconf-2.70.patch' | sha256sum --check --strict; \ patch -p1 -i autoconf-2.70.patch; \ rm autoconf-2.70.patch; \ \ From 53a12c266a4bd3c1e5ade9907336cf52f694cc6b Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Mon, 25 Oct 2021 16:46:01 -0700 Subject: [PATCH 315/462] Use libucontext in 2.7 to fix alpine based builds on arm32v6/7 and s390x - Same as alpine uses on all arches (https://git.alpinelinux.org/aports/commit/main/ruby/APKBUILD?h=3.14-stable&id=5ed0f177e21cb9582f05a4088209ada9b143ef80) --- 2.6/alpine3.13/Dockerfile | 1 + 2.6/alpine3.14/Dockerfile | 1 + 2.7/alpine3.13/Dockerfile | 2 ++ 2.7/alpine3.14/Dockerfile | 2 ++ 3.0/alpine3.13/Dockerfile | 1 + 3.0/alpine3.14/Dockerfile | 1 + Dockerfile.template | 4 ++++ 7 files changed, 12 insertions(+) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 1c1feafe1b..11f9f1d733 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index 5a86b56098..a882629e16 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index 38cc86ca70..6a9bba4000 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,6 +98,7 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + export LIBS='-lucontext'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.14/Dockerfile index 31be848cb2..9c0b3c6d96 100644 --- a/2.7/alpine3.14/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,6 +98,7 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + export LIBS='-lucontext'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index ba573d215a..0edbbe0d20 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.14/Dockerfile index e574b85d62..bb1a25d501 100644 --- a/3.0/alpine3.14/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -51,6 +51,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/Dockerfile.template b/Dockerfile.template index 534cf98cdc..edd463b720 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -76,6 +76,7 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ + libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -165,6 +166,9 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +{{ if is_alpine and env.version == "2.7" then ( -}} + export LIBS='-lucontext'; \ +{{ ) else "" end -}} ./configure \ --build="$gnuArch" \ --disable-install-doc \ From bda17e37f416a6b866c1d5def53017b5a025f106 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 27 Oct 2021 15:33:46 -0700 Subject: [PATCH 316/462] Limit ucontext linking to specific arches --- 2.6/alpine3.13/Dockerfile | 1 - 2.6/alpine3.14/Dockerfile | 1 - 2.7/alpine3.13/Dockerfile | 11 +++++++++-- 2.7/alpine3.14/Dockerfile | 11 +++++++++-- 3.0/alpine3.13/Dockerfile | 10 +++++++++- 3.0/alpine3.14/Dockerfile | 10 +++++++++- Dockerfile.template | 15 +++++++++++---- 7 files changed, 47 insertions(+), 12 deletions(-) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 11f9f1d733..1c1feafe1b 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index a882629e16..5a86b56098 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index 6a9bba4000..f80d05b4aa 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,8 +96,16 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 + # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + s390x | armhf | armv7) \ + apk add --no-cache libucontext-dev; \ + export LIBS='-lucontext'; \ + ;; \ + esac; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - export LIBS='-lucontext'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.14/Dockerfile index 9c0b3c6d96..ebf7c2985a 100644 --- a/2.7/alpine3.14/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,8 +96,16 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 + # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + s390x | armhf | armv7) \ + apk add --no-cache libucontext-dev; \ + export LIBS='-lucontext'; \ + ;; \ + esac; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - export LIBS='-lucontext'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 0edbbe0d20..d5fd52e058 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,6 +96,15 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 + # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + s390x | armhf | armv7) \ + apk add --no-cache libucontext-dev; \ + export LIBS='-lucontext'; \ + ;; \ + esac; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.14/Dockerfile index bb1a25d501..749d8b72e2 100644 --- a/3.0/alpine3.14/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -97,6 +96,15 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 + # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + s390x | armhf | armv7) \ + apk add --no-cache libucontext-dev; \ + export LIBS='-lucontext'; \ + ;; \ + esac; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/Dockerfile.template b/Dockerfile.template index edd463b720..e4e735838f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -76,7 +76,6 @@ RUN set -eux; \ libffi-dev \ libxml2-dev \ libxslt-dev \ - libucontext-dev \ linux-headers \ make \ ncurses-dev \ @@ -165,10 +164,18 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ -{{ if is_alpine and env.version == "2.7" then ( -}} - export LIBS='-lucontext'; \ +{{ if is_alpine and ( [ "2.7", "3.0" ] | index(env.version) ) then ( -}} + # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 + # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + s390x | armhf | armv7) \ + apk add --no-cache libucontext-dev; \ + export LIBS='-lucontext'; \ + ;; \ + esac; \ {{ ) else "" end -}} + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ From 9d85d0a89d473e30aca7c2eee65695676ac41a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Tue, 9 Nov 2021 13:44:56 +0000 Subject: [PATCH 317/462] Add ruby 3.1.0-preview1 --- 3.1-rc/alpine3.13/Dockerfile | 141 ++++++++++++++++++++++++++++++++ 3.1-rc/alpine3.14/Dockerfile | 141 ++++++++++++++++++++++++++++++++ 3.1-rc/bullseye/Dockerfile | 95 +++++++++++++++++++++ 3.1-rc/buster/Dockerfile | 95 +++++++++++++++++++++ 3.1-rc/slim-bullseye/Dockerfile | 122 +++++++++++++++++++++++++++ 3.1-rc/slim-buster/Dockerfile | 122 +++++++++++++++++++++++++++ versions.json | 12 +++ 7 files changed, 728 insertions(+) create mode 100644 3.1-rc/alpine3.13/Dockerfile create mode 100644 3.1-rc/alpine3.14/Dockerfile create mode 100644 3.1-rc/bullseye/Dockerfile create mode 100644 3.1-rc/buster/Dockerfile create mode 100644 3.1-rc/slim-bullseye/Dockerfile create mode 100644 3.1-rc/slim-buster/Dockerfile diff --git a/3.1-rc/alpine3.13/Dockerfile b/3.1-rc/alpine3.13/Dockerfile new file mode 100644 index 0000000000..2073ef1d1f --- /dev/null +++ b/3.1-rc/alpine3.13/Dockerfile @@ -0,0 +1,141 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.13 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.1-rc/alpine3.14/Dockerfile b/3.1-rc/alpine3.14/Dockerfile new file mode 100644 index 0000000000..62d9ed0326 --- /dev/null +++ b/3.1-rc/alpine3.14/Dockerfile @@ -0,0 +1,141 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.14 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.1-rc/bullseye/Dockerfile b/3.1-rc/bullseye/Dockerfile new file mode 100644 index 0000000000..a07021315c --- /dev/null +++ b/3.1-rc/bullseye/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.1-rc/buster/Dockerfile b/3.1-rc/buster/Dockerfile new file mode 100644 index 0000000000..b6c08a6df2 --- /dev/null +++ b/3.1-rc/buster/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.1-rc/slim-bullseye/Dockerfile b/3.1-rc/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..0193663aff --- /dev/null +++ b/3.1-rc/slim-bullseye/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.1-rc/slim-buster/Dockerfile b/3.1-rc/slim-buster/Dockerfile new file mode 100644 index 0000000000..433e624a8f --- /dev/null +++ b/3.1-rc/slim-buster/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1-rc +ENV RUBY_VERSION 3.1.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index c428c8c021..863edff1f0 100644 --- a/versions.json +++ b/versions.json @@ -34,5 +34,17 @@ "alpine3.13" ], "version": "3.0.2" + }, + "3.1-rc": { + "sha256": "86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d", + "variants": [ + "bullseye", + "slim-bullseye", + "buster", + "slim-buster", + "alpine3.14", + "alpine3.13" + ], + "version": "3.1.0-preview1" } } From d339fc4298b24ad6fb9f6758fde30c0a2643eae3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Nov 2021 09:21:16 -0800 Subject: [PATCH 318/462] Update 2.6 to 2.6.9 --- 2.6/alpine3.13/Dockerfile | 4 ++-- 2.6/alpine3.14/Dockerfile | 4 ++-- 2.6/bullseye/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/slim-bullseye/Dockerfile | 4 ++-- 2.6/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index 1c1feafe1b..4f2440a2bb 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index 5a86b56098..74042817bf 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/bullseye/Dockerfile b/2.6/bullseye/Dockerfile index 387c39d5b1..fdc5052a77 100644 --- a/2.6/bullseye/Dockerfile +++ b/2.6/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index b9824a208b..887bda5eaf 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/slim-bullseye/Dockerfile b/2.6/slim-bullseye/Dockerfile index b2aa2cca9e..b9dd86b3d4 100644 --- a/2.6/slim-bullseye/Dockerfile +++ b/2.6/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/slim-buster/Dockerfile b/2.6/slim-buster/Dockerfile index 1e50d8fd72..abeaa720da 100644 --- a/2.6/slim-buster/Dockerfile +++ b/2.6/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.8 -ENV RUBY_DOWNLOAD_SHA256 8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb +ENV RUBY_VERSION 2.6.9 +ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 863edff1f0..76d98f8595 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "2.6": { - "sha256": "8262e4663169c85787fdc9bfbd04d9eb86eb2a4b56d7f98373a8fcaa18e593eb", + "sha256": "6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece", "variants": [ "bullseye", "slim-bullseye", @@ -9,7 +9,7 @@ "alpine3.14", "alpine3.13" ], - "version": "2.6.8" + "version": "2.6.9" }, "2.7": { "sha256": "2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7", From 928ce974a8356c21238af67b50680cc42fc489fe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Nov 2021 09:45:02 -0800 Subject: [PATCH 319/462] Update 2.7 to 2.7.5 --- 2.7/alpine3.13/Dockerfile | 4 ++-- 2.7/alpine3.14/Dockerfile | 4 ++-- 2.7/bullseye/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/slim-bullseye/Dockerfile | 4 ++-- 2.7/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index f80d05b4aa..0d7517b559 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.14/Dockerfile index ebf7c2985a..f84a45b47d 100644 --- a/2.7/alpine3.14/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index 6ebfaa002d..a9e621e3a5 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index f3780636dc..868dfe6cb3 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index 05e01bad4f..b97197a971 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index 3b1825a1c6..3a9be1d6d8 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.4 -ENV RUBY_DOWNLOAD_SHA256 2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7 +ENV RUBY_VERSION 2.7.5 +ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 76d98f8595..be45b7b475 100644 --- a/versions.json +++ b/versions.json @@ -12,7 +12,7 @@ "version": "2.6.9" }, "2.7": { - "sha256": "2a80824e0ad6100826b69b9890bf55cfc4cf2b61a1e1330fccbcb30c46cef8d7", + "sha256": "d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516", "variants": [ "bullseye", "slim-bullseye", @@ -21,7 +21,7 @@ "alpine3.14", "alpine3.13" ], - "version": "2.7.4" + "version": "2.7.5" }, "3.0": { "sha256": "570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40", From c57d85bd8745dcd12d2713c177d6dbc5844318b7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Nov 2021 10:06:29 -0800 Subject: [PATCH 320/462] Update 3.0 to 3.0.3 --- 3.0/alpine3.13/Dockerfile | 4 ++-- 3.0/alpine3.14/Dockerfile | 4 ++-- 3.0/bullseye/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/slim-bullseye/Dockerfile | 4 ++-- 3.0/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index d5fd52e058..c52c6d4b04 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.14/Dockerfile index 749d8b72e2..b98cf8d0eb 100644 --- a/3.0/alpine3.14/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index 6cf1732b42..abf6afadd0 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index fe137bc19d..055579e476 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index a17b866a8f..b1e1e0531f 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index feef07b491..affbfd81a6 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.2 -ENV RUBY_DOWNLOAD_SHA256 570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40 +ENV RUBY_VERSION 3.0.3 +ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index be45b7b475..1109e4a6f7 100644 --- a/versions.json +++ b/versions.json @@ -24,7 +24,7 @@ "version": "2.7.5" }, "3.0": { - "sha256": "570e7773100f625599575f363831166d91d49a1ab97d3ab6495af44774155c40", + "sha256": "88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c", "variants": [ "bullseye", "slim-bullseye", @@ -33,7 +33,7 @@ "alpine3.14", "alpine3.13" ], - "version": "3.0.2" + "version": "3.0.3" }, "3.1-rc": { "sha256": "86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d", From 1e1d46db1542d9869ef677ebc2dd56aecb4ececa Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 29 Nov 2021 12:21:25 -0800 Subject: [PATCH 321/462] Update to Alpine 3.15 --- 2.6/{alpine3.13 => alpine3.15}/Dockerfile | 8 +++++++- 2.7/{alpine3.13 => alpine3.15}/Dockerfile | 2 +- 3.0/{alpine3.13 => alpine3.15}/Dockerfile | 2 +- 3.1-rc/{alpine3.13 => alpine3.15}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) rename 2.6/{alpine3.13 => alpine3.15}/Dockerfile (92%) rename 2.7/{alpine3.13 => alpine3.15}/Dockerfile (99%) rename 3.0/{alpine3.13 => alpine3.15}/Dockerfile (99%) rename 3.1-rc/{alpine3.13 => alpine3.15}/Dockerfile (99%) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.15/Dockerfile similarity index 92% rename from 2.6/alpine3.13/Dockerfile rename to 2.6/alpine3.15/Dockerfile index 4f2440a2bb..172918f137 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.15/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.15 RUN set -eux; \ apk add --no-cache \ @@ -83,6 +83,12 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ +# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) +# https://github.com/ruby/ruby/pull/3773 + wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ + patch -p1 -i autoconf-2.70.patch; \ + rm autoconf-2.70.patch; \ + \ # the configure script does not detect isnan/isinf as macros export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ \ diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.15/Dockerfile similarity index 99% rename from 2.7/alpine3.13/Dockerfile rename to 2.7/alpine3.15/Dockerfile index 0d7517b559..487142a3ba 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.15/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.15 RUN set -eux; \ apk add --no-cache \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.15/Dockerfile similarity index 99% rename from 3.0/alpine3.13/Dockerfile rename to 3.0/alpine3.15/Dockerfile index c52c6d4b04..8b6b485050 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.15/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.15 RUN set -eux; \ apk add --no-cache \ diff --git a/3.1-rc/alpine3.13/Dockerfile b/3.1-rc/alpine3.15/Dockerfile similarity index 99% rename from 3.1-rc/alpine3.13/Dockerfile rename to 3.1-rc/alpine3.15/Dockerfile index 2073ef1d1f..74a45c2202 100644 --- a/3.1-rc/alpine3.13/Dockerfile +++ b/3.1-rc/alpine3.15/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.15 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index 1109e4a6f7..f479e90232 100644 --- a/versions.json +++ b/versions.json @@ -6,8 +6,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.14", - "alpine3.13" + "alpine3.15", + "alpine3.14" ], "version": "2.6.9" }, @@ -18,8 +18,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.14", - "alpine3.13" + "alpine3.15", + "alpine3.14" ], "version": "2.7.5" }, @@ -30,8 +30,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.14", - "alpine3.13" + "alpine3.15", + "alpine3.14" ], "version": "3.0.3" }, @@ -42,8 +42,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.14", - "alpine3.13" + "alpine3.15", + "alpine3.14" ], "version": "3.1.0-preview1" } diff --git a/versions.sh b/versions.sh index 51d1803e20..5e217eead5 100755 --- a/versions.sh +++ b/versions.sh @@ -72,8 +72,8 @@ for version in "${versions[@]}"; do "buster" | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - "3.14", - "3.13" + "3.15", + "3.14" | "alpine" + .) ], } From 07554c8658a9305f77051781e6ca41d352b44c3b Mon Sep 17 00:00:00 2001 From: enomotodev Date: Sat, 25 Dec 2021 23:31:20 +0900 Subject: [PATCH 322/462] Update to 3.1 stable release --- {3.1-rc => 3.1}/alpine3.14/Dockerfile | 6 +++--- {3.1-rc => 3.1}/alpine3.15/Dockerfile | 6 +++--- {3.1-rc => 3.1}/bullseye/Dockerfile | 6 +++--- {3.1-rc => 3.1}/buster/Dockerfile | 6 +++--- {3.1-rc => 3.1}/slim-bullseye/Dockerfile | 6 +++--- {3.1-rc => 3.1}/slim-buster/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 2 +- versions.json | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) rename {3.1-rc => 3.1}/alpine3.14/Dockerfile (96%) rename {3.1-rc => 3.1}/alpine3.15/Dockerfile (96%) rename {3.1-rc => 3.1}/bullseye/Dockerfile (94%) rename {3.1-rc => 3.1}/buster/Dockerfile (94%) rename {3.1-rc => 3.1}/slim-bullseye/Dockerfile (95%) rename {3.1-rc => 3.1}/slim-buster/Dockerfile (95%) diff --git a/3.1-rc/alpine3.14/Dockerfile b/3.1/alpine3.14/Dockerfile similarity index 96% rename from 3.1-rc/alpine3.14/Dockerfile rename to 3.1/alpine3.14/Dockerfile index 62d9ed0326..6b1a42f02a 100644 --- a/3.1-rc/alpine3.14/Dockerfile +++ b/3.1/alpine3.14/Dockerfile @@ -26,9 +26,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1-rc/alpine3.15/Dockerfile b/3.1/alpine3.15/Dockerfile similarity index 96% rename from 3.1-rc/alpine3.15/Dockerfile rename to 3.1/alpine3.15/Dockerfile index 74a45c2202..124e396243 100644 --- a/3.1-rc/alpine3.15/Dockerfile +++ b/3.1/alpine3.15/Dockerfile @@ -26,9 +26,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1-rc/bullseye/Dockerfile b/3.1/bullseye/Dockerfile similarity index 94% rename from 3.1-rc/bullseye/Dockerfile rename to 3.1/bullseye/Dockerfile index a07021315c..3e67558c11 100644 --- a/3.1-rc/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -15,9 +15,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1-rc/buster/Dockerfile b/3.1/buster/Dockerfile similarity index 94% rename from 3.1-rc/buster/Dockerfile rename to 3.1/buster/Dockerfile index b6c08a6df2..117f5573e8 100644 --- a/3.1-rc/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -15,9 +15,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1-rc/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile similarity index 95% rename from 3.1-rc/slim-bullseye/Dockerfile rename to 3.1/slim-bullseye/Dockerfile index 0193663aff..836f5e9a1f 100644 --- a/3.1-rc/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -29,9 +29,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1-rc/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile similarity index 95% rename from 3.1-rc/slim-buster/Dockerfile rename to 3.1/slim-buster/Dockerfile index 433e624a8f..ed4a5bacc9 100644 --- a/3.1-rc/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -29,9 +29,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1-rc -ENV RUBY_VERSION 3.1.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.0 +ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index cb39569cdf..a98da9227e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [3.0]='3 latest' + [3.1]='3 latest' [2.7]='2' ) diff --git a/versions.json b/versions.json index f479e90232..24ea1fbd50 100644 --- a/versions.json +++ b/versions.json @@ -35,8 +35,8 @@ ], "version": "3.0.3" }, - "3.1-rc": { - "sha256": "86a836ad42f6a7a469fce71ffec48fd3184af55bf79e488b568a4f64adee551d", + "3.1": { + "sha256": "1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2", "variants": [ "bullseye", "slim-bullseye", @@ -45,6 +45,6 @@ "alpine3.15", "alpine3.14" ], - "version": "3.1.0-preview1" + "version": "3.1.0" } } From cf80cd6600ded0516cb70087d38823da4c52774e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 Feb 2022 10:03:53 -0800 Subject: [PATCH 323/462] Update 3.1 to 3.1.1 --- 3.1/alpine3.14/Dockerfile | 4 ++-- 3.1/alpine3.15/Dockerfile | 4 ++-- 3.1/bullseye/Dockerfile | 4 ++-- 3.1/buster/Dockerfile | 4 ++-- 3.1/slim-bullseye/Dockerfile | 4 ++-- 3.1/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.1/alpine3.14/Dockerfile b/3.1/alpine3.14/Dockerfile index 6b1a42f02a..d7511ae05c 100644 --- a/3.1/alpine3.14/Dockerfile +++ b/3.1/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/alpine3.15/Dockerfile b/3.1/alpine3.15/Dockerfile index 124e396243..2b3d844f9e 100644 --- a/3.1/alpine3.15/Dockerfile +++ b/3.1/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 3e67558c11..bd0b3c61ed 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/buster/Dockerfile b/3.1/buster/Dockerfile index 117f5573e8..3e50e5f324 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 836f5e9a1f..4e4def8cfb 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile index ed4a5bacc9..76d8c0533b 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.0 -ENV RUBY_DOWNLOAD_SHA256 1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2 +ENV RUBY_VERSION 3.1.1 +ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 24ea1fbd50..15b9ac2a94 100644 --- a/versions.json +++ b/versions.json @@ -36,7 +36,7 @@ "version": "3.0.3" }, "3.1": { - "sha256": "1a0e0b69b9b062b6299ff1f6c6d77b66aff3995f63d1d8b8771e7a113ec472e2", + "sha256": "7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa", "variants": [ "bullseye", "slim-bullseye", @@ -45,6 +45,6 @@ "alpine3.15", "alpine3.14" ], - "version": "3.1.0" + "version": "3.1.1" } } From 34ebac96fb1563b5a021176f3b8abae1be2803de Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 4 Apr 2022 14:26:03 -0700 Subject: [PATCH 324/462] Add 3.2.0-preview1 --- 3.2-rc/alpine3.14/Dockerfile | 141 ++++++++++++++++++++++++++++++++ 3.2-rc/alpine3.15/Dockerfile | 141 ++++++++++++++++++++++++++++++++ 3.2-rc/bullseye/Dockerfile | 95 +++++++++++++++++++++ 3.2-rc/buster/Dockerfile | 95 +++++++++++++++++++++ 3.2-rc/slim-bullseye/Dockerfile | 122 +++++++++++++++++++++++++++ 3.2-rc/slim-buster/Dockerfile | 122 +++++++++++++++++++++++++++ versions.json | 12 +++ 7 files changed, 728 insertions(+) create mode 100644 3.2-rc/alpine3.14/Dockerfile create mode 100644 3.2-rc/alpine3.15/Dockerfile create mode 100644 3.2-rc/bullseye/Dockerfile create mode 100644 3.2-rc/buster/Dockerfile create mode 100644 3.2-rc/slim-bullseye/Dockerfile create mode 100644 3.2-rc/slim-buster/Dockerfile diff --git a/3.2-rc/alpine3.14/Dockerfile b/3.2-rc/alpine3.14/Dockerfile new file mode 100644 index 0000000000..9308e92923 --- /dev/null +++ b/3.2-rc/alpine3.14/Dockerfile @@ -0,0 +1,141 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.14 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2-rc/alpine3.15/Dockerfile b/3.2-rc/alpine3.15/Dockerfile new file mode 100644 index 0000000000..39109499b5 --- /dev/null +++ b/3.2-rc/alpine3.15/Dockerfile @@ -0,0 +1,141 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.15 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2-rc/bullseye/Dockerfile b/3.2-rc/bullseye/Dockerfile new file mode 100644 index 0000000000..6166e0bb2b --- /dev/null +++ b/3.2-rc/bullseye/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2-rc/buster/Dockerfile b/3.2-rc/buster/Dockerfile new file mode 100644 index 0000000000..5f8132f1a2 --- /dev/null +++ b/3.2-rc/buster/Dockerfile @@ -0,0 +1,95 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2-rc/slim-bullseye/Dockerfile b/3.2-rc/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..8d930aa879 --- /dev/null +++ b/3.2-rc/slim-bullseye/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2-rc/slim-buster/Dockerfile b/3.2-rc/slim-buster/Dockerfile new file mode 100644 index 0000000000..18628c2350 --- /dev/null +++ b/3.2-rc/slim-buster/Dockerfile @@ -0,0 +1,122 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2-rc +ENV RUBY_VERSION 3.2.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 15b9ac2a94..0b4c3d7379 100644 --- a/versions.json +++ b/versions.json @@ -46,5 +46,17 @@ "alpine3.14" ], "version": "3.1.1" + }, + "3.2-rc": { + "sha256": "6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d", + "variants": [ + "bullseye", + "slim-bullseye", + "buster", + "slim-buster", + "alpine3.15", + "alpine3.14" + ], + "version": "3.2.0-preview1" } } From b633eef5268b596356ee6674164599ebfc50aa8b Mon Sep 17 00:00:00 2001 From: ojab Date: Tue, 12 Apr 2022 13:47:55 +0000 Subject: [PATCH 325/462] Update 2.6 to 2.6.10 https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/ --- 2.6/alpine3.14/Dockerfile | 4 ++-- 2.6/alpine3.15/Dockerfile | 4 ++-- 2.6/bullseye/Dockerfile | 4 ++-- 2.6/buster/Dockerfile | 4 ++-- 2.6/slim-bullseye/Dockerfile | 4 ++-- 2.6/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile index 74042817bf..ef56285904 100644 --- a/2.6/alpine3.14/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/alpine3.15/Dockerfile b/2.6/alpine3.15/Dockerfile index 172918f137..d76852b045 100644 --- a/2.6/alpine3.15/Dockerfile +++ b/2.6/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/bullseye/Dockerfile b/2.6/bullseye/Dockerfile index fdc5052a77..de99cfb7cc 100644 --- a/2.6/bullseye/Dockerfile +++ b/2.6/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index 887bda5eaf..5b9b9d886b 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/slim-bullseye/Dockerfile b/2.6/slim-bullseye/Dockerfile index b9dd86b3d4..3a58f106ac 100644 --- a/2.6/slim-bullseye/Dockerfile +++ b/2.6/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.6/slim-buster/Dockerfile b/2.6/slim-buster/Dockerfile index abeaa720da..55ab9aab84 100644 --- a/2.6/slim-buster/Dockerfile +++ b/2.6/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.9 -ENV RUBY_DOWNLOAD_SHA256 6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece +ENV RUBY_VERSION 2.6.10 +ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 0b4c3d7379..a46b2f0b28 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "2.6": { - "sha256": "6a041d82ae6e0f02ccb1465e620d94a7196489d8a13d6018a160da42ebc1eece", + "sha256": "5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2", "variants": [ "bullseye", "slim-bullseye", @@ -9,7 +9,7 @@ "alpine3.15", "alpine3.14" ], - "version": "2.6.9" + "version": "2.6.10" }, "2.7": { "sha256": "d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516", From 2c3e1e09e881f8a1f24d1ddfe1d5c6117aaa62de Mon Sep 17 00:00:00 2001 From: ojab Date: Tue, 12 Apr 2022 13:48:14 +0000 Subject: [PATCH 326/462] Update 2.7 to 2.7.6 https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-7-6-released/ --- 2.7/alpine3.14/Dockerfile | 4 ++-- 2.7/alpine3.15/Dockerfile | 4 ++-- 2.7/bullseye/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/slim-bullseye/Dockerfile | 4 ++-- 2.7/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.14/Dockerfile index f84a45b47d..06d7681497 100644 --- a/2.7/alpine3.14/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.15/Dockerfile b/2.7/alpine3.15/Dockerfile index 487142a3ba..d5c5a4e8ac 100644 --- a/2.7/alpine3.15/Dockerfile +++ b/2.7/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index a9e621e3a5..a6b894c534 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 868dfe6cb3..9e141d82e3 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index b97197a971..0e43a71fb4 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index 3a9be1d6d8..9770c4cf19 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.5 -ENV RUBY_DOWNLOAD_SHA256 d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516 +ENV RUBY_VERSION 2.7.6 +ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index a46b2f0b28..6760db3fdc 100644 --- a/versions.json +++ b/versions.json @@ -12,7 +12,7 @@ "version": "2.6.10" }, "2.7": { - "sha256": "d216d95190eaacf3bf165303747b02ff13f10b6cfab67a9031b502a49512b516", + "sha256": "54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24", "variants": [ "bullseye", "slim-bullseye", @@ -21,7 +21,7 @@ "alpine3.15", "alpine3.14" ], - "version": "2.7.5" + "version": "2.7.6" }, "3.0": { "sha256": "88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c", From dd1b1c9650fd9470edf8399abb2a746e597a821b Mon Sep 17 00:00:00 2001 From: ojab Date: Tue, 12 Apr 2022 13:48:32 +0000 Subject: [PATCH 327/462] Update 3.0 to 3.0.4 https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-0-4-released/ --- 3.0/alpine3.14/Dockerfile | 4 ++-- 3.0/alpine3.15/Dockerfile | 4 ++-- 3.0/bullseye/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/slim-bullseye/Dockerfile | 4 ++-- 3.0/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.14/Dockerfile index b98cf8d0eb..b66b643028 100644 --- a/3.0/alpine3.14/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.15/Dockerfile b/3.0/alpine3.15/Dockerfile index 8b6b485050..371dd78f3d 100644 --- a/3.0/alpine3.15/Dockerfile +++ b/3.0/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index abf6afadd0..2206e57c89 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 055579e476..103fa79cb2 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index b1e1e0531f..fa02252fe7 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index affbfd81a6..bd82a03aa1 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.3 -ENV RUBY_DOWNLOAD_SHA256 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +ENV RUBY_VERSION 3.0.4 +ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 6760db3fdc..758274a639 100644 --- a/versions.json +++ b/versions.json @@ -24,7 +24,7 @@ "version": "2.7.6" }, "3.0": { - "sha256": "88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c", + "sha256": "8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0", "variants": [ "bullseye", "slim-bullseye", @@ -33,7 +33,7 @@ "alpine3.15", "alpine3.14" ], - "version": "3.0.3" + "version": "3.0.4" }, "3.1": { "sha256": "7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa", From 6a100006eeb52ec06bfe3f318b401cdf5a52dd6b Mon Sep 17 00:00:00 2001 From: ojab Date: Tue, 12 Apr 2022 13:48:42 +0000 Subject: [PATCH 328/462] Update 3.1 to 3.1.2 https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-1-2-released/ --- 3.1/alpine3.14/Dockerfile | 4 ++-- 3.1/alpine3.15/Dockerfile | 4 ++-- 3.1/bullseye/Dockerfile | 4 ++-- 3.1/buster/Dockerfile | 4 ++-- 3.1/slim-bullseye/Dockerfile | 4 ++-- 3.1/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.1/alpine3.14/Dockerfile b/3.1/alpine3.14/Dockerfile index d7511ae05c..9828e46bb1 100644 --- a/3.1/alpine3.14/Dockerfile +++ b/3.1/alpine3.14/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/alpine3.15/Dockerfile b/3.1/alpine3.15/Dockerfile index 2b3d844f9e..83d8dd5108 100644 --- a/3.1/alpine3.15/Dockerfile +++ b/3.1/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index bd0b3c61ed..af220e1e93 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/buster/Dockerfile b/3.1/buster/Dockerfile index 3e50e5f324..fb2117e0bf 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 4e4def8cfb..532a5fd3a9 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile index 76d8c0533b..72a2db3172 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.1 -ENV RUBY_DOWNLOAD_SHA256 7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa +ENV RUBY_VERSION 3.1.2 +ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 758274a639..da753517c1 100644 --- a/versions.json +++ b/versions.json @@ -36,7 +36,7 @@ "version": "3.0.4" }, "3.1": { - "sha256": "7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa", + "sha256": "ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a", "variants": [ "bullseye", "slim-bullseye", @@ -45,7 +45,7 @@ "alpine3.15", "alpine3.14" ], - "version": "3.1.1" + "version": "3.1.2" }, "3.2-rc": { "sha256": "6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d", From ac24ae0a894606d3ac91c28095db39e69771cac4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 28 Apr 2022 14:52:33 -0700 Subject: [PATCH 329/462] Remove Ruby 2.6 (EOL) https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/ > After this release, Ruby 2.6 reaches EOL. In other words, this is expected to be the last release of Ruby 2.6 series. We will not release Ruby 2.6.11 even if a security vulnerability is found (but ocould release if a severe regression is found). We recommend all Ruby 2.6 users to start migration to Ruby 3.1, 3.0, or 2.7 immediately. --- 2.6/alpine3.14/Dockerfile | 147 ----------------------------------- 2.6/alpine3.15/Dockerfile | 147 ----------------------------------- 2.6/bullseye/Dockerfile | 95 ---------------------- 2.6/buster/Dockerfile | 95 ---------------------- 2.6/slim-bullseye/Dockerfile | 122 ----------------------------- 2.6/slim-buster/Dockerfile | 122 ----------------------------- Dockerfile.template | 15 ---- versions.json | 12 --- 8 files changed, 755 deletions(-) delete mode 100644 2.6/alpine3.14/Dockerfile delete mode 100644 2.6/alpine3.15/Dockerfile delete mode 100644 2.6/bullseye/Dockerfile delete mode 100644 2.6/buster/Dockerfile delete mode 100644 2.6/slim-bullseye/Dockerfile delete mode 100644 2.6/slim-buster/Dockerfile diff --git a/2.6/alpine3.14/Dockerfile b/2.6/alpine3.14/Dockerfile deleted file mode 100644 index ef56285904..0000000000 --- a/2.6/alpine3.14/Dockerfile +++ /dev/null @@ -1,147 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.14 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) -# https://github.com/ruby/ruby/pull/3773 - wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ - patch -p1 -i autoconf-2.70.patch; \ - rm autoconf-2.70.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.6/alpine3.15/Dockerfile b/2.6/alpine3.15/Dockerfile deleted file mode 100644 index d76852b045..0000000000 --- a/2.6/alpine3.15/Dockerfile +++ /dev/null @@ -1,147 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.15 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) -# https://github.com/ruby/ruby/pull/3773 - wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ - patch -p1 -i autoconf-2.70.patch; \ - rm autoconf-2.70.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.6/bullseye/Dockerfile b/2.6/bullseye/Dockerfile deleted file mode 100644 index de99cfb7cc..0000000000 --- a/2.6/bullseye/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile deleted file mode 100644 index 5b9b9d886b..0000000000 --- a/2.6/buster/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:buster - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.6/slim-bullseye/Dockerfile b/2.6/slim-bullseye/Dockerfile deleted file mode 100644 index 3a58f106ac..0000000000 --- a/2.6/slim-bullseye/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.6/slim-buster/Dockerfile b/2.6/slim-buster/Dockerfile deleted file mode 100644 index 55ab9aab84..0000000000 --- a/2.6/slim-buster/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:buster-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.6 -ENV RUBY_VERSION 2.6.10 -ENV RUBY_DOWNLOAD_SHA256 5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index e4e735838f..16e1b33e76 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -135,21 +135,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -{{ - { - "2.6": { - url: "https://github.com/ruby/ruby/pull/3773", - commit: "fcc88da5eb162043adcba552646677d2ab5adf55", - }, - }[env.version] | if . and env.variant != "alpine3.13" then ( --}} -# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails) -# {{ .url }} - wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \ - patch -p1 -i autoconf-2.70.patch; \ - rm autoconf-2.70.patch; \ - \ -{{ ) else "" end -}} # the configure script does not detect isnan/isinf as macros export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ \ diff --git a/versions.json b/versions.json index da753517c1..4ceff3b1e4 100644 --- a/versions.json +++ b/versions.json @@ -1,16 +1,4 @@ { - "2.6": { - "sha256": "5fd8ded51321b88fdc9c1b4b0eb1b951d2eddbc293865da0151612c2e814c1f2", - "variants": [ - "bullseye", - "slim-bullseye", - "buster", - "slim-buster", - "alpine3.15", - "alpine3.14" - ], - "version": "2.6.10" - }, "2.7": { "sha256": "54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24", "variants": [ From 4955e524a9a01f35979d7b7984a001fd563d5cfb Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 24 May 2022 19:51:05 +0200 Subject: [PATCH 330/462] Alpine 3.16 --- 2.7/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- 3.0/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- 3.1/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- 3.2-rc/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename 2.7/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 3.0/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 3.1/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 3.2-rc/{alpine3.14 => alpine3.16}/Dockerfile (99%) diff --git a/2.7/alpine3.14/Dockerfile b/2.7/alpine3.16/Dockerfile similarity index 99% rename from 2.7/alpine3.14/Dockerfile rename to 2.7/alpine3.16/Dockerfile index 06d7681497..e4919c389d 100644 --- a/2.7/alpine3.14/Dockerfile +++ b/2.7/alpine3.16/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 RUN set -eux; \ apk add --no-cache \ diff --git a/3.0/alpine3.14/Dockerfile b/3.0/alpine3.16/Dockerfile similarity index 99% rename from 3.0/alpine3.14/Dockerfile rename to 3.0/alpine3.16/Dockerfile index b66b643028..d7d4dad3cf 100644 --- a/3.0/alpine3.14/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 RUN set -eux; \ apk add --no-cache \ diff --git a/3.1/alpine3.14/Dockerfile b/3.1/alpine3.16/Dockerfile similarity index 99% rename from 3.1/alpine3.14/Dockerfile rename to 3.1/alpine3.16/Dockerfile index 9828e46bb1..90d80ebe9b 100644 --- a/3.1/alpine3.14/Dockerfile +++ b/3.1/alpine3.16/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2-rc/alpine3.14/Dockerfile b/3.2-rc/alpine3.16/Dockerfile similarity index 99% rename from 3.2-rc/alpine3.14/Dockerfile rename to 3.2-rc/alpine3.16/Dockerfile index 9308e92923..82482d00b4 100644 --- a/3.2-rc/alpine3.14/Dockerfile +++ b/3.2-rc/alpine3.16/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.16 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index 4ceff3b1e4..84f4cf3833 100644 --- a/versions.json +++ b/versions.json @@ -6,8 +6,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.15", - "alpine3.14" + "alpine3.16", + "alpine3.15" ], "version": "2.7.6" }, @@ -18,8 +18,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.15", - "alpine3.14" + "alpine3.16", + "alpine3.15" ], "version": "3.0.4" }, @@ -30,8 +30,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.15", - "alpine3.14" + "alpine3.16", + "alpine3.15" ], "version": "3.1.2" }, @@ -42,8 +42,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.15", - "alpine3.14" + "alpine3.16", + "alpine3.15" ], "version": "3.2.0-preview1" } diff --git a/versions.sh b/versions.sh index 5e217eead5..f9acdb8f65 100755 --- a/versions.sh +++ b/versions.sh @@ -72,8 +72,8 @@ for version in "${versions[@]}"; do "buster" | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - "3.15", - "3.14" + "3.16", + "3.15" | "alpine" + .) ], } From c971cc83feeabdb59c6e634d81212621645ca786 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Jul 2022 17:16:45 -0700 Subject: [PATCH 331/462] Update jq-template for speed improvements --- apply-templates.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apply-templates.sh b/apply-templates.sh index 9e27242306..7f9da43e19 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -7,8 +7,8 @@ jqt='.jq-template.awk' if [ -n "${BASHBREW_SCRIPTS:-}" ]; then jqt="$BASHBREW_SCRIPTS/jq-template.awk" elif [ "$BASH_SOURCE" -nt "$jqt" ]; then - # # https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk - wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/00e281f36edd19f52541a6ba2f215cc3c4645128/scripts/jq-template.awk' + # https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk + wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk' fi if [ "$#" -eq 0 ]; then From 41208aad6764925f0f082a695a076f7f39af1233 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 8 Sep 2022 22:03:21 -0700 Subject: [PATCH 332/462] Update 3.2-rc to 3.2.0-preview2 --- 3.2-rc/alpine3.15/Dockerfile | 4 ++-- 3.2-rc/alpine3.16/Dockerfile | 4 ++-- 3.2-rc/bullseye/Dockerfile | 4 ++-- 3.2-rc/buster/Dockerfile | 4 ++-- 3.2-rc/slim-bullseye/Dockerfile | 4 ++-- 3.2-rc/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.2-rc/alpine3.15/Dockerfile b/3.2-rc/alpine3.15/Dockerfile index 39109499b5..abb995a7f4 100644 --- a/3.2-rc/alpine3.15/Dockerfile +++ b/3.2-rc/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/alpine3.16/Dockerfile b/3.2-rc/alpine3.16/Dockerfile index 82482d00b4..6cd50c5de9 100644 --- a/3.2-rc/alpine3.16/Dockerfile +++ b/3.2-rc/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/bullseye/Dockerfile b/3.2-rc/bullseye/Dockerfile index 6166e0bb2b..5467052f0d 100644 --- a/3.2-rc/bullseye/Dockerfile +++ b/3.2-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/buster/Dockerfile b/3.2-rc/buster/Dockerfile index 5f8132f1a2..d086c714d8 100644 --- a/3.2-rc/buster/Dockerfile +++ b/3.2-rc/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-bullseye/Dockerfile b/3.2-rc/slim-bullseye/Dockerfile index 8d930aa879..9edcc8d2cf 100644 --- a/3.2-rc/slim-bullseye/Dockerfile +++ b/3.2-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-buster/Dockerfile b/3.2-rc/slim-buster/Dockerfile index 18628c2350..95067dd15e 100644 --- a/3.2-rc/slim-buster/Dockerfile +++ b/3.2-rc/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d +ENV RUBY_VERSION 3.2.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 84f4cf3833..add181c813 100644 --- a/versions.json +++ b/versions.json @@ -36,7 +36,7 @@ "version": "3.1.2" }, "3.2-rc": { - "sha256": "6d28477f7fa626b63bf139afd37bcfeb28fce6847b203fa10f37cb3615d0c35d", + "sha256": "01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430", "variants": [ "bullseye", "slim-bullseye", @@ -45,6 +45,6 @@ "alpine3.16", "alpine3.15" ], - "version": "3.2.0-preview1" + "version": "3.2.0-preview2" } } From 0c1ef530a2ba1e581d52adb7eacc1ff7baef0d7d Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 14 Oct 2022 17:29:23 -0700 Subject: [PATCH 333/462] Switch to "$GITHUB_OUTPUT"; update actions/checkout to v3 - https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands - https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-output-parameter --- .github/workflows/ci.yml | 6 +++--- .github/workflows/verify-templating.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 155ef3165b..e105455ad3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - id: generate-jobs name: Generate Jobs run: | git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + echo "strategy=$strategy" >> "$GITHUB_OUTPUT" jq . <<<"$strategy" # sanity check / debugging aid - echo "::set-output name=strategy::$strategy" test: needs: generate-jobs @@ -33,7 +33,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Pull Dependencies diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 7e833f1c7d..14497bec68 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -13,7 +13,7 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Apply Templates run: ./apply-templates.sh - name: Check Git Status From 09ae96ae70997acb44bac52df46e015755b228e1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Nov 2022 10:03:26 -0800 Subject: [PATCH 334/462] Update 3.2-rc to 3.2.0-preview3 --- 3.2-rc/alpine3.15/Dockerfile | 4 ++-- 3.2-rc/alpine3.16/Dockerfile | 4 ++-- 3.2-rc/bullseye/Dockerfile | 4 ++-- 3.2-rc/buster/Dockerfile | 4 ++-- 3.2-rc/slim-bullseye/Dockerfile | 4 ++-- 3.2-rc/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.2-rc/alpine3.15/Dockerfile b/3.2-rc/alpine3.15/Dockerfile index abb995a7f4..42d8525072 100644 --- a/3.2-rc/alpine3.15/Dockerfile +++ b/3.2-rc/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/alpine3.16/Dockerfile b/3.2-rc/alpine3.16/Dockerfile index 6cd50c5de9..08f210edad 100644 --- a/3.2-rc/alpine3.16/Dockerfile +++ b/3.2-rc/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/bullseye/Dockerfile b/3.2-rc/bullseye/Dockerfile index 5467052f0d..e35691bd6d 100644 --- a/3.2-rc/bullseye/Dockerfile +++ b/3.2-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/buster/Dockerfile b/3.2-rc/buster/Dockerfile index d086c714d8..0e56c9f41a 100644 --- a/3.2-rc/buster/Dockerfile +++ b/3.2-rc/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-bullseye/Dockerfile b/3.2-rc/slim-bullseye/Dockerfile index 9edcc8d2cf..0ef6942ad1 100644 --- a/3.2-rc/slim-bullseye/Dockerfile +++ b/3.2-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-buster/Dockerfile b/3.2-rc/slim-buster/Dockerfile index 95067dd15e..4267fd30b7 100644 --- a/3.2-rc/slim-buster/Dockerfile +++ b/3.2-rc/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430 +ENV RUBY_VERSION 3.2.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index add181c813..266e2e7415 100644 --- a/versions.json +++ b/versions.json @@ -36,7 +36,7 @@ "version": "3.1.2" }, "3.2-rc": { - "sha256": "01fac0929dccdabc0686c1109da6c187897a401da9ff8851242befa92f7fd430", + "sha256": "d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb", "variants": [ "bullseye", "slim-bullseye", @@ -45,6 +45,6 @@ "alpine3.16", "alpine3.15" ], - "version": "3.2.0-preview2" + "version": "3.2.0-preview3" } } From e599270ec9b1d294c7be016ee50e9c848b6fbc68 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Nov 2022 14:13:58 -0800 Subject: [PATCH 335/462] Use new "bashbrew" composite action --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e105455ad3..3860c115ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,11 @@ jobs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - uses: actions/checkout@v3 + - uses: docker-library/bashbrew@HEAD - id: generate-jobs name: Generate Jobs run: | - git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew - strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")" echo "strategy=$strategy" >> "$GITHUB_OUTPUT" jq . <<<"$strategy" # sanity check / debugging aid From e62fa125015a658f81ad930ae154b37fcd0059a8 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Nov 2022 15:36:38 -0800 Subject: [PATCH 336/462] Add YJIT support to 3.2+ where we have new enough Rust (specifically, Rust 1.58.1+, currently only Alpine) Co-authored-by: Sean Dilda --- 3.2-rc/alpine3.16/Dockerfile | 7 +++++++ Dockerfile.template | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/3.2-rc/alpine3.16/Dockerfile b/3.2-rc/alpine3.16/Dockerfile index 08f210edad..3f33acf441 100644 --- a/3.2-rc/alpine3.16/Dockerfile +++ b/3.2-rc/alpine3.16/Dockerfile @@ -34,6 +34,11 @@ ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed0 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + x86_64 | aarch64) yjit=1 ;; \ + esac; \ # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -64,6 +69,7 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ + ${yjit:+rust} \ ; \ \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ @@ -101,6 +107,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/Dockerfile.template b/Dockerfile.template index 16e1b33e76..e610059eca 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -4,6 +4,11 @@ ; def is_slim: env.variant | startswith("slim-") + ; + def should_yjit: + # https://github.com/docker-library/ruby/issues/390 + ([ "2.7", "3.0", "3.1" ] | index(env.version) | not) + and is_alpine and ([ "alpine3.15" ] | index(env.variant) | not) -}} {{ if is_alpine then ( -}} FROM alpine:{{ env.variant | ltrimstr("alpine") }} @@ -59,6 +64,13 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }} RUN set -eux; \ \ {{ if is_alpine then ( -}} +{{ if should_yjit then ( -}} + yjit=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + x86_64 | aarch64) yjit=1 ;; \ + esac; \ +{{ ) else "" end -}} # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -89,6 +101,9 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ +{{ if should_yjit then ( -}} + ${yjit:+rust} \ +{{ ) else "" end -}} ; \ {{ ) else ( -}} savedAptMark="$(apt-mark showmanual)"; \ @@ -152,7 +167,9 @@ RUN set -eux; \ {{ if is_alpine and ( [ "2.7", "3.0" ] | index(env.version) ) then ( -}} # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 +{{ if should_yjit then "" else ( -}} apkArch="$(apk --print-arch)"; \ +{{ ) end -}} case "$apkArch" in \ s390x | armhf | armv7) \ apk add --no-cache libucontext-dev; \ @@ -165,6 +182,9 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ +{{ if should_yjit then ( -}} + ${yjit:+--enable-yjit} \ +{{ ) else "" end -}} ; \ make -j "$(nproc)"; \ make install; \ From cdac1ffbc959768a5b82014dbb8c8006fe6f7880 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Nov 2022 10:03:11 -0800 Subject: [PATCH 337/462] Update 2.7 to 2.7.7 --- 2.7/alpine3.15/Dockerfile | 4 ++-- 2.7/alpine3.16/Dockerfile | 4 ++-- 2.7/bullseye/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/slim-bullseye/Dockerfile | 4 ++-- 2.7/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/2.7/alpine3.15/Dockerfile b/2.7/alpine3.15/Dockerfile index d5c5a4e8ac..3857033f20 100644 --- a/2.7/alpine3.15/Dockerfile +++ b/2.7/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/alpine3.16/Dockerfile b/2.7/alpine3.16/Dockerfile index e4919c389d..2d92dcfa03 100644 --- a/2.7/alpine3.16/Dockerfile +++ b/2.7/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index a6b894c534..22b3671ea3 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 9e141d82e3..db7f47eaec 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index 0e43a71fb4..d51e8791f9 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index 9770c4cf19..4cd26b9511 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.6 -ENV RUBY_DOWNLOAD_SHA256 54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24 +ENV RUBY_VERSION 2.7.7 +ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 266e2e7415..68b275c019 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "2.7": { - "sha256": "54dcd3044726c4ab75a9d4604720501442b229a3aed6a55fe909567da8807f24", + "sha256": "b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c", "variants": [ "bullseye", "slim-bullseye", @@ -9,7 +9,7 @@ "alpine3.16", "alpine3.15" ], - "version": "2.7.6" + "version": "2.7.7" }, "3.0": { "sha256": "8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0", From ece6f45d6d00b803a4e1a33cd5a55895cf928357 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Nov 2022 10:27:27 -0800 Subject: [PATCH 338/462] Update 3.0 to 3.0.5 --- 3.0/alpine3.15/Dockerfile | 4 ++-- 3.0/alpine3.16/Dockerfile | 4 ++-- 3.0/bullseye/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/slim-bullseye/Dockerfile | 4 ++-- 3.0/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.0/alpine3.15/Dockerfile b/3.0/alpine3.15/Dockerfile index 371dd78f3d..9538118c4c 100644 --- a/3.0/alpine3.15/Dockerfile +++ b/3.0/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index d7d4dad3cf..56188367b7 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index 2206e57c89..5d067bbf1f 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 103fa79cb2..c1f977d2d8 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index fa02252fe7..95b513debd 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index bd82a03aa1..d4d05c859b 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.4 -ENV RUBY_DOWNLOAD_SHA256 8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0 +ENV RUBY_VERSION 3.0.5 +ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 68b275c019..57e2fd8e01 100644 --- a/versions.json +++ b/versions.json @@ -12,7 +12,7 @@ "version": "2.7.7" }, "3.0": { - "sha256": "8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0", + "sha256": "cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde", "variants": [ "bullseye", "slim-bullseye", @@ -21,7 +21,7 @@ "alpine3.16", "alpine3.15" ], - "version": "3.0.4" + "version": "3.0.5" }, "3.1": { "sha256": "ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a", From 9fd589661dd0e12b082336e9c6f731196fe39ba8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Nov 2022 10:55:53 -0800 Subject: [PATCH 339/462] Update 3.1 to 3.1.3 --- 3.1/alpine3.15/Dockerfile | 4 ++-- 3.1/alpine3.16/Dockerfile | 4 ++-- 3.1/bullseye/Dockerfile | 4 ++-- 3.1/buster/Dockerfile | 4 ++-- 3.1/slim-bullseye/Dockerfile | 4 ++-- 3.1/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.1/alpine3.15/Dockerfile b/3.1/alpine3.15/Dockerfile index 83d8dd5108..f1e66c6d4e 100644 --- a/3.1/alpine3.15/Dockerfile +++ b/3.1/alpine3.15/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/alpine3.16/Dockerfile b/3.1/alpine3.16/Dockerfile index 90d80ebe9b..2811b3387c 100644 --- a/3.1/alpine3.16/Dockerfile +++ b/3.1/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index af220e1e93..79712fb215 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/buster/Dockerfile b/3.1/buster/Dockerfile index fb2117e0bf..bc62c904dd 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 532a5fd3a9..ad79427e5c 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile index 72a2db3172..fe07c7d19e 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.2 -ENV RUBY_DOWNLOAD_SHA256 ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +ENV RUBY_VERSION 3.1.3 +ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 57e2fd8e01..d5ad7032cf 100644 --- a/versions.json +++ b/versions.json @@ -24,7 +24,7 @@ "version": "3.0.5" }, "3.1": { - "sha256": "ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a", + "sha256": "4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a", "variants": [ "bullseye", "slim-bullseye", @@ -33,7 +33,7 @@ "alpine3.16", "alpine3.15" ], - "version": "3.1.2" + "version": "3.1.3" }, "3.2-rc": { "sha256": "d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb", From a51b7da07425cc2f5a35178ef83fd908b59beb5d Mon Sep 17 00:00:00 2001 From: Earlopain Date: Tue, 29 Nov 2022 08:38:45 +0100 Subject: [PATCH 340/462] Add Alpine 3.17 --- 2.7/alpine3.15/Dockerfile | 150 ------------------- 3.0/alpine3.15/Dockerfile | 150 ------------------- 3.1/{alpine3.15 => alpine3.17}/Dockerfile | 2 +- 3.2-rc/{alpine3.15 => alpine3.17}/Dockerfile | 9 +- Dockerfile.template | 2 +- versions.json | 14 +- versions.sh | 12 +- 7 files changed, 26 insertions(+), 313 deletions(-) delete mode 100644 2.7/alpine3.15/Dockerfile delete mode 100644 3.0/alpine3.15/Dockerfile rename 3.1/{alpine3.15 => alpine3.17}/Dockerfile (99%) rename 3.2-rc/{alpine3.15 => alpine3.17}/Dockerfile (95%) diff --git a/2.7/alpine3.15/Dockerfile b/2.7/alpine3.15/Dockerfile deleted file mode 100644 index 3857033f20..0000000000 --- a/2.7/alpine3.15/Dockerfile +++ /dev/null @@ -1,150 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.15 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 - # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - s390x | armhf | armv7) \ - apk add --no-cache libucontext-dev; \ - export LIBS='-lucontext'; \ - ;; \ - esac; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.0/alpine3.15/Dockerfile b/3.0/alpine3.15/Dockerfile deleted file mode 100644 index 9538118c4c..0000000000 --- a/3.0/alpine3.15/Dockerfile +++ /dev/null @@ -1,150 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.15 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 - # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - s390x | armhf | armv7) \ - apk add --no-cache libucontext-dev; \ - export LIBS='-lucontext'; \ - ;; \ - esac; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/alpine3.15/Dockerfile b/3.1/alpine3.17/Dockerfile similarity index 99% rename from 3.1/alpine3.15/Dockerfile rename to 3.1/alpine3.17/Dockerfile index f1e66c6d4e..7d20cedb70 100644 --- a/3.1/alpine3.15/Dockerfile +++ b/3.1/alpine3.17/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.15 +FROM alpine:3.17 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2-rc/alpine3.15/Dockerfile b/3.2-rc/alpine3.17/Dockerfile similarity index 95% rename from 3.2-rc/alpine3.15/Dockerfile rename to 3.2-rc/alpine3.17/Dockerfile index 42d8525072..9686f93238 100644 --- a/3.2-rc/alpine3.15/Dockerfile +++ b/3.2-rc/alpine3.17/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.15 +FROM alpine:3.17 RUN set -eux; \ apk add --no-cache \ @@ -34,6 +34,11 @@ ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed0 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + x86_64 | aarch64) yjit=1 ;; \ + esac; \ # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -64,6 +69,7 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ + ${yjit:+rust} \ ; \ \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ @@ -101,6 +107,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/Dockerfile.template b/Dockerfile.template index e610059eca..880accf871 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -8,7 +8,7 @@ def should_yjit: # https://github.com/docker-library/ruby/issues/390 ([ "2.7", "3.0", "3.1" ] | index(env.version) | not) - and is_alpine and ([ "alpine3.15" ] | index(env.variant) | not) + and is_alpine -}} {{ if is_alpine then ( -}} FROM alpine:{{ env.variant | ltrimstr("alpine") }} diff --git a/versions.json b/versions.json index d5ad7032cf..21c4c89575 100644 --- a/versions.json +++ b/versions.json @@ -6,8 +6,7 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.16", - "alpine3.15" + "alpine3.16" ], "version": "2.7.7" }, @@ -18,8 +17,7 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.16", - "alpine3.15" + "alpine3.16" ], "version": "3.0.5" }, @@ -30,8 +28,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.16", - "alpine3.15" + "alpine3.17", + "alpine3.16" ], "version": "3.1.3" }, @@ -42,8 +40,8 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.16", - "alpine3.15" + "alpine3.17", + "alpine3.16" ], "version": "3.2.0-preview3" } diff --git a/versions.sh b/versions.sh index f9acdb8f65..4e9eab52f8 100755 --- a/versions.sh +++ b/versions.sh @@ -69,11 +69,19 @@ for version in "${versions[@]}"; do variants: [ ( "bullseye", - "buster" + "buster", + empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + # Alpine 3.17 defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0 + # https://bugs.ruby-lang.org/issues/18658 + # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 + if [ "2.7", "3.0" ] | index(env.version) then empty else + "3.17", + empty # trailing comma hack + end, "3.16", - "3.15" + empty # trailing comma hack | "alpine" + .) ], } From b07fd2e538ec3aedbaedd267e4f75a4d89b0565a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Dec 2022 04:03:23 -0800 Subject: [PATCH 341/462] Update 3.2-rc to 3.2.0-rc1 --- 3.2-rc/alpine3.16/Dockerfile | 4 ++-- 3.2-rc/alpine3.17/Dockerfile | 4 ++-- 3.2-rc/bullseye/Dockerfile | 4 ++-- 3.2-rc/buster/Dockerfile | 4 ++-- 3.2-rc/slim-bullseye/Dockerfile | 4 ++-- 3.2-rc/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.2-rc/alpine3.16/Dockerfile b/3.2-rc/alpine3.16/Dockerfile index 3f33acf441..e9bad2fb26 100644 --- a/3.2-rc/alpine3.16/Dockerfile +++ b/3.2-rc/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/alpine3.17/Dockerfile b/3.2-rc/alpine3.17/Dockerfile index 9686f93238..a7c04069e0 100644 --- a/3.2-rc/alpine3.17/Dockerfile +++ b/3.2-rc/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/bullseye/Dockerfile b/3.2-rc/bullseye/Dockerfile index e35691bd6d..11024da8a3 100644 --- a/3.2-rc/bullseye/Dockerfile +++ b/3.2-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/buster/Dockerfile b/3.2-rc/buster/Dockerfile index 0e56c9f41a..59b70492cf 100644 --- a/3.2-rc/buster/Dockerfile +++ b/3.2-rc/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-bullseye/Dockerfile b/3.2-rc/slim-bullseye/Dockerfile index 0ef6942ad1..d650f574ba 100644 --- a/3.2-rc/slim-bullseye/Dockerfile +++ b/3.2-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-buster/Dockerfile b/3.2-rc/slim-buster/Dockerfile index 4267fd30b7..d1a8a9118c 100644 --- a/3.2-rc/slim-buster/Dockerfile +++ b/3.2-rc/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb +ENV RUBY_VERSION 3.2.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 21c4c89575..26633fd161 100644 --- a/versions.json +++ b/versions.json @@ -34,7 +34,7 @@ "version": "3.1.3" }, "3.2-rc": { - "sha256": "d3f5619de544240d92a5d03aa289e71bd1103379622c523a0e80ed029a74b3bb", + "sha256": "0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc", "variants": [ "bullseye", "slim-bullseye", @@ -43,6 +43,6 @@ "alpine3.17", "alpine3.16" ], - "version": "3.2.0-preview3" + "version": "3.2.0-rc1" } } From 9b27face61a92f7e77c069fae18abeb55aca3a90 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 20 Dec 2022 14:24:04 -0800 Subject: [PATCH 342/462] Update generated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d77a68e19e..43c76b2f9c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For outstanding `ruby` image PRs, check [PRs with the "library/ruby" label on th --- -- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/ruby/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/ruby/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/github/actions/workflow/status/docker-library/ruby/ci.yml?branch=master&label=GitHub%20CI)](https://github.com/docker-library/ruby/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) - [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/ruby.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby/) | Build | Status | Badges | (per-arch) | From 8ea8c4000c5005771efc9ce34931763d191462cb Mon Sep 17 00:00:00 2001 From: Frederik Spang Thomsen Date: Sun, 25 Dec 2022 17:29:39 +0100 Subject: [PATCH 343/462] Update 3.2.0-rc to 3.2.0 --- {3.2-rc => 3.2}/alpine3.16/Dockerfile | 6 +++--- {3.2-rc => 3.2}/alpine3.17/Dockerfile | 6 +++--- {3.2-rc => 3.2}/bullseye/Dockerfile | 6 +++--- {3.2-rc => 3.2}/buster/Dockerfile | 6 +++--- {3.2-rc => 3.2}/slim-bullseye/Dockerfile | 6 +++--- {3.2-rc => 3.2}/slim-buster/Dockerfile | 6 +++--- versions.json | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) rename {3.2-rc => 3.2}/alpine3.16/Dockerfile (96%) rename {3.2-rc => 3.2}/alpine3.17/Dockerfile (96%) rename {3.2-rc => 3.2}/bullseye/Dockerfile (94%) rename {3.2-rc => 3.2}/buster/Dockerfile (94%) rename {3.2-rc => 3.2}/slim-bullseye/Dockerfile (95%) rename {3.2-rc => 3.2}/slim-buster/Dockerfile (95%) diff --git a/3.2-rc/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile similarity index 96% rename from 3.2-rc/alpine3.16/Dockerfile rename to 3.2/alpine3.16/Dockerfile index e9bad2fb26..fcfdd5ba43 100644 --- a/3.2-rc/alpine3.16/Dockerfile +++ b/3.2/alpine3.16/Dockerfile @@ -26,9 +26,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile similarity index 96% rename from 3.2-rc/alpine3.17/Dockerfile rename to 3.2/alpine3.17/Dockerfile index a7c04069e0..da11b7a6ef 100644 --- a/3.2-rc/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -26,9 +26,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/bullseye/Dockerfile b/3.2/bullseye/Dockerfile similarity index 94% rename from 3.2-rc/bullseye/Dockerfile rename to 3.2/bullseye/Dockerfile index 11024da8a3..5761eaf178 100644 --- a/3.2-rc/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -15,9 +15,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/buster/Dockerfile b/3.2/buster/Dockerfile similarity index 94% rename from 3.2-rc/buster/Dockerfile rename to 3.2/buster/Dockerfile index 59b70492cf..36954f6d3e 100644 --- a/3.2-rc/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -15,9 +15,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile similarity index 95% rename from 3.2-rc/slim-bullseye/Dockerfile rename to 3.2/slim-bullseye/Dockerfile index d650f574ba..44034d9c07 100644 --- a/3.2-rc/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -29,9 +29,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2-rc/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile similarity index 95% rename from 3.2-rc/slim-buster/Dockerfile rename to 3.2/slim-buster/Dockerfile index d1a8a9118c..f8e31415b5 100644 --- a/3.2-rc/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -29,9 +29,9 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2-rc -ENV RUBY_VERSION 3.2.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.0 +ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 26633fd161..0558be8c8b 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ ], "version": "3.1.3" }, - "3.2-rc": { - "sha256": "0d45b3af14e84337882a2021235a091ae5dcfc0baaf31dccc479b71d96dd07bc", + "3.2": { + "sha256": "d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4", "variants": [ "bullseye", "slim-bullseye", @@ -43,6 +43,6 @@ "alpine3.17", "alpine3.16" ], - "version": "3.2.0-rc1" + "version": "3.2.0" } } From 2ffc9e1fded12441017a163acf40e7192dbc769c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 27 Dec 2022 08:25:29 -0800 Subject: [PATCH 344/462] Update latest to 3.2 (now GA) --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a98da9227e..23f8629606 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [3.1]='3 latest' + [3.2]='3 latest' [2.7]='2' ) From 4edf68428aa1295b9a2cd81a5de06d656cc10fb4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2023 09:45:23 -0800 Subject: [PATCH 345/462] Ditch "tac|tac" for more reliable scraping --- versions.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/versions.sh b/versions.sh index 4e9eab52f8..83bc00d7bb 100755 --- a/versions.sh +++ b/versions.sh @@ -38,15 +38,17 @@ for version in "${versions[@]}"; do if \ { versionReleasePage="$(grep "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ - && [ "$versionReleasePage" ] \ - && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" |tac|tac| grep "ruby-$tryVersion.tar.xz" -A 5 | awk '$1 == "SHA256:" { print $2; exit }')" \ - && [ "$shaVal" ] + && [ -n "$versionReleasePage" ] \ + && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \ + && shaVal="$(awk <<<"$shaVal" '$1 == "SHA256:" { print $2; exit }')" \ + && [ -n "$shaVal" ] } \ ; then fullVersion="$tryVersion" From 6db728e589d2e7a34fe3f0bdb454c3303680712d Mon Sep 17 00:00:00 2001 From: paihu Date: Wed, 28 Dec 2022 19:23:06 +0900 Subject: [PATCH 346/462] Add YJIT support to debian 3.2+ --- 3.2/bullseye/Dockerfile | 24 ++++++++++++++++++++++++ 3.2/buster/Dockerfile | 24 ++++++++++++++++++++++++ 3.2/slim-bullseye/Dockerfile | 24 ++++++++++++++++++++++++ 3.2/slim-buster/Dockerfile | 24 ++++++++++++++++++++++++ Dockerfile.template | 30 +++++++++++++++++++++++++++++- 5 files changed, 125 insertions(+), 1 deletion(-) diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 5761eaf178..c437802ac5 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -23,6 +23,17 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + debArch="$(uname -m)"; \ + \ + export RUSTUP_HOME=/tmp/rustup; \ + export CARGO_HOME=/tmp/cargo; \ + PATH=$CARGO_HOME/bin:$PATH; \ + rustArch=${debArch}-unknown-linux-gnu; \ + case "$debArch" in \ + x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ + esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -33,6 +44,16 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ + case "$yjit" in \ + 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ + echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + cargo --version; \ + rustc --version ;; \ + esac; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -57,6 +78,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ @@ -73,6 +95,8 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf $RUSTUP_HOME; \ + rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/buster/Dockerfile b/3.2/buster/Dockerfile index 36954f6d3e..42a331ab48 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -23,6 +23,17 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + debArch="$(uname -m)"; \ + \ + export RUSTUP_HOME=/tmp/rustup; \ + export CARGO_HOME=/tmp/cargo; \ + PATH=$CARGO_HOME/bin:$PATH; \ + rustArch=${debArch}-unknown-linux-gnu; \ + case "$debArch" in \ + x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ + esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -33,6 +44,16 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ + case "$yjit" in \ + 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ + echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + cargo --version; \ + rustc --version ;; \ + esac; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -57,6 +78,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ @@ -73,6 +95,8 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf $RUSTUP_HOME; \ + rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 44034d9c07..aef9b35c06 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -37,6 +37,17 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + debArch="$(uname -m)"; \ + \ + export RUSTUP_HOME=/tmp/rustup; \ + export CARGO_HOME=/tmp/cargo; \ + PATH=$CARGO_HOME/bin:$PATH; \ + rustArch=${debArch}-unknown-linux-gnu; \ + case "$debArch" in \ + x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ + esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -60,6 +71,16 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ + case "$yjit" in \ + 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ + echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + cargo --version; \ + rustc --version ;; \ + esac; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -84,6 +105,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ @@ -100,6 +122,8 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf $RUSTUP_HOME; \ + rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile index f8e31415b5..fcd5e40246 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -37,6 +37,17 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ + yjit=; \ + debArch="$(uname -m)"; \ + \ + export RUSTUP_HOME=/tmp/rustup; \ + export CARGO_HOME=/tmp/cargo; \ + PATH=$CARGO_HOME/bin:$PATH; \ + rustArch=${debArch}-unknown-linux-gnu; \ + case "$debArch" in \ + x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ + esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -60,6 +71,16 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ + case "$yjit" in \ + 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ + echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + cargo --version; \ + rustc --version ;; \ + esac; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -84,6 +105,7 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ + ${yjit:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ @@ -100,6 +122,8 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf $RUSTUP_HOME; \ + rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/Dockerfile.template b/Dockerfile.template index 880accf871..2ac6f41b4f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -8,7 +8,6 @@ def should_yjit: # https://github.com/docker-library/ruby/issues/390 ([ "2.7", "3.0", "3.1" ] | index(env.version) | not) - and is_alpine -}} {{ if is_alpine then ( -}} FROM alpine:{{ env.variant | ltrimstr("alpine") }} @@ -106,6 +105,19 @@ RUN set -eux; \ {{ ) else "" end -}} ; \ {{ ) else ( -}} +{{ if should_yjit then ( -}} + yjit=; \ + debArch="$(uname -m)"; \ + \ + export RUSTUP_HOME=/tmp/rustup; \ + export CARGO_HOME=/tmp/cargo; \ + PATH=$CARGO_HOME/bin:$PATH; \ + rustArch=${debArch}-unknown-linux-gnu; \ + case "$debArch" in \ + x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ + esac; \ +{{ ) else "" end -}} savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -130,6 +142,18 @@ RUN set -eux; \ {{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/*; \ +{{ if should_yjit then ( -}} + \ + case "$yjit" in \ + 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ + echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ + chmod +x rustup-init; \ + ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ + rm rustup-init; \ + cargo --version; \ + rustc --version ;; \ + esac; \ +{{ ) else "" end -}} {{ ) end -}} \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ @@ -211,6 +235,10 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ +{{ if should_yjit then ( -}} + rm -rf $RUSTUP_HOME; \ + rm -rf $CARGO_HOME; \ +{{ ) else "" end -}} {{ ) end -}} \ cd /; \ From c756b06f8cc771fb54f629d51217aa1802ba6ec2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 9 Jan 2023 10:17:45 -0800 Subject: [PATCH 347/462] Refactor to pull Rust version/checksum information from versions.json This also creates a separate "rust.json" so we don't update Rust versions automatically but do have a simple way to do so (especially without having to update checksums by hand). --- 3.2/alpine3.16/Dockerfile | 31 +++++++-- 3.2/alpine3.17/Dockerfile | 31 +++++++-- 3.2/bullseye/Dockerfile | 44 ++++++------- 3.2/buster/Dockerfile | 44 ++++++------- 3.2/slim-bullseye/Dockerfile | 44 ++++++------- 3.2/slim-buster/Dockerfile | 44 ++++++------- Dockerfile.template | 121 ++++++++++++++++++++++------------- rust.json | 83 ++++++++++++++++++++++++ rust.sh | 92 ++++++++++++++++++++++++++ versions.json | 32 +++++++++ versions.sh | 23 ++++++- 11 files changed, 439 insertions(+), 150 deletions(-) create mode 100644 rust.json create mode 100755 rust.sh diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile index fcfdd5ba43..ca886ac777 100644 --- a/3.2/alpine3.16/Dockerfile +++ b/3.2/alpine3.16/Dockerfile @@ -34,11 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - x86_64 | aarch64) yjit=1 ;; \ - esac; \ # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -69,9 +64,30 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ - ${yjit:+rust} \ ; \ \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -107,11 +123,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile index da11b7a6ef..5c03dd4bcd 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -34,11 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - x86_64 | aarch64) yjit=1 ;; \ - esac; \ # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -69,9 +64,30 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ - ${yjit:+rust} \ ; \ \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -107,11 +123,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ | tr ',' '\n' \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index c437802ac5..1a7c5cdd11 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -23,17 +23,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - debArch="$(uname -m)"; \ - \ - export RUSTUP_HOME=/tmp/rustup; \ - export CARGO_HOME=/tmp/cargo; \ - PATH=$CARGO_HOME/bin:$PATH; \ - rustArch=${debArch}-unknown-linux-gnu; \ - case "$debArch" in \ - x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ - esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -44,16 +33,28 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - case "$yjit" in \ - 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ - echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - cargo --version; \ - rustc --version ;; \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ esac; \ \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -78,11 +79,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ @@ -95,8 +97,6 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf $RUSTUP_HOME; \ - rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/buster/Dockerfile b/3.2/buster/Dockerfile index 42a331ab48..3d2bddab10 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -23,17 +23,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - debArch="$(uname -m)"; \ - \ - export RUSTUP_HOME=/tmp/rustup; \ - export CARGO_HOME=/tmp/cargo; \ - PATH=$CARGO_HOME/bin:$PATH; \ - rustArch=${debArch}-unknown-linux-gnu; \ - case "$debArch" in \ - x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ - esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -44,16 +33,28 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - case "$yjit" in \ - 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ - echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - cargo --version; \ - rustc --version ;; \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ esac; \ \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -78,11 +79,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ @@ -95,8 +97,6 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf $RUSTUP_HOME; \ - rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index aef9b35c06..a1751e5349 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -37,17 +37,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - debArch="$(uname -m)"; \ - \ - export RUSTUP_HOME=/tmp/rustup; \ - export CARGO_HOME=/tmp/cargo; \ - PATH=$CARGO_HOME/bin:$PATH; \ - rustArch=${debArch}-unknown-linux-gnu; \ - case "$debArch" in \ - x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ - esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -71,16 +60,28 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - case "$yjit" in \ - 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ - echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - cargo --version; \ - rustc --version ;; \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ esac; \ \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -105,11 +106,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ @@ -122,8 +124,6 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf $RUSTUP_HOME; \ - rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile index fcd5e40246..fa6566b4f2 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -37,17 +37,6 @@ ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ - yjit=; \ - debArch="$(uname -m)"; \ - \ - export RUSTUP_HOME=/tmp/rustup; \ - export CARGO_HOME=/tmp/cargo; \ - PATH=$CARGO_HOME/bin:$PATH; \ - rustArch=${debArch}-unknown-linux-gnu; \ - case "$debArch" in \ - x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ - esac; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -71,16 +60,28 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - case "$yjit" in \ - 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ - echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - cargo --version; \ - rustc --version ;; \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ esac; \ \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ @@ -105,11 +106,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ - ${yjit:+--enable-yjit} \ + ${rustArch:+--enable-yjit} \ ; \ make -j "$(nproc)"; \ make install; \ \ + rm -rf /tmp/rust; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ @@ -122,8 +124,6 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf $RUSTUP_HOME; \ - rm -rf $CARGO_HOME; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/Dockerfile.template b/Dockerfile.template index 2ac6f41b4f..ea7fd3d2e5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -4,10 +4,6 @@ ; def is_slim: env.variant | startswith("slim-") - ; - def should_yjit: - # https://github.com/docker-library/ruby/issues/390 - ([ "2.7", "3.0", "3.1" ] | index(env.version) | not) -}} {{ if is_alpine then ( -}} FROM alpine:{{ env.variant | ltrimstr("alpine") }} @@ -63,13 +59,6 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }} RUN set -eux; \ \ {{ if is_alpine then ( -}} -{{ if should_yjit then ( -}} - yjit=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - x86_64 | aarch64) yjit=1 ;; \ - esac; \ -{{ ) else "" end -}} # readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ @@ -100,24 +89,8 @@ RUN set -eux; \ xz \ yaml-dev \ zlib-dev \ -{{ if should_yjit then ( -}} - ${yjit:+rust} \ -{{ ) else "" end -}} ; \ {{ ) else ( -}} -{{ if should_yjit then ( -}} - yjit=; \ - debArch="$(uname -m)"; \ - \ - export RUSTUP_HOME=/tmp/rustup; \ - export CARGO_HOME=/tmp/cargo; \ - PATH=$CARGO_HOME/bin:$PATH; \ - rustArch=${debArch}-unknown-linux-gnu; \ - case "$debArch" in \ - x86_64) yjit=1; RUST_VERSION=1.66; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - aarch64) yjit=1; RUST_VERSION=1.66; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929';; \ - esac; \ -{{ ) else "" end -}} savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -142,19 +115,76 @@ RUN set -eux; \ {{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/*; \ -{{ if should_yjit then ( -}} +{{ ) end -}} +{{ if .rust.version then ( -}} \ - case "$yjit" in \ - 1) wget https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init; \ - echo "${rustupSha256} *rustup-init" | sha256sum --check --strict; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - cargo --version; \ - rustc --version ;; \ + rustArch=; \ +{{ def archVar: if is_alpine then "apkArch" else "dpkgArch" end -}} + {{ archVar }}="$({{ if is_alpine then "apk --print-arch" else "dpkg --print-architecture" end }})"; \ + case "${{ archVar }}" in \ +{{ + ( + .rustup.arches + | (if is_alpine then "musl" else "glibc" end) as $libcKey + | to_entries + | map( + .key as $bashbrewArch + | ( + if is_alpine then + { + amd64: "x86_64", + arm32v6: "armhf", + arm32v7: "armv7", + arm64v8: "aarch64", + i386: "x86", + ppc64le: "ppc64le", + riscv64: "riscv64", + s390x: "s390x", + } + else + { + amd64: "amd64", + arm32v5: "armel", + arm32v7: "armhf", + arm64v8: "arm64", + i386: "i386", + mips64le: "mips64el", + ppc64le: "ppc64el", + riscv64: "riscv64", + s390x: "s390x", + } + end + )[$bashbrewArch] as $distroArch + | select($distroArch) + | .value + | select(has($libcKey)) + | .[$libcKey] + | ( +-}} + {{ $distroArch | @sh }}) rustArch={{ .arch | @sh }}; rustupUrl={{ .url | @sh }}; rustupSha256={{ .sha256 | @sh }} ;; \ +{{ + ) + ) + | join("") + ) +-}} esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain {{ .rust.version | @sh }} --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ {{ ) else "" end -}} -{{ ) end -}} \ wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ @@ -191,10 +221,10 @@ RUN set -eux; \ {{ if is_alpine and ( [ "2.7", "3.0" ] | index(env.version) ) then ( -}} # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 -{{ if should_yjit then "" else ( -}} - apkArch="$(apk --print-arch)"; \ +{{ if .rust.version then "" else ( -}} + {{ archVar }}="$(apk --print-arch)"; \ {{ ) end -}} - case "$apkArch" in \ + case "${{ archVar }}" in \ s390x | armhf | armv7) \ apk add --no-cache libucontext-dev; \ export LIBS='-lucontext'; \ @@ -206,13 +236,16 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ -{{ if should_yjit then ( -}} - ${yjit:+--enable-yjit} \ +{{ if .rust.version then ( -}} + ${rustArch:+--enable-yjit} \ {{ ) else "" end -}} ; \ make -j "$(nproc)"; \ make install; \ \ +{{ if .rust.version then ( -}} + rm -rf /tmp/rust; \ +{{ ) else "" end -}} {{ if is_alpine then ( -}} runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ @@ -235,10 +268,6 @@ RUN set -eux; \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ -{{ if should_yjit then ( -}} - rm -rf $RUSTUP_HOME; \ - rm -rf $CARGO_HOME; \ -{{ ) else "" end -}} {{ ) end -}} \ cd /; \ diff --git a/rust.json b/rust.json new file mode 100644 index 0000000000..d510f93c78 --- /dev/null +++ b/rust.json @@ -0,0 +1,83 @@ +{ + "rust": { + "version": "1.66.0" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm32v5": { + "glibc": { + "arch": "arm-unknown-linux-gnueabi", + "sha256": "0bd9ba41cd40945b4cadc5a8acb3a926c61f7cce5747120a0e213aae1b4ea30a", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/arm-unknown-linux-gnueabi/rustup-init" + } + }, + "arm32v6": { + "glibc": { + "arch": "arm-unknown-linux-gnueabihf", + "sha256": "aad75c7c586fd5a8cc8a7153d7e574bb7a8bf39b99dd7d9dab7425143fa4a999", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/arm-unknown-linux-gnueabihf/rustup-init" + } + }, + "arm32v7": { + "glibc": { + "arch": "armv7-unknown-linux-gnueabihf", + "sha256": "48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/armv7-unknown-linux-gnueabihf/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + } + }, + "i386": { + "glibc": { + "arch": "i686-unknown-linux-gnu", + "sha256": "0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/i686-unknown-linux-gnu/rustup-init" + } + }, + "mips64le": { + "glibc": { + "arch": "mips64el-unknown-linux-gnuabi64", + "sha256": "e69193145f5f2574bf79f355b46dae3d747e8afef511aa015445c51c4d057c6f", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/mips64el-unknown-linux-gnuabi64/rustup-init" + } + }, + "ppc64le": { + "glibc": { + "arch": "powerpc64le-unknown-linux-gnu", + "sha256": "774f62fd927f6c29499a6caee8f534e796161321ec35435788971629bb55af8e", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/powerpc64le-unknown-linux-gnu/rustup-init" + } + }, + "s390x": { + "glibc": { + "arch": "s390x-unknown-linux-gnu", + "sha256": "cf5965d0e3b5f53b51d19b84c7cae2996d69277cdf280a9c07fe47418233dde9", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/s390x-unknown-linux-gnu/rustup-init" + } + } + }, + "version": "1.25.1" + } +} diff --git a/rust.sh b/rust.sh new file mode 100755 index 0000000000..f26615b953 --- /dev/null +++ b/rust.sh @@ -0,0 +1,92 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +rustupVersion="$(curl -fsSL 'https://static.rust-lang.org/rustup/release-stable.toml')" +rustupVersion="$(awk <<<"$rustupVersion" -F "[ ='\"]+" '$1 == "version" { print $2; exit }')" +[ -n "$rustupVersion" ] +export rustupVersion +echo "rustup: $rustupVersion" + +json="$(jq -nc ' + { + rustup: { + version: env.rustupVersion, + arches: ( + [ + # https://github.com/rust-lang/rustup/blob/1.25.1/doc/src/installation/other.md + # (filtering out windows, darwin, bsd, illumos, android, etc - just linux gnu and musl) + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "arm-unknown-linux-gnueabi", + "arm-unknown-linux-gnueabihf", + "armv7-unknown-linux-gnueabihf", + "i686-unknown-linux-gnu", + "mips-unknown-linux-gnu", + "mips64-unknown-linux-gnuabi64", + "mips64el-unknown-linux-gnuabi64", + "mipsel-unknown-linux-gnu", + "powerpc-unknown-linux-gnu", + "powerpc64-unknown-linux-gnu", + "powerpc64le-unknown-linux-gnu", + "s390x-unknown-linux-gnu", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", + # TODO find a good source for scraping these instead of hard-coding them + empty # trailing comma + ] + | map( + split("-") as $split + | $split[0] as $arch + | $split[-1] as $libc + | { + "aarch64": "arm64v8", + "arm": ("arm32v" + if ($libc | endswith("hf")) then "6" else "5" end), + "armv7": "arm32v7", + "i686": "i386", + "mips64el": "mips64le", + "powerpc64le": "ppc64le", + "s390x": "s390x", + "x86_64": "amd64", + # TODO windows? (we do not compile on/for Windows right now) + }[$arch] as $bashbrewArch + | select($bashbrewArch) + | { + ($bashbrewArch): { + (if $libc == "musl" then "musl" else "glibc" end): ({ + "arch": ., + "url": "https://static.rust-lang.org/rustup/archive/\(env.rustupVersion)/\(.)/rustup-init", + } | .sha256 = .url + ".sha256"), + }, + } + ) + | reduce .[] as $map ({}; . * $map) + ), + }, + } +')" + +urls="$(jq <<<"$json" -r '[ .. | .sha256? | select(. and startswith("http")) | @sh ] | join(" ")')" +eval "urls=( $urls )" +for url in "${urls[@]}"; do + sha256="$(curl -fsSL "$url")" + sha256="${sha256%% *}" + [ -n "$sha256" ] + export url sha256 + json="$(jq <<<"$json" -c 'walk(if . == env.url then env.sha256 else . end)')" +done + +# TODO https://static.rust-lang.org/dist/channel-rust-1.66.toml -> scrape stable to know which version is stable but we can scrape other minors to get the latest patch if we needed an older one for some reason (like an older version of Ruby needing an older Rust or a newer Rust no longer working on our older distros, etc) + +rustVersion="$(curl -fsSL 'https://static.rust-lang.org/dist/channel-rust-stable.toml' | grep -E '^(\[|(version|(xz_)?(url|hash|available))[[:space:]]*=)')" +rustVersion="$(awk <<<"$rustVersion" -F "[ ='\"]+" ' + /^\[/ { pkg = $0; next } + pkg == "[pkg.rust]" && $1 == "version" { print $2; exit } +')" +[ -n "$rustVersion" ] +export rustVersion +echo "rust: $rustVersion" +# TODO also scrape available "[pkg.rust.target.*-linux-*]" so we can cross-reference available target arches with rustup + +json="$(jq <<<"$json" -c '.rust = { version: env.rustVersion }')" + +jq <<<"$json" -S . > rust.json diff --git a/versions.json b/versions.json index 0558be8c8b..59600d054c 100644 --- a/versions.json +++ b/versions.json @@ -34,6 +34,38 @@ "version": "3.1.3" }, "3.2": { + "rust": { + "version": "1.66.0" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.25.1" + }, "sha256": "d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4", "variants": [ "bullseye", diff --git a/versions.sh b/versions.sh index 83bc00d7bb..297c9f9aa0 100755 --- a/versions.sh +++ b/versions.sh @@ -64,8 +64,8 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" export fullVersion shaVal - json="$(jq <<<"$json" -c ' - .[env.version] = { + doc="$(jq -nc ' + { version: env.fullVersion, sha256: env.shaVal, variants: [ @@ -88,6 +88,25 @@ for version in "${versions[@]}"; do ], } ')" + + case "$rcVersion" in + 2.7 | 3.0 | 3.1) ;; + *) + # YJIT + doc="$(jq <<<"$doc" -sc ' + .[1][].arches? |= if . then with_entries(select(.key as $arch | [ + # https://github.com/ruby/ruby/blob/v3_2_0/doc/yjit/yjit.md ("currently supported for macOS and Linux on x86-64 and arm64/aarch64 CPUs") + # https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L3757-L3761 + "amd64", + "arm64v8", + empty # trailing comma + ] | index($arch))) else empty end + | add + ' - rust.json)" + ;; + esac + + json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" done jq <<<"$json" -S . > versions.json From c068755c5a4b78ae781ed9f8245ab6fb7aab519a Mon Sep 17 00:00:00 2001 From: Leif Gensert Date: Wed, 8 Feb 2023 09:07:29 -0800 Subject: [PATCH 348/462] Update 3.2.0 to 3.2.1 --- 3.2/alpine3.16/Dockerfile | 4 ++-- 3.2/alpine3.17/Dockerfile | 4 ++-- 3.2/bullseye/Dockerfile | 4 ++-- 3.2/buster/Dockerfile | 4 ++-- 3.2/slim-bullseye/Dockerfile | 4 ++-- 3.2/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile index ca886ac777..2be8ea609d 100644 --- a/3.2/alpine3.16/Dockerfile +++ b/3.2/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile index 5c03dd4bcd..b566261d75 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 1a7c5cdd11..a0be8d05ec 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/buster/Dockerfile b/3.2/buster/Dockerfile index 3d2bddab10..9d6a31cd1c 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index a1751e5349..64d2633d37 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile index fa6566b4f2..9b1a5796bf 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.0 -ENV RUBY_DOWNLOAD_SHA256 d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4 +ENV RUBY_VERSION 3.2.1 +ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 59600d054c..c44d5d29a1 100644 --- a/versions.json +++ b/versions.json @@ -66,7 +66,7 @@ }, "version": "1.25.1" }, - "sha256": "d2f4577306e6dd932259693233141e5c3ec13622c95b75996541b8d5b68b28b4", + "sha256": "746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c", "variants": [ "bullseye", "slim-bullseye", @@ -75,6 +75,6 @@ "alpine3.17", "alpine3.16" ], - "version": "3.2.0" + "version": "3.2.1" } } From e1866b57c27f0828f75eb9704f5804be47bd1c98 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 10 Mar 2023 16:10:17 -0800 Subject: [PATCH 349/462] Update permissions from 777 to 1777 This still supports the "arbitrary user" use case but with slightly tighter permissions on the end result. --- 2.7/alpine3.16/Dockerfile | 2 +- 2.7/bullseye/Dockerfile | 2 +- 2.7/buster/Dockerfile | 2 +- 2.7/slim-bullseye/Dockerfile | 2 +- 2.7/slim-buster/Dockerfile | 2 +- 3.0/alpine3.16/Dockerfile | 2 +- 3.0/bullseye/Dockerfile | 2 +- 3.0/buster/Dockerfile | 2 +- 3.0/slim-bullseye/Dockerfile | 2 +- 3.0/slim-buster/Dockerfile | 2 +- 3.1/alpine3.16/Dockerfile | 2 +- 3.1/alpine3.17/Dockerfile | 2 +- 3.1/bullseye/Dockerfile | 2 +- 3.1/buster/Dockerfile | 2 +- 3.1/slim-bullseye/Dockerfile | 2 +- 3.1/slim-buster/Dockerfile | 2 +- 3.2/alpine3.16/Dockerfile | 2 +- 3.2/alpine3.17/Dockerfile | 2 +- 3.2/bullseye/Dockerfile | 2 +- 3.2/buster/Dockerfile | 2 +- 3.2/slim-bullseye/Dockerfile | 2 +- 3.2/slim-buster/Dockerfile | 2 +- Dockerfile.template | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/2.7/alpine3.16/Dockerfile b/2.7/alpine3.16/Dockerfile index 2d92dcfa03..6253e27443 100644 --- a/2.7/alpine3.16/Dockerfile +++ b/2.7/alpine3.16/Dockerfile @@ -145,6 +145,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index 22b3671ea3..8348dac74e 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index db7f47eaec..8b08775106 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index d51e8791f9..39b724d60a 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index 4cd26b9511..2a32d98e2f 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index 56188367b7..0d5f097187 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -145,6 +145,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index 5d067bbf1f..dc64d0d3bc 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index c1f977d2d8..c0c181f45e 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index 95b513debd..887a8decc6 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index d4d05c859b..0f1d0dcc08 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/alpine3.16/Dockerfile b/3.1/alpine3.16/Dockerfile index 2811b3387c..87c504a7d2 100644 --- a/3.1/alpine3.16/Dockerfile +++ b/3.1/alpine3.16/Dockerfile @@ -136,6 +136,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/alpine3.17/Dockerfile b/3.1/alpine3.17/Dockerfile index 7d20cedb70..e59ed1fe73 100644 --- a/3.1/alpine3.17/Dockerfile +++ b/3.1/alpine3.17/Dockerfile @@ -136,6 +136,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 79712fb215..1689b7b434 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/buster/Dockerfile b/3.1/buster/Dockerfile index bc62c904dd..f4cc09d69f 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -90,6 +90,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index ad79427e5c..5d67798a5f 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile index fe07c7d19e..2eac8074ba 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -117,6 +117,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile index 2be8ea609d..0779a87d2a 100644 --- a/3.2/alpine3.16/Dockerfile +++ b/3.2/alpine3.16/Dockerfile @@ -160,6 +160,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile index b566261d75..6026ff5faf 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -160,6 +160,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index a0be8d05ec..4d10b3ad15 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -114,6 +114,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/buster/Dockerfile b/3.2/buster/Dockerfile index 9d6a31cd1c..67a9b4fd8f 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -114,6 +114,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 64d2633d37..bec4004d95 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -141,6 +141,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile index 9b1a5796bf..f99bc51977 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -141,6 +141,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index ea7fd3d2e5..a58bf00e99 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -296,6 +296,6 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH # adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" CMD [ "irb" ] From 7117899e1b7d3d8230fe8021acf76ead8d2f5230 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Mar 2023 09:19:28 -0700 Subject: [PATCH 350/462] Update 2.7 to 2.7.8 --- 2.7/alpine3.16/Dockerfile | 4 ++-- 2.7/bullseye/Dockerfile | 4 ++-- 2.7/buster/Dockerfile | 4 ++-- 2.7/slim-bullseye/Dockerfile | 4 ++-- 2.7/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2.7/alpine3.16/Dockerfile b/2.7/alpine3.16/Dockerfile index 6253e27443..3350c01753 100644 --- a/2.7/alpine3.16/Dockerfile +++ b/2.7/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c +ENV RUBY_VERSION 2.7.8 +ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile index 8348dac74e..235d087daf 100644 --- a/2.7/bullseye/Dockerfile +++ b/2.7/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c +ENV RUBY_VERSION 2.7.8 +ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index 8b08775106..ace35dbd3a 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c +ENV RUBY_VERSION 2.7.8 +ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile index 39b724d60a..84d9c39036 100644 --- a/2.7/slim-bullseye/Dockerfile +++ b/2.7/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c +ENV RUBY_VERSION 2.7.8 +ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile index 2a32d98e2f..c2884ea592 100644 --- a/2.7/slim-buster/Dockerfile +++ b/2.7/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.7 -ENV RUBY_DOWNLOAD_SHA256 b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c +ENV RUBY_VERSION 2.7.8 +ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index c44d5d29a1..3092210944 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "2.7": { - "sha256": "b38dff2e1f8ce6e5b7d433f8758752987a6b2adfd9bc7571dbc42ea5d04e3e4c", + "sha256": "f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb", "variants": [ "bullseye", "slim-bullseye", @@ -8,7 +8,7 @@ "slim-buster", "alpine3.16" ], - "version": "2.7.7" + "version": "2.7.8" }, "3.0": { "sha256": "cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde", From 1cd75932f3d072dbbe2a866951fc47ff5a5bb2fc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Mar 2023 09:35:55 -0700 Subject: [PATCH 351/462] Update 3.0 to 3.0.6 --- 3.0/alpine3.16/Dockerfile | 4 ++-- 3.0/bullseye/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/slim-bullseye/Dockerfile | 4 ++-- 3.0/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index 0d5f097187..e11ab34cdd 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde +ENV RUBY_VERSION 3.0.6 +ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index dc64d0d3bc..3b917a9551 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde +ENV RUBY_VERSION 3.0.6 +ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index c0c181f45e..03abed05ff 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde +ENV RUBY_VERSION 3.0.6 +ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index 887a8decc6..26b331f686 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde +ENV RUBY_VERSION 3.0.6 +ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 0f1d0dcc08..9f755b058f 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.5 -ENV RUBY_DOWNLOAD_SHA256 cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde +ENV RUBY_VERSION 3.0.6 +ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 3092210944..7637380592 100644 --- a/versions.json +++ b/versions.json @@ -11,7 +11,7 @@ "version": "2.7.8" }, "3.0": { - "sha256": "cf7cb5ba2030fe36596a40980cdecfd79a0337d35860876dc2b10a38675bddde", + "sha256": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1", "variants": [ "bullseye", "slim-bullseye", @@ -19,7 +19,7 @@ "slim-buster", "alpine3.16" ], - "version": "3.0.5" + "version": "3.0.6" }, "3.1": { "sha256": "4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a", From 564fdfe2e1451d2f56a815b1213e54c7f8639cb4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Mar 2023 09:54:18 -0700 Subject: [PATCH 352/462] Update 3.1 to 3.1.4 --- 3.1/alpine3.16/Dockerfile | 4 ++-- 3.1/alpine3.17/Dockerfile | 4 ++-- 3.1/bullseye/Dockerfile | 4 ++-- 3.1/buster/Dockerfile | 4 ++-- 3.1/slim-bullseye/Dockerfile | 4 ++-- 3.1/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.1/alpine3.16/Dockerfile b/3.1/alpine3.16/Dockerfile index 87c504a7d2..007b802002 100644 --- a/3.1/alpine3.16/Dockerfile +++ b/3.1/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/alpine3.17/Dockerfile b/3.1/alpine3.17/Dockerfile index e59ed1fe73..0858dd60d8 100644 --- a/3.1/alpine3.17/Dockerfile +++ b/3.1/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 1689b7b434..5851055de9 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/buster/Dockerfile b/3.1/buster/Dockerfile index f4cc09d69f..f50561f2a0 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 5d67798a5f..9551c6b9b4 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-buster/Dockerfile index 2eac8074ba..887f3916a9 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.3 -ENV RUBY_DOWNLOAD_SHA256 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 7637380592..7ed3e32507 100644 --- a/versions.json +++ b/versions.json @@ -22,7 +22,7 @@ "version": "3.0.6" }, "3.1": { - "sha256": "4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a", + "sha256": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f", "variants": [ "bullseye", "slim-bullseye", @@ -31,7 +31,7 @@ "alpine3.17", "alpine3.16" ], - "version": "3.1.3" + "version": "3.1.4" }, "3.2": { "rust": { From 4041b21f3e11111846e6b6043da2da92e1da7019 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Mar 2023 10:17:18 -0700 Subject: [PATCH 353/462] Update 3.2 to 3.2.2 --- 3.2/alpine3.16/Dockerfile | 4 ++-- 3.2/alpine3.17/Dockerfile | 4 ++-- 3.2/bullseye/Dockerfile | 4 ++-- 3.2/buster/Dockerfile | 4 ++-- 3.2/slim-bullseye/Dockerfile | 4 ++-- 3.2/slim-buster/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile index 0779a87d2a..a813244cd3 100644 --- a/3.2/alpine3.16/Dockerfile +++ b/3.2/alpine3.16/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile index 6026ff5faf..98ed500fac 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 4d10b3ad15..47d83c1c20 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/buster/Dockerfile b/3.2/buster/Dockerfile index 67a9b4fd8f..48d07be313 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/buster/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index bec4004d95..6ca0fa2933 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-buster/Dockerfile index f99bc51977..4eae3f543a 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-buster/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.1 -ENV RUBY_DOWNLOAD_SHA256 746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 7ed3e32507..4c85019d79 100644 --- a/versions.json +++ b/versions.json @@ -66,7 +66,7 @@ }, "version": "1.25.1" }, - "sha256": "746c8661ae25449cbdc5297d1092702e93e66f365a75fecb740d4f292ced630c", + "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", "variants": [ "bullseye", "slim-bullseye", @@ -75,6 +75,6 @@ "alpine3.17", "alpine3.16" ], - "version": "3.2.1" + "version": "3.2.2" } } From 3ac53a7fe039d4299aca9b49ad53e1cc85cc6498 Mon Sep 17 00:00:00 2001 From: Matthew Newell <18470637+wheatevo@users.noreply.github.com> Date: Tue, 9 May 2023 21:55:51 -0500 Subject: [PATCH 354/462] Add Alpine 3.18 Alpine 3.18 release post: https://alpinelinux.org/posts/Alpine-3.18.0-released.html --- 3.1/alpine3.18/Dockerfile | 141 ++++++++++++++++++++++++++++++++ 3.2/alpine3.18/Dockerfile | 165 ++++++++++++++++++++++++++++++++++++++ versions.json | 2 + versions.sh | 3 +- 4 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 3.1/alpine3.18/Dockerfile create mode 100644 3.2/alpine3.18/Dockerfile diff --git a/3.1/alpine3.18/Dockerfile b/3.1/alpine3.18/Dockerfile new file mode 100644 index 0000000000..679171a895 --- /dev/null +++ b/3.1/alpine3.18/Dockerfile @@ -0,0 +1,141 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.1 +ENV RUBY_VERSION 3.1.4 +ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.18/Dockerfile new file mode 100644 index 0000000000..17449c0a15 --- /dev/null +++ b/3.2/alpine3.18/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.2 +ENV RUBY_VERSION 3.2.2 +ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 4c85019d79..d4aecf2446 100644 --- a/versions.json +++ b/versions.json @@ -28,6 +28,7 @@ "slim-bullseye", "buster", "slim-buster", + "alpine3.18", "alpine3.17", "alpine3.16" ], @@ -72,6 +73,7 @@ "slim-bullseye", "buster", "slim-buster", + "alpine3.18", "alpine3.17", "alpine3.16" ], diff --git a/versions.sh b/versions.sh index 297c9f9aa0..c27a96ad98 100755 --- a/versions.sh +++ b/versions.sh @@ -75,11 +75,12 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - # Alpine 3.17 defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0 + # Alpine 3.17+ defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0 # https://bugs.ruby-lang.org/issues/18658 # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 if [ "2.7", "3.0" ] | index(env.version) then empty else "3.17", + "3.18", empty # trailing comma hack end, "3.16", From 10e743ee7f6444f683d184c8b5d3fbd23a15acae Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 10 May 2023 15:08:13 -0700 Subject: [PATCH 355/462] Remove Alpine 3.16 from most versions (max 2 supported Alpine versions at a time), fix ordering --- 3.1/alpine3.16/Dockerfile | 141 -------------------------------- 3.2/alpine3.16/Dockerfile | 165 -------------------------------------- versions.json | 6 +- versions.sh | 8 +- 4 files changed, 5 insertions(+), 315 deletions(-) delete mode 100644 3.1/alpine3.16/Dockerfile delete mode 100644 3.2/alpine3.16/Dockerfile diff --git a/3.1/alpine3.16/Dockerfile b/3.1/alpine3.16/Dockerfile deleted file mode 100644 index 007b802002..0000000000 --- a/3.1/alpine3.16/Dockerfile +++ /dev/null @@ -1,141 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.16 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/alpine3.16/Dockerfile b/3.2/alpine3.16/Dockerfile deleted file mode 100644 index a813244cd3..0000000000 --- a/3.2/alpine3.16/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.16 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/versions.json b/versions.json index d4aecf2446..0d8a13b66d 100644 --- a/versions.json +++ b/versions.json @@ -29,8 +29,7 @@ "buster", "slim-buster", "alpine3.18", - "alpine3.17", - "alpine3.16" + "alpine3.17" ], "version": "3.1.4" }, @@ -74,8 +73,7 @@ "buster", "slim-buster", "alpine3.18", - "alpine3.17", - "alpine3.16" + "alpine3.17" ], "version": "3.2.2" } diff --git a/versions.sh b/versions.sh index c27a96ad98..e9dde46d12 100755 --- a/versions.sh +++ b/versions.sh @@ -78,13 +78,11 @@ for version in "${versions[@]}"; do # Alpine 3.17+ defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0 # https://bugs.ruby-lang.org/issues/18658 # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if [ "2.7", "3.0" ] | index(env.version) then empty else - "3.17", + if [ "2.7", "3.0" ] | index(env.version) then "3.16" else "3.18", + "3.17", empty # trailing comma hack - end, - "3.16", - empty # trailing comma hack + end | "alpine" + .) ], } From 26a1dafd81f4798c0aa44942412fe0465ce3c30d Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 10 May 2023 15:59:18 -0700 Subject: [PATCH 356/462] Drop EOL 2.7 --- 2.7/alpine3.16/Dockerfile | 150 ---------------------------------- 2.7/bullseye/Dockerfile | 95 --------------------- 2.7/buster/Dockerfile | 95 --------------------- 2.7/slim-bullseye/Dockerfile | 122 --------------------------- 2.7/slim-buster/Dockerfile | 122 --------------------------- Dockerfile.template | 2 +- generate-stackbrew-library.sh | 1 - versions.json | 11 --- versions.sh | 6 +- 9 files changed, 4 insertions(+), 600 deletions(-) delete mode 100644 2.7/alpine3.16/Dockerfile delete mode 100644 2.7/bullseye/Dockerfile delete mode 100644 2.7/buster/Dockerfile delete mode 100644 2.7/slim-bullseye/Dockerfile delete mode 100644 2.7/slim-buster/Dockerfile diff --git a/2.7/alpine3.16/Dockerfile b/2.7/alpine3.16/Dockerfile deleted file mode 100644 index 3350c01753..0000000000 --- a/2.7/alpine3.16/Dockerfile +++ /dev/null @@ -1,150 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.16 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.8 -ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 - # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - s390x | armhf | armv7) \ - apk add --no-cache libucontext-dev; \ - export LIBS='-lucontext'; \ - ;; \ - esac; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.7/bullseye/Dockerfile b/2.7/bullseye/Dockerfile deleted file mode 100644 index 235d087daf..0000000000 --- a/2.7/bullseye/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.8 -ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile deleted file mode 100644 index ace35dbd3a..0000000000 --- a/2.7/buster/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:buster - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.8 -ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.7/slim-bullseye/Dockerfile b/2.7/slim-bullseye/Dockerfile deleted file mode 100644 index 84d9c39036..0000000000 --- a/2.7/slim-bullseye/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.8 -ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/2.7/slim-buster/Dockerfile b/2.7/slim-buster/Dockerfile deleted file mode 100644 index c2884ea592..0000000000 --- a/2.7/slim-buster/Dockerfile +++ /dev/null @@ -1,122 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:buster-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 -ENV RUBY_MAJOR 2.7 -ENV RUBY_VERSION 2.7.8 -ENV RUBY_DOWNLOAD_SHA256 f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | grep -vE '^/usr/local/lib/' \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index a58bf00e99..39aff0610d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -218,7 +218,7 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ -{{ if is_alpine and ( [ "2.7", "3.0" ] | index(env.version) ) then ( -}} +{{ if is_alpine and "3.0" == env.version then ( -}} # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 {{ if .rust.version then "" else ( -}} diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 23f8629606..398f7d4f36 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,7 +3,6 @@ set -Eeuo pipefail declare -A aliases=( [3.2]='3 latest' - [2.7]='2' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index 0d8a13b66d..83f046b785 100644 --- a/versions.json +++ b/versions.json @@ -1,15 +1,4 @@ { - "2.7": { - "sha256": "f22f662da504d49ce2080e446e4bea7008cee11d5ec4858fc69000d0e5b1d7fb", - "variants": [ - "bullseye", - "slim-bullseye", - "buster", - "slim-buster", - "alpine3.16" - ], - "version": "2.7.8" - }, "3.0": { "sha256": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1", "variants": [ diff --git a/versions.sh b/versions.sh index e9dde46d12..5cac8c3cb5 100755 --- a/versions.sh +++ b/versions.sh @@ -75,10 +75,10 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - # Alpine 3.17+ defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0 + # Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0 # https://bugs.ruby-lang.org/issues/18658 # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if [ "2.7", "3.0" ] | index(env.version) then "3.16" else + if "3.0" == env.version then "3.16" else "3.18", "3.17", empty # trailing comma hack @@ -89,7 +89,7 @@ for version in "${versions[@]}"; do ')" case "$rcVersion" in - 2.7 | 3.0 | 3.1) ;; + 3.0 | 3.1) ;; *) # YJIT doc="$(jq <<<"$doc" -sc ' From b0be6d1004b0c0665366402905347a85f115b324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Codru=C8=9B=20Constantin=20Gu=C8=99oi?= Date: Sat, 13 May 2023 14:38:42 +0100 Subject: [PATCH 357/462] Add ruby 3.3.0-preview1 Released on 12 May 2023. https://www.ruby-lang.org/en/news/2023/05/12/ruby-3-3-0-preview1-released/ --- 3.3-rc/alpine3.17/Dockerfile | 165 ++++++++++++++++++++++++++++++++ 3.3-rc/alpine3.18/Dockerfile | 165 ++++++++++++++++++++++++++++++++ 3.3-rc/bullseye/Dockerfile | 119 +++++++++++++++++++++++ 3.3-rc/buster/Dockerfile | 119 +++++++++++++++++++++++ 3.3-rc/slim-bullseye/Dockerfile | 146 ++++++++++++++++++++++++++++ 3.3-rc/slim-buster/Dockerfile | 146 ++++++++++++++++++++++++++++ versions.json | 44 +++++++++ 7 files changed, 904 insertions(+) create mode 100644 3.3-rc/alpine3.17/Dockerfile create mode 100644 3.3-rc/alpine3.18/Dockerfile create mode 100644 3.3-rc/bullseye/Dockerfile create mode 100644 3.3-rc/buster/Dockerfile create mode 100644 3.3-rc/slim-bullseye/Dockerfile create mode 100644 3.3-rc/slim-buster/Dockerfile diff --git a/3.3-rc/alpine3.17/Dockerfile b/3.3-rc/alpine3.17/Dockerfile new file mode 100644 index 0000000000..6e1a022980 --- /dev/null +++ b/3.3-rc/alpine3.17/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.17 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile new file mode 100644 index 0000000000..95bb7033b6 --- /dev/null +++ b/3.3-rc/alpine3.18/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ +# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + readline-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile new file mode 100644 index 0000000000..ef2b7ce226 --- /dev/null +++ b/3.3-rc/bullseye/Dockerfile @@ -0,0 +1,119 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3-rc/buster/Dockerfile b/3.3-rc/buster/Dockerfile new file mode 100644 index 0000000000..905a428f5c --- /dev/null +++ b/3.3-rc/buster/Dockerfile @@ -0,0 +1,119 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:buster + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..0381025f2b --- /dev/null +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -0,0 +1,146 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3-rc/slim-buster/Dockerfile b/3.3-rc/slim-buster/Dockerfile new file mode 100644 index 0000000000..8a167b6f19 --- /dev/null +++ b/3.3-rc/slim-buster/Dockerfile @@ -0,0 +1,146 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:buster-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 +ENV RUBY_MAJOR 3.3-rc +ENV RUBY_VERSION 3.3.0-preview1 +ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libreadline-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | grep -vE '^/usr/local/lib/' \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 83f046b785..04f7764c52 100644 --- a/versions.json +++ b/versions.json @@ -65,5 +65,49 @@ "alpine3.17" ], "version": "3.2.2" + }, + "3.3-rc": { + "rust": { + "version": "1.66.0" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", + "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.25.1" + }, + "sha256": "ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb", + "variants": [ + "bullseye", + "slim-bullseye", + "buster", + "slim-buster", + "alpine3.18", + "alpine3.17" + ], + "version": "3.3.0-preview1" } } From 8940c5948e376abce960aa427d45833b1af728e1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 15 May 2023 14:40:39 -0700 Subject: [PATCH 358/462] Fix spurious 404s in "versions.sh" Also, update "large HTML" returns to store less raw content so the script is easier to debug. --- versions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/versions.sh b/versions.sh index 5cac8c3cb5..090102643b 100755 --- a/versions.sh +++ b/versions.sh @@ -12,8 +12,8 @@ else fi versions=( "${versions[@]%/}" ) -releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/')" -newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) +releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/' | grep -A 2 'Ruby')" # very wide grep to cut down on "set -x" output when debugging (should match the one later) +newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/' | grep 'Released')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) # TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well for version in "${versions[@]}"; do @@ -39,14 +39,14 @@ for version in "${versions[@]}"; do { versionReleasePage="$(grep "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' | cut -d'"' -f2)" \ + versionReleasePage="$(grep -oE 'Ruby '"$tryVersion"' Released' <<<"$newsPage" | cut -d'"' -f2)" \ && [ -n "$versionReleasePage" ] \ - && shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \ + && shaVal="$(curl -fsL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \ && shaVal="$(awk <<<"$shaVal" '$1 == "SHA256:" { print $2; exit }')" \ && [ -n "$shaVal" ] } \ From 39aa7dd5e4ebeef3f466d486f1094b09e41d6c5b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 15 May 2023 14:50:09 -0700 Subject: [PATCH 359/462] Remove unnecessary readline headers in 3.3+ Also, remove now unnecessary comment. See https://github.com/ruby/ruby/blob/v3_3_0_preview1/NEWS.md#extreadline-is-retired --- 3.0/alpine3.16/Dockerfile | 1 - 3.1/alpine3.17/Dockerfile | 1 - 3.1/alpine3.18/Dockerfile | 1 - 3.2/alpine3.17/Dockerfile | 1 - 3.2/alpine3.18/Dockerfile | 1 - 3.3-rc/alpine3.17/Dockerfile | 2 -- 3.3-rc/alpine3.18/Dockerfile | 2 -- 3.3-rc/slim-bullseye/Dockerfile | 1 - 3.3-rc/slim-buster/Dockerfile | 1 - Dockerfile.template | 7 +++++-- 10 files changed, 5 insertions(+), 13 deletions(-) diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index e11ab34cdd..377e2f8d29 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea2 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ diff --git a/3.1/alpine3.17/Dockerfile b/3.1/alpine3.17/Dockerfile index 0858dd60d8..2524ac4651 100644 --- a/3.1/alpine3.17/Dockerfile +++ b/3.1/alpine3.17/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a69 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ diff --git a/3.1/alpine3.18/Dockerfile b/3.1/alpine3.18/Dockerfile index 679171a895..4bc3519e2a 100644 --- a/3.1/alpine3.18/Dockerfile +++ b/3.1/alpine3.18/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a69 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.17/Dockerfile index 98ed500fac..86daae5e35 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.17/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.18/Dockerfile index 17449c0a15..86d177b2c7 100644 --- a/3.2/alpine3.18/Dockerfile +++ b/3.2/alpine3.18/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ diff --git a/3.3-rc/alpine3.17/Dockerfile b/3.3-rc/alpine3.17/Dockerfile index 6e1a022980..ec797eba84 100644 --- a/3.3-rc/alpine3.17/Dockerfile +++ b/3.3-rc/alpine3.17/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -58,7 +57,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - readline-dev \ ruby \ tar \ xz \ diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index 95bb7033b6..516cadaaae 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -34,7 +34,6 @@ ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795 # we purge system ruby later to make sure our final image uses what we just built RUN set -eux; \ \ -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -58,7 +57,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - readline-dev \ ruby \ tar \ xz \ diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index 0381025f2b..7a38e1fe17 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ - libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ diff --git a/3.3-rc/slim-buster/Dockerfile b/3.3-rc/slim-buster/Dockerfile index 8a167b6f19..236bf39d90 100644 --- a/3.3-rc/slim-buster/Dockerfile +++ b/3.3-rc/slim-buster/Dockerfile @@ -51,7 +51,6 @@ RUN set -eux; \ libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ - libreadline-dev \ libxml2-dev \ libxslt-dev \ make \ diff --git a/Dockerfile.template b/Dockerfile.template index 39aff0610d..33ecb3b5fc 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -59,7 +59,6 @@ ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }} RUN set -eux; \ \ {{ if is_alpine then ( -}} -# readline-dev vs libedit-dev: https://bugs.ruby-lang.org/issues/11869 and https://github.com/docker-library/ruby/issues/75 apk add --no-cache --virtual .ruby-builddeps \ autoconf \ bison \ @@ -83,7 +82,9 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} readline-dev \ +{{ ) else "" end -}} ruby \ tar \ xz \ @@ -106,7 +107,9 @@ RUN set -eux; \ libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} libreadline-dev \ +{{ ) else "" end -}} libxml2-dev \ libxslt-dev \ make \ @@ -218,7 +221,7 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ -{{ if is_alpine and "3.0" == env.version then ( -}} +{{ if is_alpine and "3.0" == (env.version | rtrimstr("-rc")) then ( -}} # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 {{ if .rust.version then "" else ( -}} From ed1be47a38a7a24a0aa03c450549afcb592f02a8 Mon Sep 17 00:00:00 2001 From: Ivan Prisyazhnyy Date: Wed, 5 Apr 2023 12:43:34 +0200 Subject: [PATCH 360/462] Add debian:bookworm, drop buster Signed-off-by: Ivan Prisyazhnyy --- 3.0/bullseye/Dockerfile | 3 +-- 3.0/buster/Dockerfile | 3 +-- 3.0/slim-bullseye/Dockerfile | 3 +-- 3.0/slim-buster/Dockerfile | 3 +-- 3.1/{buster => bookworm}/Dockerfile | 5 ++--- 3.1/bullseye/Dockerfile | 3 +-- 3.1/{slim-buster => slim-bookworm}/Dockerfile | 5 ++--- 3.1/slim-bullseye/Dockerfile | 3 +-- 3.2/{buster => bookworm}/Dockerfile | 5 ++--- 3.2/bullseye/Dockerfile | 3 +-- 3.2/{slim-buster => slim-bookworm}/Dockerfile | 5 ++--- 3.2/slim-bullseye/Dockerfile | 3 +-- 3.3-rc/{buster => bookworm}/Dockerfile | 5 ++--- 3.3-rc/bullseye/Dockerfile | 3 +-- 3.3-rc/{slim-buster => slim-bookworm}/Dockerfile | 5 ++--- 3.3-rc/slim-bullseye/Dockerfile | 3 +-- Dockerfile.template | 3 +-- versions.json | 12 ++++++------ versions.sh | 13 ++++++++++--- 19 files changed, 39 insertions(+), 49 deletions(-) rename 3.1/{buster => bookworm}/Dockerfile (94%) rename 3.1/{slim-buster => slim-bookworm}/Dockerfile (95%) rename 3.2/{buster => bookworm}/Dockerfile (96%) rename 3.2/{slim-buster => slim-bookworm}/Dockerfile (96%) rename 3.3-rc/{buster => bookworm}/Dockerfile (96%) rename 3.3-rc/{slim-buster => slim-bookworm}/Dockerfile (96%) diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index 3b917a9551..a348d95d8c 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -64,9 +64,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 03abed05ff..0f67902bd7 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -64,9 +64,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index 26b331f686..66ab15e3c9 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -91,9 +91,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 9f755b058f..956097c485 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -91,9 +91,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.1/buster/Dockerfile b/3.1/bookworm/Dockerfile similarity index 94% rename from 3.1/buster/Dockerfile rename to 3.1/bookworm/Dockerfile index f50561f2a0..97991aa81b 100644 --- a/3.1/buster/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # skip installing gem documentation RUN set -eux; \ @@ -64,9 +64,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 5851055de9..80f0ec1ad6 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -64,9 +64,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.1/slim-buster/Dockerfile b/3.1/slim-bookworm/Dockerfile similarity index 95% rename from 3.1/slim-buster/Dockerfile rename to 3.1/slim-bookworm/Dockerfile index 887f3916a9..fef9c14ad4 100644 --- a/3.1/slim-buster/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -91,9 +91,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 9551c6b9b4..346266152c 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -91,9 +91,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.2/buster/Dockerfile b/3.2/bookworm/Dockerfile similarity index 96% rename from 3.2/buster/Dockerfile rename to 3.2/bookworm/Dockerfile index 48d07be313..b56f1ce1f1 100644 --- a/3.2/buster/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # skip installing gem documentation RUN set -eux; \ @@ -88,9 +88,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 47d83c1c20..d4d54ffdc3 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -88,9 +88,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.2/slim-buster/Dockerfile b/3.2/slim-bookworm/Dockerfile similarity index 96% rename from 3.2/slim-buster/Dockerfile rename to 3.2/slim-bookworm/Dockerfile index 4eae3f543a..9adf74dee0 100644 --- a/3.2/slim-buster/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -115,9 +115,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 6ca0fa2933..775022ad6f 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -115,9 +115,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.3-rc/buster/Dockerfile b/3.3-rc/bookworm/Dockerfile similarity index 96% rename from 3.3-rc/buster/Dockerfile rename to 3.3-rc/bookworm/Dockerfile index 905a428f5c..9159abc495 100644 --- a/3.3-rc/buster/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:buster +FROM buildpack-deps:bookworm # skip installing gem documentation RUN set -eux; \ @@ -88,9 +88,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index ef2b7ce226..eedcf34f60 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -88,9 +88,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.3-rc/slim-buster/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile similarity index 96% rename from 3.3-rc/slim-buster/Dockerfile rename to 3.3-rc/slim-bookworm/Dockerfile index 236bf39d90..c116a36788 100644 --- a/3.3-rc/slim-buster/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:buster-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -114,9 +114,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index 7a38e1fe17..c2f6993de2 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -114,9 +114,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/Dockerfile.template b/Dockerfile.template index 33ecb3b5fc..c81cc16bdb 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -262,9 +262,8 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ - | grep -vE '^/usr/local/lib/' \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ | sort -u \ diff --git a/versions.json b/versions.json index 04f7764c52..40cd759183 100644 --- a/versions.json +++ b/versions.json @@ -13,10 +13,10 @@ "3.1": { "sha256": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f", "variants": [ + "bookworm", + "slim-bookworm", "bullseye", "slim-bullseye", - "buster", - "slim-buster", "alpine3.18", "alpine3.17" ], @@ -57,10 +57,10 @@ }, "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", "variants": [ + "bookworm", + "slim-bookworm", "bullseye", "slim-bullseye", - "buster", - "slim-buster", "alpine3.18", "alpine3.17" ], @@ -101,10 +101,10 @@ }, "sha256": "ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb", "variants": [ + "bookworm", + "slim-bookworm", "bullseye", "slim-bullseye", - "buster", - "slim-buster", "alpine3.18", "alpine3.17" ], diff --git a/versions.sh b/versions.sh index 090102643b..d887f0c736 100755 --- a/versions.sh +++ b/versions.sh @@ -70,9 +70,16 @@ for version in "${versions[@]}"; do sha256: env.shaVal, variants: [ ( - "bullseye", - "buster", - empty # trailing comma hack + # https://bugs.ruby-lang.org/issues/18658 + # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 + if "3.0" == env.version then + "bullseye", + "buster" + else + "bookworm", + "bullseye", + empty # trailing comma hack + end | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( # Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0 From 31c1fdba369192fe2c3cf327d7d98819edc1400b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 14 Sep 2023 04:03:25 -0700 Subject: [PATCH 361/462] Update 3.3-rc to 3.3.0-preview2 --- 3.3-rc/alpine3.17/Dockerfile | 4 ++-- 3.3-rc/alpine3.18/Dockerfile | 4 ++-- 3.3-rc/bookworm/Dockerfile | 4 ++-- 3.3-rc/bullseye/Dockerfile | 4 ++-- 3.3-rc/slim-bookworm/Dockerfile | 4 ++-- 3.3-rc/slim-bullseye/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.3-rc/alpine3.17/Dockerfile b/3.3-rc/alpine3.17/Dockerfile index ec797eba84..a34c4a547a 100644 --- a/3.3-rc/alpine3.17/Dockerfile +++ b/3.3-rc/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index 516cadaaae..ea272e1310 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile index 9159abc495..c03105aabb 100644 --- a/3.3-rc/bookworm/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index eedcf34f60..e857057719 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile index c116a36788..7de520786e 100644 --- a/3.3-rc/slim-bookworm/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index c2f6993de2..09179fe709 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview1 -ENV RUBY_DOWNLOAD_SHA256 ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb +ENV RUBY_VERSION 3.3.0-preview2 +ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 40cd759183..c16757392e 100644 --- a/versions.json +++ b/versions.json @@ -99,7 +99,7 @@ }, "version": "1.25.1" }, - "sha256": "ae300b49e06c13087dd163b97eddd38db895dc8e0c9904284119795d75303fbb", + "sha256": "62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1", "variants": [ "bookworm", "slim-bookworm", @@ -108,6 +108,6 @@ "alpine3.18", "alpine3.17" ], - "version": "3.3.0-preview1" + "version": "3.3.0-preview2" } } From 897d5b47686172a3ad13fd6ddc48f6eaabf151c7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 12 Nov 2023 04:03:20 -0800 Subject: [PATCH 362/462] Update 3.3-rc to 3.3.0-preview3 --- 3.3-rc/alpine3.17/Dockerfile | 4 ++-- 3.3-rc/alpine3.18/Dockerfile | 4 ++-- 3.3-rc/bookworm/Dockerfile | 4 ++-- 3.3-rc/bullseye/Dockerfile | 4 ++-- 3.3-rc/slim-bookworm/Dockerfile | 4 ++-- 3.3-rc/slim-bullseye/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.3-rc/alpine3.17/Dockerfile b/3.3-rc/alpine3.17/Dockerfile index a34c4a547a..b1c0d16191 100644 --- a/3.3-rc/alpine3.17/Dockerfile +++ b/3.3-rc/alpine3.17/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index ea272e1310..fe6842ccbf 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile index c03105aabb..730b40709e 100644 --- a/3.3-rc/bookworm/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index e857057719..4d3a02387f 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile index 7de520786e..a50cfca375 100644 --- a/3.3-rc/slim-bookworm/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index 09179fe709..fbd06f7a18 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview2 -ENV RUBY_DOWNLOAD_SHA256 62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1 +ENV RUBY_VERSION 3.3.0-preview3 +ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index c16757392e..741f9817b0 100644 --- a/versions.json +++ b/versions.json @@ -99,7 +99,7 @@ }, "version": "1.25.1" }, - "sha256": "62b1c4f586c70bf1cb58f2d909d0d824506315782e835f9dd3fcc0b659a70fc1", + "sha256": "f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355", "variants": [ "bookworm", "slim-bookworm", @@ -108,6 +108,6 @@ "alpine3.18", "alpine3.17" ], - "version": "3.3.0-preview2" + "version": "3.3.0-preview3" } } From 61a806938da52038916a8fd7b9b4373937bdc28f Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Fri, 8 Dec 2023 09:03:46 +0100 Subject: [PATCH 363/462] Add alpine 3.19 --- 3.1/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.2/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.3-rc/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- versions.json | 12 ++++++------ versions.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename 3.1/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.2/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.3-rc/{alpine3.17 => alpine3.19}/Dockerfile (99%) diff --git a/3.1/alpine3.17/Dockerfile b/3.1/alpine3.19/Dockerfile similarity index 99% rename from 3.1/alpine3.17/Dockerfile rename to 3.1/alpine3.19/Dockerfile index 2524ac4651..d5b4dbc879 100644 --- a/3.1/alpine3.17/Dockerfile +++ b/3.1/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2/alpine3.17/Dockerfile b/3.2/alpine3.19/Dockerfile similarity index 99% rename from 3.2/alpine3.17/Dockerfile rename to 3.2/alpine3.19/Dockerfile index 86daae5e35..7488be0616 100644 --- a/3.2/alpine3.17/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 RUN set -eux; \ apk add --no-cache \ diff --git a/3.3-rc/alpine3.17/Dockerfile b/3.3-rc/alpine3.19/Dockerfile similarity index 99% rename from 3.3-rc/alpine3.17/Dockerfile rename to 3.3-rc/alpine3.19/Dockerfile index b1c0d16191..8f3f77250b 100644 --- a/3.3-rc/alpine3.17/Dockerfile +++ b/3.3-rc/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index 741f9817b0..08893fa2e2 100644 --- a/versions.json +++ b/versions.json @@ -17,8 +17,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.1.4" }, @@ -61,8 +61,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.2.2" }, @@ -105,8 +105,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.3.0-preview3" } diff --git a/versions.sh b/versions.sh index d887f0c736..061ee394a1 100755 --- a/versions.sh +++ b/versions.sh @@ -86,8 +86,8 @@ for version in "${versions[@]}"; do # https://bugs.ruby-lang.org/issues/18658 # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 if "3.0" == env.version then "3.16" else + "3.19", "3.18", - "3.17", empty # trailing comma hack end | "alpine" + .) From 423e364cd1681dac6b5afd6191d774aaa1cf6161 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Fri, 8 Dec 2023 09:27:14 +0100 Subject: [PATCH 364/462] Bump rust version Needed for alpine 3.19 to work with ruby 3.2/3.3-rc --- 3.2/alpine3.18/Dockerfile | 6 ++--- 3.2/alpine3.19/Dockerfile | 6 ++--- 3.2/bookworm/Dockerfile | 6 ++--- 3.2/bullseye/Dockerfile | 6 ++--- 3.2/slim-bookworm/Dockerfile | 6 ++--- 3.2/slim-bullseye/Dockerfile | 6 ++--- 3.3-rc/alpine3.18/Dockerfile | 6 ++--- 3.3-rc/alpine3.19/Dockerfile | 6 ++--- 3.3-rc/bookworm/Dockerfile | 6 ++--- 3.3-rc/bullseye/Dockerfile | 6 ++--- 3.3-rc/slim-bookworm/Dockerfile | 6 ++--- 3.3-rc/slim-bullseye/Dockerfile | 6 ++--- rust.json | 48 ++++++++++++++++----------------- versions.json | 40 +++++++++++++-------------- 14 files changed, 80 insertions(+), 80 deletions(-) diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.18/Dockerfile index 86d177b2c7..b80ebd39d8 100644 --- a/3.2/alpine3.18/Dockerfile +++ b/3.2/alpine3.18/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 7488be0616..f5dfda1f1e 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index b56f1ce1f1..522d36dfd4 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -36,8 +36,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -49,7 +49,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index d4d54ffdc3..273e0b659f 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -36,8 +36,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -49,7 +49,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 9adf74dee0..c618e9a26d 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 775022ad6f..363ec92e44 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index fe6842ccbf..1e2ea36e3d 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -67,8 +67,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -80,7 +80,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/alpine3.19/Dockerfile b/3.3-rc/alpine3.19/Dockerfile index 8f3f77250b..9bacaf1988 100644 --- a/3.3-rc/alpine3.19/Dockerfile +++ b/3.3-rc/alpine3.19/Dockerfile @@ -67,8 +67,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -80,7 +80,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile index 730b40709e..37458ffacc 100644 --- a/3.3-rc/bookworm/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -36,8 +36,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -49,7 +49,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index 4d3a02387f..090343d4aa 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -36,8 +36,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -49,7 +49,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile index a50cfca375..a38c85f40e 100644 --- a/3.3-rc/slim-bookworm/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -75,7 +75,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index fbd06f7a18..602e952142 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -75,7 +75,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.66.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/rust.json b/rust.json index d510f93c78..d95ed803a2 100644 --- a/rust.json +++ b/rust.json @@ -1,83 +1,83 @@ { "rust": { - "version": "1.66.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm32v5": { "glibc": { "arch": "arm-unknown-linux-gnueabi", - "sha256": "0bd9ba41cd40945b4cadc5a8acb3a926c61f7cce5747120a0e213aae1b4ea30a", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/arm-unknown-linux-gnueabi/rustup-init" + "sha256": "1fca5ad0f877f65c76f07bb0cbbe22c28b6e4ba883bf057f1a05636e8e2a4b40", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabi/rustup-init" } }, "arm32v6": { "glibc": { "arch": "arm-unknown-linux-gnueabihf", - "sha256": "aad75c7c586fd5a8cc8a7153d7e574bb7a8bf39b99dd7d9dab7425143fa4a999", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/arm-unknown-linux-gnueabihf/rustup-init" + "sha256": "8f7801e93ec2c80e0253cba0e25c1085f92e8f49c7ddf9930be62d13361bd808", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabihf/rustup-init" } }, "arm32v7": { "glibc": { "arch": "armv7-unknown-linux-gnueabihf", - "sha256": "48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/armv7-unknown-linux-gnueabihf/rustup-init" + "sha256": "f21c44b01678c645d8fbba1e55e4180a01ac5af2d38bcbd14aa665e0d96ed69a", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/armv7-unknown-linux-gnueabihf/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } }, "i386": { "glibc": { "arch": "i686-unknown-linux-gnu", - "sha256": "0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/i686-unknown-linux-gnu/rustup-init" + "sha256": "e7b0f47557c1afcd86939b118cbcf7fb95a5d1d917bdd355157b63ca00fc4333", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/i686-unknown-linux-gnu/rustup-init" } }, "mips64le": { "glibc": { "arch": "mips64el-unknown-linux-gnuabi64", - "sha256": "e69193145f5f2574bf79f355b46dae3d747e8afef511aa015445c51c4d057c6f", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/mips64el-unknown-linux-gnuabi64/rustup-init" + "sha256": "b8a30dd0d0ba34324c5b2399e76ba44e50a036439cb66c92aef62b485fdc97c8", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/mips64el-unknown-linux-gnuabi64/rustup-init" } }, "ppc64le": { "glibc": { "arch": "powerpc64le-unknown-linux-gnu", - "sha256": "774f62fd927f6c29499a6caee8f534e796161321ec35435788971629bb55af8e", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/powerpc64le-unknown-linux-gnu/rustup-init" + "sha256": "1032934fb154ad2d365e02dcf770c6ecfaec6ab2987204c618c21ba841c97b44", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/powerpc64le-unknown-linux-gnu/rustup-init" } }, "s390x": { "glibc": { "arch": "s390x-unknown-linux-gnu", - "sha256": "cf5965d0e3b5f53b51d19b84c7cae2996d69277cdf280a9c07fe47418233dde9", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/s390x-unknown-linux-gnu/rustup-init" + "sha256": "414210ffd294a39ee5963e05d9f5a8435945657a1ddf74b14fd63f6eb898d69e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/s390x-unknown-linux-gnu/rustup-init" } } }, - "version": "1.25.1" + "version": "1.26.0" } } diff --git a/versions.json b/versions.json index 08893fa2e2..f51c03b6a8 100644 --- a/versions.json +++ b/versions.json @@ -24,36 +24,36 @@ }, "3.2": { "rust": { - "version": "1.66.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.25.1" + "version": "1.26.0" }, "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", "variants": [ @@ -68,36 +68,36 @@ }, "3.3-rc": { "rust": { - "version": "1.66.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda", - "url": "https://static.rust-lang.org/rustup/archive/1.25.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.25.1" + "version": "1.26.0" }, "sha256": "f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355", "variants": [ From b166ecb60c263e8880edf86b3fc8c620f7647e8e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 11 Dec 2023 04:03:21 -0800 Subject: [PATCH 365/462] Update 3.3-rc to 3.3.0-rc1 --- 3.3-rc/alpine3.18/Dockerfile | 4 ++-- 3.3-rc/alpine3.19/Dockerfile | 4 ++-- 3.3-rc/bookworm/Dockerfile | 4 ++-- 3.3-rc/bullseye/Dockerfile | 4 ++-- 3.3-rc/slim-bookworm/Dockerfile | 4 ++-- 3.3-rc/slim-bullseye/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index 1e2ea36e3d..12730d35c3 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/alpine3.19/Dockerfile b/3.3-rc/alpine3.19/Dockerfile index 9bacaf1988..05358035e7 100644 --- a/3.3-rc/alpine3.19/Dockerfile +++ b/3.3-rc/alpine3.19/Dockerfile @@ -27,8 +27,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile index 37458ffacc..7993f281a6 100644 --- a/3.3-rc/bookworm/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index 090343d4aa..c73d4e0f46 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile index a38c85f40e..8c68665b83 100644 --- a/3.3-rc/slim-bookworm/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index 602e952142..9bb0bf1124 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -30,8 +30,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 ENV RUBY_MAJOR 3.3-rc -ENV RUBY_VERSION 3.3.0-preview3 -ENV RUBY_DOWNLOAD_SHA256 f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355 +ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index f51c03b6a8..942667adaa 100644 --- a/versions.json +++ b/versions.json @@ -99,7 +99,7 @@ }, "version": "1.26.0" }, - "sha256": "f79afcf122dc7d04fe26cfa4436b9c488b21766fc54b0d2dfb2ba41cd0cdd355", + "sha256": "051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290", "variants": [ "bookworm", "slim-bookworm", @@ -108,6 +108,6 @@ "alpine3.19", "alpine3.18" ], - "version": "3.3.0-preview3" + "version": "3.3.0-rc1" } } From 25e8353781fe722e4cb5d926f49a2c799456d22c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Dec 2023 15:26:47 -0800 Subject: [PATCH 366/462] Finally parse upstream releases data properly This ports our `versions.sh` script to finally actually parse https://github.com/ruby/www.ruby-lang.org/raw/master/_data/releases.yml directly instead of scraping the data from the webpages generated from it. Additionally, this *should* allow us to automatically pick up GA releases after the pre-release (we can find out whether it worked next week!) --- .gitignore | 1 + 3.3-rc/alpine3.18/Dockerfile | 6 +- 3.3-rc/alpine3.19/Dockerfile | 6 +- 3.3-rc/bookworm/Dockerfile | 6 +- 3.3-rc/bullseye/Dockerfile | 6 +- 3.3-rc/slim-bookworm/Dockerfile | 6 +- 3.3-rc/slim-bullseye/Dockerfile | 6 +- Dockerfile.template | 15 +++- apply-templates.sh | 5 ++ generate-stackbrew-library.sh | 7 +- versions.json | 153 ++++++++++++++++++++++++++----- versions.sh | 155 ++++++++++++++++++-------------- 12 files changed, 267 insertions(+), 105 deletions(-) diff --git a/.gitignore b/.gitignore index d548f66de0..da4ffd7830 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .jq-template.awk +.yq* diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile index 12730d35c3..6e65161149 100644 --- a/3.3-rc/alpine3.18/Dockerfile +++ b/3.3-rc/alpine3.18/Dockerfile @@ -26,8 +26,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -86,7 +88,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.3-rc/alpine3.19/Dockerfile b/3.3-rc/alpine3.19/Dockerfile index 05358035e7..13557e7995 100644 --- a/3.3-rc/alpine3.19/Dockerfile +++ b/3.3-rc/alpine3.19/Dockerfile @@ -26,8 +26,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -86,7 +88,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile index 7993f281a6..12727ffe31 100644 --- a/3.3-rc/bookworm/Dockerfile +++ b/3.3-rc/bookworm/Dockerfile @@ -15,8 +15,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -55,7 +57,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile index c73d4e0f46..dd3f4a6e21 100644 --- a/3.3-rc/bullseye/Dockerfile +++ b/3.3-rc/bullseye/Dockerfile @@ -15,8 +15,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -55,7 +57,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile index 8c68665b83..17bb114152 100644 --- a/3.3-rc/slim-bookworm/Dockerfile +++ b/3.3-rc/slim-bookworm/Dockerfile @@ -29,8 +29,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -81,7 +83,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile index 9bb0bf1124..e87831cdc7 100644 --- a/3.3-rc/slim-bullseye/Dockerfile +++ b/3.3-rc/slim-bullseye/Dockerfile @@ -29,8 +29,10 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.3-rc + +# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ ENV RUBY_VERSION 3.3.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 # some of ruby's build scripts are written in ruby @@ -81,7 +83,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/Dockerfile.template b/Dockerfile.template index c81cc16bdb..4cb9f1ea37 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -50,9 +50,17 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 +{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}} ENV RUBY_MAJOR {{ env.version }} ENV RUBY_VERSION {{ .version }} -ENV RUBY_DOWNLOAD_SHA256 {{ .sha256 }} +ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} +{{ ) else ( -}} + +# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }} +ENV RUBY_VERSION {{ .version }} +ENV RUBY_DOWNLOAD_URL {{ .url.xz }} +ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} +{{ ) end -}} # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -189,7 +197,12 @@ RUN set -eux; \ fi; \ {{ ) else "" end -}} \ +{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}} +{{ if .url.xz != "https://cache.ruby-lang.org/pub/ruby/\(env.version | rtrimstr("-rc"))/ruby-\(.version).tar.xz" then error("url for \(.version) is not as expected!") else "" end -}} wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ +{{ ) else ( -}} + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ +{{ ) end -}} echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/apply-templates.sh b/apply-templates.sh index 7f9da43e19..9ed389b588 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -32,6 +32,11 @@ for version; do rm -rf "$version/" + if jq -e '.[env.version] | not' versions.json > /dev/null; then + echo "deleting $version ..." + continue + fi + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 398f7d4f36..4e3679a087 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -75,11 +75,14 @@ join() { for version; do export version + + if ! fullVersion="$(jq -er '.[env.version] | if . then .version else empty end' versions.json)"; then + continue + fi + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" - fullVersion="$(jq -r '.[env.version].version' versions.json)" - versionAliases=( $fullVersion $version diff --git a/versions.json b/versions.json index 942667adaa..99ffa1b602 100644 --- a/versions.json +++ b/versions.json @@ -1,17 +1,70 @@ { "3.0": { - "sha256": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1", + "version": "3.0.6", + "date": "2023-03-30", + "post": "/en/news/2023/03/30/ruby-3-0-6-released/", + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.zip" + }, + "size": { + "gz": 21315725, + "xz": 15864560, + "zip": 25694359 + }, + "sha1": { + "gz": "1052441f0abbb0302fb9f1481d2db99dfb4d4c29", + "xz": "7880c34d7193224e967163b12f33bf7aaf7304f6", + "zip": "e75d1bc14dd89c176145dc3968774e30f3a17652" + }, + "sha256": { + "gz": "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e", + "xz": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1", + "zip": "428d518d12f09df4146fc31dbed47c8d7e10fcccd2426948e5c0862d9321480d" + }, + "sha512": { + "gz": "d596bfd374ae777717379b409afe8ee1655ade0c0539ada7a10af4780b818efe25a28aa50a2a7226741d1776d744e10ad916641f9d12fb31c7444b0a01d0e0cc", + "xz": "abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8", + "zip": "576d11c668acac57cf4952228b148d17f16ab1dc491145355a4f2068b15f6cab8a4007a84d9d1eda4c1b62837675c82be99ebe6379c314f46c6ebbbf89677b5e" + }, "variants": [ "bullseye", "slim-bullseye", "buster", "slim-buster", "alpine3.16" - ], - "version": "3.0.6" + ] }, "3.1": { - "sha256": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f", + "version": "3.1.4", + "date": "2023-03-30", + "post": "/en/news/2023/03/30/ruby-3-1-4-released/", + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.zip" + }, + "size": { + "gz": 20917933, + "xz": 15316604, + "zip": 25241255 + }, + "sha1": { + "gz": "38eddfc5a7536b6c8133183563009a4ed9bbe6db", + "xz": "2e2fbf43b7db6f24280548a3544912535bed8212", + "zip": "1061632623caa82a68a04a35777ed8f1797a9f8f" + }, + "sha256": { + "gz": "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6", + "xz": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f", + "zip": "1fce1ab3d61d10a857dc821dab6e77fa41d0663c5dbbfaa5d9b9c2bdec5ce303" + }, + "sha512": { + "gz": "41cf1561dd7eb249bb2c2f5ea958884880648cc1d11da9315f14158a2d0ff94b2c5c7d75291a67e57e1813d2ec7b618e5372a9f18ee93be6ed306f47b0d3199a", + "xz": "a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633", + "zip": "3a334302df97c2c7fec3c2d05d19a40b1ec6f95fef52c85d397196ce62fac4834f96783f0ac7fcba6e2a670f004bcc275db6f1810ace6c68a594e7d2fd9b297b" + }, "variants": [ "bookworm", "slim-bookworm", @@ -19,10 +72,45 @@ "slim-bullseye", "alpine3.19", "alpine3.18" - ], - "version": "3.1.4" + ] }, "3.2": { + "version": "3.2.2", + "date": "2023-03-30", + "post": "/en/news/2023/03/30/ruby-3-2-2-released/", + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.zip" + }, + "size": { + "gz": 20467023, + "xz": 15118856, + "zip": 24615317 + }, + "sha1": { + "gz": "670fce00d83771a1349b116e56a8a3b0ad323769", + "xz": "087af286b70b0e17f88c9c4469b471eca2010161", + "zip": "a1b6d57019d41dca269b4b16a80784755d34b81d" + }, + "sha256": { + "gz": "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc", + "xz": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", + "zip": "cc216ecb4f49064d8f44e10ecf9218cfd7b28cf4168bb79ecdf171e321db4af1" + }, + "sha512": { + "gz": "bcc68f3f24c1c8987d9c80b57332e5791f25b935ba38daf5addf60dbfe3a05f9dcaf21909681b88e862c67c6ed103150f73259c6e35c564f13a00f432e3c1e46", + "xz": "a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935", + "zip": "569a68d89cc9a646cd0319d7cb8d57df3a55c0ac2c64f1f61607cc9c06b3aa8415eb8d38f7893ab3dbf072da9e919fbc454a9338e924c20a6a5110a1fa301d52" + }, + "variants": [ + "bookworm", + "slim-bookworm", + "bullseye", + "slim-bullseye", + "alpine3.19", + "alpine3.18" + ], "rust": { "version": "1.74.1" }, @@ -54,8 +142,44 @@ } }, "version": "1.26.0" + } + }, + "3.3": null, + "3.3-rc": { + "version": "3.3.0-rc1", + "date": "2023-12-11", + "post": "/en/news/2023/12/11/ruby-3-3-0-rc1-released/", + "tag": "v3_3_0_rc1", + "stats": { + "files_changed": 5414, + "insertions": 306141, + "deletions": 183575 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz" + }, + "size": { + "gz": 21783575, + "zip": 26735443, + "xz": 16163884 + }, + "sha1": { + "gz": "c75a860e06f27b7f69b874757417277c21d1d3f4", + "zip": "35583453a7734216b08829ef0ec9ea1bc0d4ae7f", + "xz": "26503f9bdc7d0a05aaa9836f54d3aa9e74a9ead9" + }, + "sha256": { + "gz": "c4ff82395a90ef76c7f906b7687026e0ab96b094dcf3a532d9ab97784a073222", + "zip": "56dd82e1dd714f2889ca975ae7befbe005675de08839c2cc4a484de2ae65201c", + "xz": "051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290" + }, + "sha512": { + "gz": "265fb2ffe55af47d8349edffcebe749cc170291227cef55529fe4e67363e4e84b88daa34ffb5364a99c8a0e32110266a34c9a11d62f3bd6f6d47fa76eca641f4", + "zip": "7fbe414c230aedc9f364512bcbc213038f8f6e4268929a559d2527e2f3e32a140b394e37098ab7e59161236eca8b89cc9e52d73a3be8d7bd44faa91681483f5d", + "xz": "82f4acfaad1dc47db27ee3eb952481a95b3474a98059e9e9f5ceb035b690d1faabe99f2ec52371c4089ed1615eb10c395f029088418fec4d26399b65b4f259b9" }, - "sha256": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", "variants": [ "bookworm", "slim-bookworm", @@ -64,9 +188,6 @@ "alpine3.19", "alpine3.18" ], - "version": "3.2.2" - }, - "3.3-rc": { "rust": { "version": "1.74.1" }, @@ -98,16 +219,6 @@ } }, "version": "1.26.0" - }, - "sha256": "051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290", - "variants": [ - "bookworm", - "slim-bookworm", - "bullseye", - "slim-bullseye", - "alpine3.19", - "alpine3.18" - ], - "version": "3.3.0-rc1" + } } } diff --git a/versions.sh b/versions.sh index 061ee394a1..6b8b185335 100755 --- a/versions.sh +++ b/versions.sh @@ -12,9 +12,26 @@ else fi versions=( "${versions[@]%/}" ) -releasesPage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/' | grep -A 2 'Ruby')" # very wide grep to cut down on "set -x" output when debugging (should match the one later) -newsPage="$(curl -fsSL 'https://www.ruby-lang.org/en/news/' | grep 'Released')" # occasionally, releases don't show up on the Releases page (see https://github.com/ruby/www.ruby-lang.org/blob/master/_data/releases.yml) -# TODO consider parsing https://github.com/ruby/www.ruby-lang.org/blob/master/_data/downloads.yml as well +yq='./.yq' +# https://github.com/mikefarah/yq/releases +# TODO detect host architecture +yqUrl='https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64' +yqSha256='0d6aaf1cf44a8d18fbc7ed0ef14f735a8df8d2e314c4cc0f0242d35c0a440c95' +if command -v yq &> /dev/null; then + # TODO verify that the "yq" in PATH is https://github.com/mikefarah/yq, not the python-based version you'd get from "apt-get install yq" somehow? maybe they're compatible enough for our needs that it doesn't matter? + yq='yq' +elif [ ! -x "$yq" ] || ! sha256sum <<<"$yqSha256 *$yq" --quiet --strict --check; then + wget -qO "$yq.new" "$yqUrl" + sha256sum <<<"$yqSha256 *$yq.new" --quiet --strict --check + chmod +x "$yq.new" + "$yq.new" --version + mv "$yq.new" "$yq" +fi + +releases="$( + wget -qO- 'https://github.com/ruby/www.ruby-lang.org/raw/master/_data/releases.yml' \ + | "$yq" -r '@json' # this *should* work on both the Go-based "yq" we download and the Python-based "yq" available from Debian's APT repo +)" for version in "${versions[@]}"; do rcGrepV='-v' @@ -24,75 +41,70 @@ for version in "${versions[@]}"; do fi export version rcVersion - IFS=$'\n'; allVersions=( $( - curl -fsSL --compressed "https://cache.ruby-lang.org/pub/ruby/$rcVersion/" \ - | grep -oE '["/]ruby-'"$rcVersion"'.[^"]+\.tar\.xz' \ - | sed -r 's!^["/]ruby-([^"]+)[.]tar[.]xz!\1!' \ - | grep $rcGrepV -E 'preview|rc' \ - | sort -ruV - ) ); unset IFS - - fullVersion= - shaVal= - for tryVersion in "${allVersions[@]}"; do - if \ - { - versionReleasePage="$(grep "Ruby $tryVersion" -A 2 <<<"$releasesPage" | awk -F '"' '$1 == "Ruby '"$tryVersion"' Released' <<<"$newsPage" | cut -d'"' -f2)" \ - && [ -n "$versionReleasePage" ] \ - && shaVal="$(curl -fsL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$tryVersion.tar.xz" -A 5)" \ - && shaVal="$(awk <<<"$shaVal" '$1 == "SHA256:" { print $2; exit }')" \ - && [ -n "$shaVal" ] - } \ - ; then - fullVersion="$tryVersion" - break - fi - done + doc="$(jq <<<"$releases" -c ' + map( + select( + .version + # exact versions ("3.1.0-preview1") should match exactly but "X.Y" or "X.Y-rc" should fuzzy match appropriately + | . == env.version or ( + ( + startswith(env.rcVersion + ".") + or startswith(env.rcVersion + "-") + ) and ( + contains("preview") or contains("rc") + | if env.version == env.rcVersion then not else . end + ) + ) + ) + ) + | first // empty + ')" - if [ -z "$fullVersion" ]; then - echo >&2 "error: cannot determine sha for $version (tried all of ${allVersions[*]})" - exit 1 + if [ -z "$doc" ]; then + echo >&2 "warning: skipping/removing '$version' (does not appear to exist upstream)" + json="$(jq <<<"$json" -c '.[env.version] = null')" + continue fi - echo "$version: $fullVersion; $shaVal" + fullVersion="$(jq <<<"$doc" -r '.version')" + echo "$version: $fullVersion" - export fullVersion shaVal - doc="$(jq -nc ' - { - version: env.fullVersion, - sha256: env.shaVal, - variants: [ - ( - # https://bugs.ruby-lang.org/issues/18658 - # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if "3.0" == env.version then - "bullseye", - "buster" - else - "bookworm", - "bullseye", - empty # trailing comma hack - end - | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 - ( - # Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0 - # https://bugs.ruby-lang.org/issues/18658 - # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if "3.0" == env.version then "3.16" else - "3.19", - "3.18", - empty # trailing comma hack - end - | "alpine" + .) - ], - } + if [ "$rcVersion" != "$version" ] && gaFullVersion="$(jq <<<"$json" -er '.[env.rcVersion] | if . then .version else empty end')"; then + # Ruby pre-releases have only been for .0 since ~2011, so if our pre-release now has a relevant GA, it should go away 👀 + # just in case, we'll also do a version comparison to make sure we don't have a pre-release that's newer than the relevant GA + latestVersion="$({ echo "$fullVersion"; echo "$gaFullVersion"; } | sort -V | tail -1)" + if [[ "$fullVersion" == "$gaFullVersion"* ]] || [ "$latestVersion" = "$gaFullVersion" ]; then + # "x.y.z-rc1" == x.y.z* + json="$(jq <<<"$json" -c 'del(.[env.rcVersion])')" + continue + fi + fi + + doc="$(jq <<<"$doc" -c ' + .variants = [ + ( + # https://bugs.ruby-lang.org/issues/18658 + # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 + if "3.0" == env.version then + "bullseye", + "buster" + else + "bookworm", + "bullseye", + empty # trailing comma hack + end + | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 + ( + # Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0 + # https://bugs.ruby-lang.org/issues/18658 + # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 + if "3.0" == env.version then "3.16" else + "3.19", + "3.18", + empty # trailing comma hack + end + | "alpine" + .) + ] ')" case "$rcVersion" in @@ -113,6 +125,11 @@ for version in "${versions[@]}"; do esac json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" + + # make sure pre-release versions have a placeholder for GA + if [ "$version" != "$rcVersion" ]; then + json="$(jq <<<"$json" -c '.[env.rcVersion] //= null')" + fi done -jq <<<"$json" -S . > versions.json +jq <<<"$json" 'to_entries | sort_by(.key) | from_entries' > versions.json From 088718f389d35483e0cd87354adf7b0f1d0d789e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Dec 2023 17:03:24 -0800 Subject: [PATCH 367/462] Automate "latest" and "3" aliases --- generate-stackbrew-library.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 4e3679a087..da9269d380 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash set -Eeuo pipefail -declare -A aliases=( - [3.2]='3 latest' -) - self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -73,6 +69,11 @@ join() { echo "${out#$sep}" } +declare -A latest=( + #[3]='3.2' + #[latest]='3.2' +) + for version; do export version @@ -86,9 +87,17 @@ for version; do versionAliases=( $fullVersion $version - ${aliases[$version]:-} ) + if [ "$version" = "${version%-rc}" ]; then + for a in "${version%%.*}" latest; do # "3", "latest" + if [ -z "${latest[$a]:-}" ]; then + latest[$a]="$version" + versionAliases+=( "$a" ) + fi + done + fi + defaultDebianVariant="$(jq -r ' .[env.version].variants | map(select( From 04ee24d72e947d3834c9153de4a794010c71d921 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 26 Dec 2023 10:21:17 -0800 Subject: [PATCH 368/462] Fix bug with 3.3.0 deleting 3.3 instead of 3.3-rc --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index 6b8b185335..65edfc8e5c 100755 --- a/versions.sh +++ b/versions.sh @@ -75,7 +75,7 @@ for version in "${versions[@]}"; do latestVersion="$({ echo "$fullVersion"; echo "$gaFullVersion"; } | sort -V | tail -1)" if [[ "$fullVersion" == "$gaFullVersion"* ]] || [ "$latestVersion" = "$gaFullVersion" ]; then # "x.y.z-rc1" == x.y.z* - json="$(jq <<<"$json" -c 'del(.[env.rcVersion])')" + json="$(jq <<<"$json" -c 'del(.[env.version])')" continue fi fi From 52e176c1dee983d991d9cff0c6371f5c50bfd636 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 26 Dec 2023 10:22:18 -0800 Subject: [PATCH 369/462] Update 3.3 to 3.3.0, rust 1.74.1, rustup 1.26.0 --- 3.3/alpine3.18/Dockerfile | 165 +++++++++++++++++++++++++++++++++++ 3.3/alpine3.19/Dockerfile | 165 +++++++++++++++++++++++++++++++++++ 3.3/bookworm/Dockerfile | 120 +++++++++++++++++++++++++ 3.3/bullseye/Dockerfile | 120 +++++++++++++++++++++++++ 3.3/slim-bookworm/Dockerfile | 146 +++++++++++++++++++++++++++++++ 3.3/slim-bullseye/Dockerfile | 146 +++++++++++++++++++++++++++++++ versions.json | 77 +++++++++++++++- 7 files changed, 938 insertions(+), 1 deletion(-) create mode 100644 3.3/alpine3.18/Dockerfile create mode 100644 3.3/alpine3.19/Dockerfile create mode 100644 3.3/bookworm/Dockerfile create mode 100644 3.3/bullseye/Dockerfile create mode 100644 3.3/slim-bookworm/Dockerfile create mode 100644 3.3/slim-bullseye/Dockerfile diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile new file mode 100644 index 0000000000..74a9ed71ab --- /dev/null +++ b/3.3/alpine3.18/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile new file mode 100644 index 0000000000..ca56f0f9f3 --- /dev/null +++ b/3.3/alpine3.19/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.19 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bison \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile new file mode 100644 index 0000000000..ec774551c9 --- /dev/null +++ b/3.3/bookworm/Dockerfile @@ -0,0 +1,120 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile new file mode 100644 index 0000000000..a2f0cdd3f2 --- /dev/null +++ b/3.3/bullseye/Dockerfile @@ -0,0 +1,120 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..a873fb2ec5 --- /dev/null +++ b/3.3/slim-bookworm/Dockerfile @@ -0,0 +1,146 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..58b43445aa --- /dev/null +++ b/3.3/slim-bullseye/Dockerfile @@ -0,0 +1,146 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +ENV RUBY_VERSION 3.3.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bison \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 99ffa1b602..66d79d94c4 100644 --- a/versions.json +++ b/versions.json @@ -144,7 +144,82 @@ "version": "1.26.0" } }, - "3.3": null, + "3.3": { + "version": "3.3.0", + "date": "2023-12-25", + "post": "/en/news/2023/12/25/ruby-3-3-0-released/", + "tag": "v3_3_0", + "stats": { + "files_changed": 5532, + "insertions": 326851, + "deletions": 185793 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz" + }, + "size": { + "gz": 22065999, + "zip": 26935108, + "xz": 16345456 + }, + "sha1": { + "gz": "1a7e56851bf29bda1183aca99b3b323c58e0187b", + "zip": "a433eef1d7f96daeaf3b4cb842d0ed2dd82e7dc1", + "xz": "c8f68e1b0a114b90460a0b44165a3b2f540fa5b6" + }, + "sha256": { + "gz": "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d", + "zip": "0e6563f679dd3694732eb3addf9de681c67b584602ac574376b60e7a509d2cd8", + "xz": "676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b" + }, + "sha512": { + "gz": "26074009b501fc793d71a74e419f34a6033c9353433919ca74ba2d24a3de432dbb11fd92c2bc285f0e4d951a6d6c74bf5b69a2ab36200c8c26e871746d6e0fc6", + "zip": "a94a85937a14b217c1f4b90d24185289ed4aee79239c4f3eecf8034d3fd34e65ee8d66869473857ed153067188adc9b70c0471e4ebe842c9f98ef60c34090450", + "xz": "7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01" + }, + "variants": [ + "bookworm", + "slim-bookworm", + "bullseye", + "slim-bullseye", + "alpine3.19", + "alpine3.18" + ], + "rust": { + "version": "1.74.1" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.26.0" + } + }, "3.3-rc": { "version": "3.3.0-rc1", "date": "2023-12-11", From 8af6f2310287cacc8abaf012b1276a3df1d29a90 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 26 Dec 2023 10:34:06 -0800 Subject: [PATCH 370/462] Update 3.3-rc --- 3.3-rc/alpine3.18/Dockerfile | 165 -------------------------------- 3.3-rc/alpine3.19/Dockerfile | 165 -------------------------------- 3.3-rc/bookworm/Dockerfile | 120 ----------------------- 3.3-rc/bullseye/Dockerfile | 120 ----------------------- 3.3-rc/slim-bookworm/Dockerfile | 146 ---------------------------- 3.3-rc/slim-bullseye/Dockerfile | 146 ---------------------------- versions.json | 76 --------------- 7 files changed, 938 deletions(-) delete mode 100644 3.3-rc/alpine3.18/Dockerfile delete mode 100644 3.3-rc/alpine3.19/Dockerfile delete mode 100644 3.3-rc/bookworm/Dockerfile delete mode 100644 3.3-rc/bullseye/Dockerfile delete mode 100644 3.3-rc/slim-bookworm/Dockerfile delete mode 100644 3.3-rc/slim-bullseye/Dockerfile diff --git a/3.3-rc/alpine3.18/Dockerfile b/3.3-rc/alpine3.18/Dockerfile deleted file mode 100644 index 6e65161149..0000000000 --- a/3.3-rc/alpine3.18/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.18 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.3-rc/alpine3.19/Dockerfile b/3.3-rc/alpine3.19/Dockerfile deleted file mode 100644 index 13557e7995..0000000000 --- a/3.3-rc/alpine3.19/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.19 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.3-rc/bookworm/Dockerfile b/3.3-rc/bookworm/Dockerfile deleted file mode 100644 index 12727ffe31..0000000000 --- a/3.3-rc/bookworm/Dockerfile +++ /dev/null @@ -1,120 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bookworm - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.3-rc/bullseye/Dockerfile b/3.3-rc/bullseye/Dockerfile deleted file mode 100644 index dd3f4a6e21..0000000000 --- a/3.3-rc/bullseye/Dockerfile +++ /dev/null @@ -1,120 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.3-rc/slim-bookworm/Dockerfile b/3.3-rc/slim-bookworm/Dockerfile deleted file mode 100644 index 17bb114152..0000000000 --- a/3.3-rc/slim-bookworm/Dockerfile +++ /dev/null @@ -1,146 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.3-rc/slim-bullseye/Dockerfile b/3.3-rc/slim-bullseye/Dockerfile deleted file mode 100644 index e87831cdc7..0000000000 --- a/3.3-rc/slim-bullseye/Dockerfile +++ /dev/null @@ -1,146 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2023/12/11/ruby-3-3-0-rc1-released/ -ENV RUBY_VERSION 3.3.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/versions.json b/versions.json index 66d79d94c4..360d1888bd 100644 --- a/versions.json +++ b/versions.json @@ -219,81 +219,5 @@ }, "version": "1.26.0" } - }, - "3.3-rc": { - "version": "3.3.0-rc1", - "date": "2023-12-11", - "post": "/en/news/2023/12/11/ruby-3-3-0-rc1-released/", - "tag": "v3_3_0_rc1", - "stats": { - "files_changed": 5414, - "insertions": 306141, - "deletions": 183575 - }, - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0-rc1.tar.xz" - }, - "size": { - "gz": 21783575, - "zip": 26735443, - "xz": 16163884 - }, - "sha1": { - "gz": "c75a860e06f27b7f69b874757417277c21d1d3f4", - "zip": "35583453a7734216b08829ef0ec9ea1bc0d4ae7f", - "xz": "26503f9bdc7d0a05aaa9836f54d3aa9e74a9ead9" - }, - "sha256": { - "gz": "c4ff82395a90ef76c7f906b7687026e0ab96b094dcf3a532d9ab97784a073222", - "zip": "56dd82e1dd714f2889ca975ae7befbe005675de08839c2cc4a484de2ae65201c", - "xz": "051815637f1fa75a1edf2c54b66d5d5b69563daad777da8dc39543b7754b5290" - }, - "sha512": { - "gz": "265fb2ffe55af47d8349edffcebe749cc170291227cef55529fe4e67363e4e84b88daa34ffb5364a99c8a0e32110266a34c9a11d62f3bd6f6d47fa76eca641f4", - "zip": "7fbe414c230aedc9f364512bcbc213038f8f6e4268929a559d2527e2f3e32a140b394e37098ab7e59161236eca8b89cc9e52d73a3be8d7bd44faa91681483f5d", - "xz": "82f4acfaad1dc47db27ee3eb952481a95b3474a98059e9e9f5ceb035b690d1faabe99f2ec52371c4089ed1615eb10c395f029088418fec4d26399b65b4f259b9" - }, - "variants": [ - "bookworm", - "slim-bookworm", - "bullseye", - "slim-bullseye", - "alpine3.19", - "alpine3.18" - ], - "rust": { - "version": "1.74.1" - }, - "rustup": { - "arches": { - "amd64": { - "glibc": { - "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" - } - }, - "arm64v8": { - "glibc": { - "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" - } - } - }, - "version": "1.26.0" - } } } From fae67e79854356f406825bcd9c7e1bf2e5772579 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 3 Jan 2024 11:12:23 -0800 Subject: [PATCH 371/462] Update GHA YAML with bashbrew example improvements (esp. concurrency:) --- .github/workflows/ci.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3860c115ce..61ffb56ef1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: GitHub CI on: pull_request: push: + workflow_dispatch: schedule: - cron: 0 0 * * 0 @@ -10,6 +11,13 @@ defaults: run: shell: 'bash -Eeuo pipefail -x {0}' +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + jobs: generate-jobs: @@ -24,8 +32,11 @@ jobs: name: Generate Jobs run: | strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")" - echo "strategy=$strategy" >> "$GITHUB_OUTPUT" - jq . <<<"$strategy" # sanity check / debugging aid + + EOF="EOF-$RANDOM-$RANDOM-$RANDOM" + echo "strategy<<$EOF" >> "$GITHUB_OUTPUT" + jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT" + echo "$EOF" >> "$GITHUB_OUTPUT" test: needs: generate-jobs From c473741514de6aa1e3ccdf3a9c6df0aa71348ce3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jan 2024 04:03:17 -0800 Subject: [PATCH 372/462] Update 3.2 to 3.2.3 --- 3.2/alpine3.18/Dockerfile | 10 ++++++---- 3.2/alpine3.19/Dockerfile | 10 ++++++---- 3.2/bookworm/Dockerfile | 10 ++++++---- 3.2/bullseye/Dockerfile | 10 ++++++---- 3.2/slim-bookworm/Dockerfile | 10 ++++++---- 3.2/slim-bullseye/Dockerfile | 10 ++++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 54 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.18/Dockerfile index b80ebd39d8..800f1b611b 100644 --- a/3.2/alpine3.18/Dockerfile +++ b/3.2/alpine3.18/Dockerfile @@ -26,9 +26,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -87,7 +89,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index f5dfda1f1e..a8b51c1294 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -26,9 +26,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -87,7 +89,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 522d36dfd4..f87fe76f9e 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -55,7 +57,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 273e0b659f..e753e00b32 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -55,7 +57,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index c618e9a26d..d5f809841b 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -82,7 +84,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 363ec92e44..189b7ff567 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.2 -ENV RUBY_VERSION 3.2.2 -ENV RUBY_DOWNLOAD_SHA256 4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 + +# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ +ENV RUBY_VERSION 3.2.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -82,7 +84,7 @@ RUN set -eux; \ cargo --version; \ fi; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/versions.json b/versions.json index 360d1888bd..0e183389b6 100644 --- a/versions.json +++ b/versions.json @@ -75,33 +75,33 @@ ] }, "3.2": { - "version": "3.2.2", - "date": "2023-03-30", - "post": "/en/news/2023/03/30/ruby-3-2-2-released/", + "version": "3.2.3", + "date": "2024-01-18", + "post": "/en/news/2024/01/18/ruby-3-2-3-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.zip" }, "size": { - "gz": 20467023, - "xz": 15118856, - "zip": 24615317 + "gz": 20577155, + "xz": 15163960, + "zip": 24734275 }, "sha1": { - "gz": "670fce00d83771a1349b116e56a8a3b0ad323769", - "xz": "087af286b70b0e17f88c9c4469b471eca2010161", - "zip": "a1b6d57019d41dca269b4b16a80784755d34b81d" + "gz": "7f553e514cb42751a61c3a560a7e8d727c6931ca", + "xz": "08e0016c8b96103930aaa3b2323081d8f5756e25", + "zip": "e305dfe36229c5328d231ea0ac03ae5e05bfaca6" }, "sha256": { - "gz": "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc", - "xz": "4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23", - "zip": "cc216ecb4f49064d8f44e10ecf9218cfd7b28cf4168bb79ecdf171e321db4af1" + "gz": "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba", + "xz": "cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b", + "zip": "42aa39f74e5be9e24e4db47e7bfb15dc7e095f7e2295859b355edccf6fab96a2" }, "sha512": { - "gz": "bcc68f3f24c1c8987d9c80b57332e5791f25b935ba38daf5addf60dbfe3a05f9dcaf21909681b88e862c67c6ed103150f73259c6e35c564f13a00f432e3c1e46", - "xz": "a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935", - "zip": "569a68d89cc9a646cd0319d7cb8d57df3a55c0ac2c64f1f61607cc9c06b3aa8415eb8d38f7893ab3dbf072da9e919fbc454a9338e924c20a6a5110a1fa301d52" + "gz": "75aecd9cf87f1fa66b24ecda8837a53162071b4f8801dcfd79119a24c6e81df3e3e2ba478e1cc48c60103dfaab12a00cfa2039a621f8651298eba8bd8d576360", + "xz": "d2a1897c2f4e801a28acb869322abfee76775115016252cecad90639485ed51deda1446cb16edb387f10a2e188602d646ef9b008b57f27bd745071277c535f3b", + "zip": "fd89a0a833df4b5cb1734a7ffc86a8cf7cb3a8e25944331db674d3ad7732f615867e7e214e1fdd61e44e9c9c856b461b46219b340de7c87a758f28f3a99dd172" }, "variants": [ "bookworm", From 90c7a1d6999710f5502d69162a197e979f90bb1a Mon Sep 17 00:00:00 2001 From: hachi8833 Date: Thu, 1 Feb 2024 13:16:26 +0900 Subject: [PATCH 373/462] Remove unnecessary bison for Ruby 3.3.0 https://github.com/ruby/ruby/pull/7798 --- 3.3/alpine3.18/Dockerfile | 1 - 3.3/alpine3.19/Dockerfile | 1 - 3.3/bookworm/Dockerfile | 1 - 3.3/bullseye/Dockerfile | 1 - 3.3/slim-bookworm/Dockerfile | 1 - 3.3/slim-bullseye/Dockerfile | 1 - Dockerfile.template | 6 ++++++ 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile index 74a9ed71ab..a8fc31e8d3 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.18/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .ruby-builddeps \ autoconf \ - bison \ bzip2 \ bzip2-dev \ ca-certificates \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index ca56f0f9f3..09166fdd97 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .ruby-builddeps \ autoconf \ - bison \ bzip2 \ bzip2-dev \ ca-certificates \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index ec774551c9..42ab5f94e7 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -28,7 +28,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index a2f0cdd3f2..3be8ea342d 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -28,7 +28,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index a873fb2ec5..ace67cb4a5 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -42,7 +42,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 58b43445aa..da0533312f 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -42,7 +42,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bison \ dpkg-dev \ libgdbm-dev \ ruby \ diff --git a/Dockerfile.template b/Dockerfile.template index 4cb9f1ea37..b59a19ea71 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -69,7 +69,10 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ +{{ ) else "" end -}} bzip2 \ bzip2-dev \ ca-certificates \ @@ -103,7 +106,10 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ +{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ +{{ ) else "" end -}} dpkg-dev \ libgdbm-dev \ ruby \ From cfdac1e2a0de73395dea8f048eae2541cb26715f Mon Sep 17 00:00:00 2001 From: Daisuke Aritomo Date: Sat, 17 Feb 2024 12:31:21 +0900 Subject: [PATCH 374/462] Workaround 3.3.0 crash on arm64 Ruby 3.3.0 has a bug which crashes many programs on arm64. https://bugs.ruby-lang.org/issues/20085 This bug is fixed in upstream (https://github.com/ruby/ruby/pull/9371) and is planned to be backported, but no date is given yet for the 3.3.1 release. This patch workarounds this bug by applying the upstream fix/backport in https://github.com/ruby/ruby/pull/9385 . Co-authored-by: Tianon Gravi --- 3.3/alpine3.18/Dockerfile | 7 +++++++ 3.3/alpine3.19/Dockerfile | 7 +++++++ 3.3/bookworm/Dockerfile | 7 +++++++ 3.3/bullseye/Dockerfile | 7 +++++++ 3.3/slim-bookworm/Dockerfile | 7 +++++++ 3.3/slim-bullseye/Dockerfile | 7 +++++++ Dockerfile.template | 9 +++++++++ 7 files changed, 51 insertions(+) diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile index a8fc31e8d3..01c0153f14 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.18/Dockerfile @@ -117,6 +117,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 09166fdd97..e3ad15beed 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -117,6 +117,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 42ab5f94e7..79801b37f3 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -75,6 +75,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 3be8ea342d..70b0fd66d1 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -75,6 +75,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index ace67cb4a5..183503cb9c 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -101,6 +101,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index da0533312f..6ed757bea7 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -101,6 +101,13 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/Dockerfile.template b/Dockerfile.template index b59a19ea71..3387f9cb30 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -252,6 +252,15 @@ RUN set -eux; \ export LIBS='-lucontext'; \ ;; \ esac; \ +{{ ) else "" end -}} +{{ if .version == "3.3.0" then ( -}} + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ {{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ From 7ac7122778cc764cd50271807efe2e94775b2c21 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 29 Feb 2024 13:45:14 -0800 Subject: [PATCH 375/462] Apply arm64 patch sooner so `autoconf` regenerates `configure` correctly --- 3.3/alpine3.18/Dockerfile | 3 ++- 3.3/alpine3.19/Dockerfile | 3 ++- 3.3/bookworm/Dockerfile | 3 ++- 3.3/bullseye/Dockerfile | 3 ++- 3.3/slim-bookworm/Dockerfile | 3 ++- 3.3/slim-bullseye/Dockerfile | 3 ++- Dockerfile.template | 19 ++++++++++--------- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile index 01c0153f14..691fd02942 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.18/Dockerfile @@ -116,7 +116,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -124,6 +123,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index e3ad15beed..3c2de30c4a 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -116,7 +116,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -124,6 +123,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 79801b37f3..e66e1a392d 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -74,7 +74,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -82,6 +81,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 70b0fd66d1..33b18b722d 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -74,7 +74,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -82,6 +81,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 183503cb9c..c69e19331d 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -100,7 +100,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -108,6 +107,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 6ed757bea7..020ba65712 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -100,7 +100,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - autoconf; \ # workaround crash on arm64 # https://bugs.ruby-lang.org/issues/20085 # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 @@ -108,6 +107,8 @@ RUN set -eux; \ echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ patch -p1 -i arm64-fix.patch; \ rm arm64-fix.patch; \ + \ + autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/Dockerfile.template b/Dockerfile.template index 3387f9cb30..a01ca4934b 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -238,6 +238,16 @@ RUN set -eux; \ cat file.c; \ } > file.c.new; \ mv file.c.new file.c; \ +{{ if .version == "3.3.0" then ( -}} + \ + # workaround crash on arm64 + # https://bugs.ruby-lang.org/issues/20085 + # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 + wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ + echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i arm64-fix.patch; \ + rm arm64-fix.patch; \ +{{ ) else "" end -}} \ autoconf; \ {{ if is_alpine and "3.0" == (env.version | rtrimstr("-rc")) then ( -}} @@ -252,15 +262,6 @@ RUN set -eux; \ export LIBS='-lucontext'; \ ;; \ esac; \ -{{ ) else "" end -}} -{{ if .version == "3.3.0" then ( -}} - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ {{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ From 77efb18a0fb15955a4f77c9fa1d3968875915b78 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 5 Apr 2024 14:54:06 -0700 Subject: [PATCH 376/462] Fix `dpkg-query --search` to be more specific --- 3.0/bullseye/Dockerfile | 2 +- 3.0/buster/Dockerfile | 2 +- 3.0/slim-bullseye/Dockerfile | 2 +- 3.0/slim-buster/Dockerfile | 2 +- 3.1/bookworm/Dockerfile | 2 +- 3.1/bullseye/Dockerfile | 2 +- 3.1/slim-bookworm/Dockerfile | 2 +- 3.1/slim-bullseye/Dockerfile | 2 +- 3.2/bookworm/Dockerfile | 2 +- 3.2/bullseye/Dockerfile | 2 +- 3.2/slim-bookworm/Dockerfile | 2 +- 3.2/slim-bullseye/Dockerfile | 2 +- 3.3/bookworm/Dockerfile | 2 +- 3.3/bullseye/Dockerfile | 2 +- 3.3/slim-bookworm/Dockerfile | 2 +- 3.3/slim-bullseye/Dockerfile | 2 +- Dockerfile.template | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index a348d95d8c..e57c1e5eb7 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -64,7 +64,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 0f67902bd7..becce5fae6 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -64,7 +64,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index 66ab15e3c9..22bf722f57 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -91,7 +91,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 956097c485..3a49517c8c 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -91,7 +91,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 97991aa81b..48af0cc2d5 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -64,7 +64,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 80f0ec1ad6..86c8a5102c 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -64,7 +64,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index fef9c14ad4..85cefcf0a8 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -91,7 +91,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 346266152c..9225a64892 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -91,7 +91,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index f87fe76f9e..f445dd9ba9 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index e753e00b32..fe861df4e9 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index d5f809841b..e5a9175c77 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -117,7 +117,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 189b7ff567..679b0501b4 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -117,7 +117,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index e66e1a392d..44440813c5 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -97,7 +97,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 33b18b722d..89bb994e4d 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -97,7 +97,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index c69e19331d..10d00dea43 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -123,7 +123,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 020ba65712..8d3744e6d6 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -123,7 +123,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/Dockerfile.template b/Dockerfile.template index a01ca4934b..cfa4306e93 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -291,7 +291,7 @@ RUN set -eux; \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ From 53646d3dc96008bd20218a4d9aeb5695619fb4f7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 23 Apr 2024 08:14:18 -0700 Subject: [PATCH 377/462] [security] Update to 3.3.1, 3.2.4, 3.1.5, 3.0.7 --- 3.0/alpine3.16/Dockerfile | 10 ++- 3.0/bullseye/Dockerfile | 10 ++- 3.0/buster/Dockerfile | 10 ++- 3.0/slim-bullseye/Dockerfile | 10 ++- 3.0/slim-buster/Dockerfile | 10 ++- 3.1/alpine3.18/Dockerfile | 10 ++- 3.1/alpine3.19/Dockerfile | 10 ++- 3.1/bookworm/Dockerfile | 10 ++- 3.1/bullseye/Dockerfile | 10 ++- 3.1/slim-bookworm/Dockerfile | 10 ++- 3.1/slim-bullseye/Dockerfile | 10 ++- 3.2/alpine3.18/Dockerfile | 8 +- 3.2/alpine3.19/Dockerfile | 8 +- 3.2/bookworm/Dockerfile | 8 +- 3.2/bullseye/Dockerfile | 8 +- 3.2/slim-bookworm/Dockerfile | 8 +- 3.2/slim-bullseye/Dockerfile | 8 +- 3.3/alpine3.18/Dockerfile | 16 +--- 3.3/alpine3.19/Dockerfile | 16 +--- 3.3/bookworm/Dockerfile | 16 +--- 3.3/bullseye/Dockerfile | 16 +--- 3.3/slim-bookworm/Dockerfile | 16 +--- 3.3/slim-bullseye/Dockerfile | 16 +--- versions.json | 151 +++++++++++++++++------------------ 24 files changed, 187 insertions(+), 218 deletions(-) diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index 377e2f8d29..45dc15fdec 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -26,9 +26,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.6 -ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_VERSION 3.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -65,7 +67,7 @@ RUN set -eux; \ zlib-dev \ ; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index e57c1e5eb7..f8645c1f2f 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.6 -ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_VERSION 3.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -33,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index becce5fae6..104bc54ac2 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.6 -ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_VERSION 3.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -33,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index 22bf722f57..e98952d3f6 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.6 -ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_VERSION 3.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -60,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 3a49517c8c..0d690e232d 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.6 -ENV RUBY_DOWNLOAD_SHA256 b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1 + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_VERSION 3.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -60,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/alpine3.18/Dockerfile b/3.1/alpine3.18/Dockerfile index 4bc3519e2a..eed94cc85b 100644 --- a/3.1/alpine3.18/Dockerfile +++ b/3.1/alpine3.18/Dockerfile @@ -26,9 +26,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -65,7 +67,7 @@ RUN set -eux; \ zlib-dev \ ; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.19/Dockerfile index d5b4dbc879..c965966336 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.19/Dockerfile @@ -26,9 +26,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -65,7 +67,7 @@ RUN set -eux; \ zlib-dev \ ; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 48af0cc2d5..8d4fe5ce4a 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -33,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 86c8a5102c..07bad766c5 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -15,9 +15,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -33,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 85cefcf0a8..f6adcb60a9 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -60,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 9225a64892..e442181419 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -29,9 +29,11 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -ENV RUBY_MAJOR 3.1 -ENV RUBY_VERSION 3.1.4 -ENV RUBY_DOWNLOAD_SHA256 1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f + +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ +ENV RUBY_VERSION 3.1.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -60,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.18/Dockerfile index 800f1b611b..b7ad3ec2d3 100644 --- a/3.2/alpine3.18/Dockerfile +++ b/3.2/alpine3.18/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index a8b51c1294..a8c92e9cfb 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index f445dd9ba9..74ce1a0dfb 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index fe861df4e9..2b070f6c2f 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index e5a9175c77..bf66d8db02 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 679b0501b4..23897b7fa5 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/01/18/ruby-3-2-3-released/ -ENV RUBY_VERSION 3.2.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ +ENV RUBY_VERSION 3.2.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.18/Dockerfile index 691fd02942..324bd23658 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.18/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -116,14 +116,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 3c2de30c4a..40fcaabad2 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -116,14 +116,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 44440813c5..edccd883ed 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -74,14 +74,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 89bb994e4d..f03e56f183 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -74,14 +74,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 10d00dea43..5af2387d6d 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -100,14 +100,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 8d3744e6d6..436b9af0f8 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ -ENV RUBY_VERSION 3.3.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b +# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ +ENV RUBY_VERSION 3.3.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -100,14 +100,6 @@ RUN set -eux; \ } > file.c.new; \ mv file.c.new file.c; \ \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/versions.json b/versions.json index 0e183389b6..0fd1fe4466 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.0": { - "version": "3.0.6", - "date": "2023-03-30", - "post": "/en/news/2023/03/30/ruby-3-0-6-released/", + "version": "3.0.7", + "date": "2024-04-23", + "post": "/en/news/2024/04/23/ruby-3-0-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.zip" }, "size": { - "gz": 21315725, - "xz": 15864560, - "zip": 25694359 + "gz": 21268288, + "xz": 15848768, + "zip": 25652209 }, "sha1": { - "gz": "1052441f0abbb0302fb9f1481d2db99dfb4d4c29", - "xz": "7880c34d7193224e967163b12f33bf7aaf7304f6", - "zip": "e75d1bc14dd89c176145dc3968774e30f3a17652" + "gz": "ec95aee1364fc4d0ca0e8f83c525127016e05c86", + "xz": "efc97e609868a19f89653068c4915c162117b721", + "zip": "b258a1bfcd49fb801b83a0aec90a8bb3989e9e42" }, "sha256": { - "gz": "6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e", - "xz": "b5cbee93e62d85cfb2a408c49fa30a74231ae8409c2b3858e5f5ea254d7ddbd1", - "zip": "428d518d12f09df4146fc31dbed47c8d7e10fcccd2426948e5c0862d9321480d" + "gz": "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388", + "xz": "1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab", + "zip": "163d752070a2ba1a015f004ae75e38ac9aa44bc4ebfafb55d5ff184cc72db5be" }, "sha512": { - "gz": "d596bfd374ae777717379b409afe8ee1655ade0c0539ada7a10af4780b818efe25a28aa50a2a7226741d1776d744e10ad916641f9d12fb31c7444b0a01d0e0cc", - "xz": "abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8", - "zip": "576d11c668acac57cf4952228b148d17f16ab1dc491145355a4f2068b15f6cab8a4007a84d9d1eda4c1b62837675c82be99ebe6379c314f46c6ebbbf89677b5e" + "gz": "66e5116ddd027ab1b27d466104a5b440889318b4f2f74b5fdf3099812bf5f7ef77be62fe1df37e0dc7cd5b2f5efe7fee5b9096910ce815ca4126577cb2abfaa7", + "xz": "4760dc7d1345279b53cff30f3dd015b67f6a505e5028357f046dbf23b15a52d09f7d91fcfe5cb75d6c3222e7283aad12b97b36f5de0ff959f824bd42073f9c48", + "zip": "ed5e6d827ba981808bc4d914e400963b4443d522d52dd5d3f645db0cf38b50ab6c9baafac1b5e348e677500a16ceef1a5ac15c6a67003c2b2037cb86c1bd3654" }, "variants": [ "bullseye", @@ -37,33 +37,33 @@ ] }, "3.1": { - "version": "3.1.4", - "date": "2023-03-30", - "post": "/en/news/2023/03/30/ruby-3-1-4-released/", + "version": "3.1.5", + "date": "2024-04-23", + "post": "/en/news/2024/04/23/ruby-3-1-5-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.zip" }, "size": { - "gz": 20917933, - "xz": 15316604, - "zip": 25241255 + "gz": 20884264, + "xz": 15293020, + "zip": 25208327 }, "sha1": { - "gz": "38eddfc5a7536b6c8133183563009a4ed9bbe6db", - "xz": "2e2fbf43b7db6f24280548a3544912535bed8212", - "zip": "1061632623caa82a68a04a35777ed8f1797a9f8f" + "gz": "e3387c8fa2b6faf20beade2239ebdfc701ee6268", + "xz": "807bf2b261cf71e7fe58641a6b5dac61fdeb05ea", + "zip": "83c6b2f26a35a1b23fef091e6db5c60ad0f52bf9" }, "sha256": { - "gz": "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6", - "xz": "1b6d6010e76036c937b9671f4752f065aeca800a6c664f71f6c9a699453af94f", - "zip": "1fce1ab3d61d10a857dc821dab6e77fa41d0663c5dbbfaa5d9b9c2bdec5ce303" + "gz": "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5", + "xz": "f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91", + "zip": "e5eefbd95844b0322f6b2650cdef4d884d31c08856df7362375d26360cca9ba4" }, "sha512": { - "gz": "41cf1561dd7eb249bb2c2f5ea958884880648cc1d11da9315f14158a2d0ff94b2c5c7d75291a67e57e1813d2ec7b618e5372a9f18ee93be6ed306f47b0d3199a", - "xz": "a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633", - "zip": "3a334302df97c2c7fec3c2d05d19a40b1ec6f95fef52c85d397196ce62fac4834f96783f0ac7fcba6e2a670f004bcc275db6f1810ace6c68a594e7d2fd9b297b" + "gz": "23661cb1b61013d912b7433f8707bbcd723391694d91f413747c71428e74f8c7385c1304de7d08b70c9fa3bd649e4eb5e9acb472d89dc2ad5678cc54855a24ae", + "xz": "a9883f4d074825bb1f54ef3429a9a71341274bd2de1aa8ea32bce19b6b9c1bac5e5dc4c34a92b8e7caa73ba71d7ed7c546a6fec6f1fd3d8986974dce214f6d49", + "zip": "390e6f99b101aa80de924532bfb0b9fc29702b1e14b92e12cc596e9c76f9a2e52ba0e72eb95accb4bac16d5d10d81900a2e8afba80aa514ef870f52cfd50b4fd" }, "variants": [ "bookworm", @@ -75,33 +75,33 @@ ] }, "3.2": { - "version": "3.2.3", - "date": "2024-01-18", - "post": "/en/news/2024/01/18/ruby-3-2-3-released/", + "version": "3.2.4", + "date": "2024-04-23", + "post": "/en/news/2024/04/23/ruby-3-2-4-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.zip" }, "size": { - "gz": 20577155, - "xz": 15163960, - "zip": 24734275 + "gz": 20581711, + "zip": 24739492, + "xz": 15175656 }, "sha1": { - "gz": "7f553e514cb42751a61c3a560a7e8d727c6931ca", - "xz": "08e0016c8b96103930aaa3b2323081d8f5756e25", - "zip": "e305dfe36229c5328d231ea0ac03ae5e05bfaca6" + "gz": "a177e809102270f1cd77bf23c6df30c50ee7c107", + "zip": "e81354859b904711ce18eda1f42960a53caf3019", + "xz": "2806593a486f54ce56e5ba83c152f397e48eb416" }, "sha256": { - "gz": "af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba", - "xz": "cfb231954b8c241043a538a4c682a1cca0b2016d835fee0b9e4a0be3ceba476b", - "zip": "42aa39f74e5be9e24e4db47e7bfb15dc7e095f7e2295859b355edccf6fab96a2" + "gz": "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692", + "zip": "7edc0163bb033e895a8a97392be0146daec03769c1a6c7f8d084b6e8dc7f7299", + "xz": "e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b" }, "sha512": { - "gz": "75aecd9cf87f1fa66b24ecda8837a53162071b4f8801dcfd79119a24c6e81df3e3e2ba478e1cc48c60103dfaab12a00cfa2039a621f8651298eba8bd8d576360", - "xz": "d2a1897c2f4e801a28acb869322abfee76775115016252cecad90639485ed51deda1446cb16edb387f10a2e188602d646ef9b008b57f27bd745071277c535f3b", - "zip": "fd89a0a833df4b5cb1734a7ffc86a8cf7cb3a8e25944331db674d3ad7732f615867e7e214e1fdd61e44e9c9c856b461b46219b340de7c87a758f28f3a99dd172" + "gz": "b695b98dac7bb2c8755a106d949cb1b1b91551092fad263765171ddf8a4d86585259ffab5f7cc9bace70143d645dbe5932cfc61c6dba7817177de391d76bcd79", + "zip": "b52a95b19d98ff5bd29aa74cb7d2cbad58f1ccad75892ad966aec35eef1a57f7c9727b8fd2a51c5c6a1677eaf67226afceee8ce079e523c7b264e841790ddcae", + "xz": "fb0af37be4b6ad7b98ab9f8a508952238ee68b5828e3926331e4db52e2ebc1e6046f31114069322db0cd3bea7c9b82ace91c8564573ddcfa1f960877b237dbff" }, "variants": [ "bookworm", @@ -145,39 +145,34 @@ } }, "3.3": { - "version": "3.3.0", - "date": "2023-12-25", - "post": "/en/news/2023/12/25/ruby-3-3-0-released/", - "tag": "v3_3_0", - "stats": { - "files_changed": 5532, - "insertions": 326851, - "deletions": 185793 - }, + "version": "3.3.1", + "date": "2024-04-23", + "post": "/en/news/2024/04/23/ruby-3-3-1-released/", + "tag": "v3_3_1", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz" }, "size": { - "gz": 22065999, - "zip": 26935108, - "xz": 16345456 + "gz": 22074535, + "zip": 26953741, + "xz": 16350792 }, "sha1": { - "gz": "1a7e56851bf29bda1183aca99b3b323c58e0187b", - "zip": "a433eef1d7f96daeaf3b4cb842d0ed2dd82e7dc1", - "xz": "c8f68e1b0a114b90460a0b44165a3b2f540fa5b6" + "gz": "affd82947d7cd84bd586f7f487a1da0c0bd8b1fd", + "zip": "98b9858e3c125cfe6ca838ac4e4e269fa34bcaaa", + "xz": "88ef585faece4ed76f4330bce52903664d4fbfe0" }, "sha256": { - "gz": "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d", - "zip": "0e6563f679dd3694732eb3addf9de681c67b584602ac574376b60e7a509d2cd8", - "xz": "676b65a36e637e90f982b57b059189b3276b9045034dcd186a7e9078847b975b" + "gz": "8dc2af2802cc700cd182d5430726388ccf885b3f0a14fcd6a0f21ff249c9aa99", + "zip": "d81c99dd03d095f116361c9d097145666f7bb2512cd856ee086545b1c3e54c55", + "xz": "0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b" }, "sha512": { - "gz": "26074009b501fc793d71a74e419f34a6033c9353433919ca74ba2d24a3de432dbb11fd92c2bc285f0e4d951a6d6c74bf5b69a2ab36200c8c26e871746d6e0fc6", - "zip": "a94a85937a14b217c1f4b90d24185289ed4aee79239c4f3eecf8034d3fd34e65ee8d66869473857ed153067188adc9b70c0471e4ebe842c9f98ef60c34090450", - "xz": "7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01" + "gz": "0c8ea922a79152ac7adbfb2541320565bce6a631692fd39d499a06f53ad6339c16fad8374d171351ed63f7bda3312b26d4f8c058c5b6df3d7548fde372c718f1", + "zip": "200bfcc1cc11282c64b03fe529287509684e01266d248ec85f51f6b382beebd8324321c2db59f52185f42c49fdde84aaa42cb59f0048faca389985431224564d", + "xz": "c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347" }, "variants": [ "bookworm", From 1db5a7b341c03963ea27b0664f46bcf2e47c0912 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 23 Apr 2024 09:25:48 -0700 Subject: [PATCH 378/462] Revert RUBY_MAJOR refactoring for 3.0 (since it's effectively EOL now except the possibility of a severe regression: https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/) --- 3.0/alpine3.16/Dockerfile | 4 ++-- 3.0/bullseye/Dockerfile | 4 ++-- 3.0/buster/Dockerfile | 4 ++-- 3.0/slim-bullseye/Dockerfile | 4 ++-- 3.0/slim-buster/Dockerfile | 4 ++-- Dockerfile.template | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile index 45dc15fdec..76f99ef7db 100644 --- a/3.0/alpine3.16/Dockerfile +++ b/3.0/alpine3.16/Dockerfile @@ -28,8 +28,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_MAJOR 3.0 ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby @@ -67,7 +67,7 @@ RUN set -eux; \ zlib-dev \ ; \ \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile index f8645c1f2f..1bbb0cbfe6 100644 --- a/3.0/bullseye/Dockerfile +++ b/3.0/bullseye/Dockerfile @@ -17,8 +17,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_MAJOR 3.0 ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby @@ -35,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile index 104bc54ac2..ddf71619e0 100644 --- a/3.0/buster/Dockerfile +++ b/3.0/buster/Dockerfile @@ -17,8 +17,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_MAJOR 3.0 ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby @@ -35,7 +35,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile index e98952d3f6..7f8ba05edc 100644 --- a/3.0/slim-bullseye/Dockerfile +++ b/3.0/slim-bullseye/Dockerfile @@ -31,8 +31,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_MAJOR 3.0 ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby @@ -62,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile index 0d690e232d..d2d74ca983 100644 --- a/3.0/slim-buster/Dockerfile +++ b/3.0/slim-buster/Dockerfile @@ -31,8 +31,8 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ +ENV RUBY_MAJOR 3.0 ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab # some of ruby's build scripts are written in ruby @@ -62,7 +62,7 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ diff --git a/Dockerfile.template b/Dockerfile.template index cfa4306e93..457a7c4bcf 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -50,13 +50,13 @@ RUN set -eux; \ } >> /usr/local/etc/gemrc ENV LANG C.UTF-8 -{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}} + +# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }} +{{ if env.version == "3.0" then ( -}} ENV RUBY_MAJOR {{ env.version }} ENV RUBY_VERSION {{ .version }} ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} {{ ) else ( -}} - -# https://www.ruby-lang.org/{{ .post | ltrimstr("/") }} ENV RUBY_VERSION {{ .version }} ENV RUBY_DOWNLOAD_URL {{ .url.xz }} ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} @@ -203,7 +203,7 @@ RUN set -eux; \ fi; \ {{ ) else "" end -}} \ -{{ if .version | . == "3.0.6" or . == "3.1.4" or . == "3.2.2" then ( -}} +{{ if env.version == "3.0" then ( -}} {{ if .url.xz != "https://cache.ruby-lang.org/pub/ruby/\(env.version | rtrimstr("-rc"))/ruby-\(.version).tar.xz" then error("url for \(.version) is not as expected!") else "" end -}} wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ {{ ) else ( -}} From ed54bf2587aacd0ece5cc0931ce2c2b56fafb9d0 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Tue, 23 Apr 2024 19:28:10 +0200 Subject: [PATCH 379/462] Remove 3.3.0 arm64 patch This is now part of 3.3.1 --- Dockerfile.template | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 457a7c4bcf..5bbca8b1ea 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -238,16 +238,6 @@ RUN set -eux; \ cat file.c; \ } > file.c.new; \ mv file.c.new file.c; \ -{{ if .version == "3.3.0" then ( -}} - \ - # workaround crash on arm64 - # https://bugs.ruby-lang.org/issues/20085 - # https://github.com/ruby/ruby/pull/9385 <- https://github.com/ruby/ruby/pull/9371 - wget -O 'arm64-fix.patch' 'https://github.com/ruby/ruby/commit/7f97e3540ce448b501bcbee15afac5f94bb22dd9.patch?full_index=1'; \ - echo '86bc65415fd62cb2272a4df249f39fb79db15617ad05c540e05a22f02eae73b3 *arm64-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i arm64-fix.patch; \ - rm arm64-fix.patch; \ -{{ ) else "" end -}} \ autoconf; \ {{ if is_alpine and "3.0" == (env.version | rtrimstr("-rc")) then ( -}} From b0fcebf807054af9b58c2d55a0e54d9636298737 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:21:25 +0200 Subject: [PATCH 380/462] Bump `actions/checkout` to v4 > Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. > For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/verify-templating.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61ffb56ef1..9e33b8bfa1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker-library/bashbrew@HEAD - id: generate-jobs name: Generate Jobs @@ -44,7 +44,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Pull Dependencies diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 14497bec68..2e1fb78729 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -13,7 +13,7 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Apply Templates run: ./apply-templates.sh - name: Check Git Status From bfd3f474cdaef7cf5ed6741bef80355c62e9ba2f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 16 May 2024 09:05:11 -0700 Subject: [PATCH 381/462] Add 3.4.0-preview1 --- 3.4-rc/alpine3.18/Dockerfile | 164 ++++++++++++++++++++++++++++++++ 3.4-rc/alpine3.19/Dockerfile | 164 ++++++++++++++++++++++++++++++++ 3.4-rc/bookworm/Dockerfile | 119 +++++++++++++++++++++++ 3.4-rc/bullseye/Dockerfile | 119 +++++++++++++++++++++++ 3.4-rc/slim-bookworm/Dockerfile | 145 ++++++++++++++++++++++++++++ 3.4-rc/slim-bullseye/Dockerfile | 145 ++++++++++++++++++++++++++++ versions.json | 77 +++++++++++++++ 7 files changed, 933 insertions(+) create mode 100644 3.4-rc/alpine3.18/Dockerfile create mode 100644 3.4-rc/alpine3.19/Dockerfile create mode 100644 3.4-rc/bookworm/Dockerfile create mode 100644 3.4-rc/bullseye/Dockerfile create mode 100644 3.4-rc/slim-bookworm/Dockerfile create mode 100644 3.4-rc/slim-bullseye/Dockerfile diff --git a/3.4-rc/alpine3.18/Dockerfile b/3.4-rc/alpine3.18/Dockerfile new file mode 100644 index 0000000000..9931b5bb1a --- /dev/null +++ b/3.4-rc/alpine3.18/Dockerfile @@ -0,0 +1,164 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile new file mode 100644 index 0000000000..9eb48f1426 --- /dev/null +++ b/3.4-rc/alpine3.19/Dockerfile @@ -0,0 +1,164 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.19 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# the configure script does not detect isnan/isinf as macros + export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile new file mode 100644 index 0000000000..4b736cbbf6 --- /dev/null +++ b/3.4-rc/bookworm/Dockerfile @@ -0,0 +1,119 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile new file mode 100644 index 0000000000..bc900b2d0b --- /dev/null +++ b/3.4-rc/bullseye/Dockerfile @@ -0,0 +1,119 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..b74c10f521 --- /dev/null +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -0,0 +1,145 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..c7a484607c --- /dev/null +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -0,0 +1,145 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + { \ + echo 'install: --no-document'; \ + echo 'update: --no-document'; \ + } >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ +ENV RUBY_VERSION 3.4.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 0fd1fe4466..7bbdeaa5f6 100644 --- a/versions.json +++ b/versions.json @@ -214,5 +214,82 @@ }, "version": "1.26.0" } + }, + "3.4": null, + "3.4-rc": { + "version": "3.4.0-preview1", + "date": "2024-05-16", + "post": "/en/news/2024/05/16/ruby-3-4-0-preview1-released/", + "tag": "v3_4_0_preview1", + "stats": { + "files_changed": 3283, + "insertions": 107449, + "deletions": 115380 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz" + }, + "size": { + "gz": 22507726, + "zip": 27731060, + "xz": 16709536 + }, + "sha1": { + "gz": "1619cbe06b5a8c774711b3351d18bb0f84f1d017", + "zip": "5d79834050369ea9241d86467bf93e9e89e2ab7a", + "xz": "6041ad2651527d01c36106de3d3cdab680ed3132" + }, + "sha256": { + "gz": "1a3c322e90cb22e5fba0b5d257bb2be9988affa3867eba7642ed981fdde895bb", + "zip": "bd2a6c0e8396698e6f6768c00b0f155510859bb6fb92420f7b7abec610e71dbb", + "xz": "4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97" + }, + "sha512": { + "gz": "29c0e32179f7b823b6708f5328e495cd333fe8dd88f7df7d9051deab47add67b14d899bba565bba1a77e1b04c9693d9708541445c112925777bb6891cb7b2b62", + "zip": "36ea6897e6ad769141516f4c1bb18989fbde27a76f0f3abcce947f8b6b79639846ba93907e085181f7d305ab06ad73f1bbb37928049c8c951d33176ee444abbf", + "xz": "4ce306b9beb1e2d88c76d7f809724b66bed17e354c07a2b54aa050fc2035652e4d83deadc8dbf7a375bbdb1c816f2996334bb8e7ff5e6c24b71a858bf6b0cb7c" + }, + "variants": [ + "bookworm", + "slim-bookworm", + "bullseye", + "slim-bullseye", + "alpine3.19", + "alpine3.18" + ], + "rust": { + "version": "1.74.1" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.26.0" + } } } From cfb3148e13d2952e0a88863719959a6ec0ff0098 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 22 May 2024 22:21:55 +0200 Subject: [PATCH 382/462] Drop Ruby 3.0 It's EOL since 23 Apr 2024 and makes issues since it uses alpine 3.16 --- 3.0/alpine3.16/Dockerfile | 151 ----------------------------------- 3.0/bullseye/Dockerfile | 96 ---------------------- 3.0/buster/Dockerfile | 96 ---------------------- 3.0/slim-bullseye/Dockerfile | 123 ---------------------------- 3.0/slim-buster/Dockerfile | 123 ---------------------------- Dockerfile.template | 32 +------- versions.json | 37 --------- versions.sh | 26 ++---- 8 files changed, 11 insertions(+), 673 deletions(-) delete mode 100644 3.0/alpine3.16/Dockerfile delete mode 100644 3.0/bullseye/Dockerfile delete mode 100644 3.0/buster/Dockerfile delete mode 100644 3.0/slim-bullseye/Dockerfile delete mode 100644 3.0/slim-buster/Dockerfile diff --git a/3.0/alpine3.16/Dockerfile b/3.0/alpine3.16/Dockerfile deleted file mode 100644 index 76f99ef7db..0000000000 --- a/3.0/alpine3.16/Dockerfile +++ /dev/null @@ -1,151 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.16 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 - # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - s390x | armhf | armv7) \ - apk add --no-cache libucontext-dev; \ - export LIBS='-lucontext'; \ - ;; \ - esac; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.0/bullseye/Dockerfile b/3.0/bullseye/Dockerfile deleted file mode 100644 index 1bbb0cbfe6..0000000000 --- a/3.0/bullseye/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.0/buster/Dockerfile b/3.0/buster/Dockerfile deleted file mode 100644 index ddf71619e0..0000000000 --- a/3.0/buster/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:buster - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.0/slim-bullseye/Dockerfile b/3.0/slim-bullseye/Dockerfile deleted file mode 100644 index 7f8ba05edc..0000000000 --- a/3.0/slim-bullseye/Dockerfile +++ /dev/null @@ -1,123 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.0/slim-buster/Dockerfile b/3.0/slim-buster/Dockerfile deleted file mode 100644 index d2d74ca983..0000000000 --- a/3.0/slim-buster/Dockerfile +++ /dev/null @@ -1,123 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:buster-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-0-7-released/ -ENV RUBY_MAJOR 3.0 -ENV RUBY_VERSION 3.0.7 -ENV RUBY_DOWNLOAD_SHA256 1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libreadline-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index 5bbca8b1ea..66466f9447 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -52,15 +52,9 @@ RUN set -eux; \ ENV LANG C.UTF-8 # https://www.ruby-lang.org/{{ .post | ltrimstr("/") }} -{{ if env.version == "3.0" then ( -}} -ENV RUBY_MAJOR {{ env.version }} -ENV RUBY_VERSION {{ .version }} -ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} -{{ ) else ( -}} ENV RUBY_VERSION {{ .version }} ENV RUBY_DOWNLOAD_URL {{ .url.xz }} ENV RUBY_DOWNLOAD_SHA256 {{ .sha256.xz }} -{{ ) end -}} # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -69,7 +63,7 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ -{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -93,7 +87,7 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ -{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} readline-dev \ {{ ) else "" end -}} ruby \ @@ -106,7 +100,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ -{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -121,7 +115,7 @@ RUN set -eux; \ libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ -{{ if [ "3.0", "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} libreadline-dev \ {{ ) else "" end -}} libxml2-dev \ @@ -203,12 +197,7 @@ RUN set -eux; \ fi; \ {{ ) else "" end -}} \ -{{ if env.version == "3.0" then ( -}} -{{ if .url.xz != "https://cache.ruby-lang.org/pub/ruby/\(env.version | rtrimstr("-rc"))/ruby-\(.version).tar.xz" then error("url for \(.version) is not as expected!") else "" end -}} - wget -O ruby.tar.xz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz"; \ -{{ ) else ( -}} wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ -{{ ) end -}} echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ \ mkdir -p /usr/src/ruby; \ @@ -240,19 +229,6 @@ RUN set -eux; \ mv file.c.new file.c; \ \ autoconf; \ -{{ if is_alpine and "3.0" == (env.version | rtrimstr("-rc")) then ( -}} - # fix builds on arm32v6/7 and s390x: https://github.com/docker-library/ruby/issues/308 - # and don't break the other arches: https://github.com/docker-library/ruby/issues/365 -{{ if .rust.version then "" else ( -}} - {{ archVar }}="$(apk --print-arch)"; \ -{{ ) end -}} - case "${{ archVar }}" in \ - s390x | armhf | armv7) \ - apk add --no-cache libucontext-dev; \ - export LIBS='-lucontext'; \ - ;; \ - esac; \ -{{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ --build="$gnuArch" \ diff --git a/versions.json b/versions.json index 7bbdeaa5f6..cc29bc2ad3 100644 --- a/versions.json +++ b/versions.json @@ -1,41 +1,4 @@ { - "3.0": { - "version": "3.0.7", - "date": "2024-04-23", - "post": "/en/news/2024/04/23/ruby-3-0-7-released/", - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.7.zip" - }, - "size": { - "gz": 21268288, - "xz": 15848768, - "zip": 25652209 - }, - "sha1": { - "gz": "ec95aee1364fc4d0ca0e8f83c525127016e05c86", - "xz": "efc97e609868a19f89653068c4915c162117b721", - "zip": "b258a1bfcd49fb801b83a0aec90a8bb3989e9e42" - }, - "sha256": { - "gz": "2a3411977f2850431136b0fab8ad53af09fb74df2ee2f4fb7f11b378fe034388", - "xz": "1748338373c4fad80129921080d904aca326e41bd9589b498aa5ee09fd575bab", - "zip": "163d752070a2ba1a015f004ae75e38ac9aa44bc4ebfafb55d5ff184cc72db5be" - }, - "sha512": { - "gz": "66e5116ddd027ab1b27d466104a5b440889318b4f2f74b5fdf3099812bf5f7ef77be62fe1df37e0dc7cd5b2f5efe7fee5b9096910ce815ca4126577cb2abfaa7", - "xz": "4760dc7d1345279b53cff30f3dd015b67f6a505e5028357f046dbf23b15a52d09f7d91fcfe5cb75d6c3222e7283aad12b97b36f5de0ff959f824bd42073f9c48", - "zip": "ed5e6d827ba981808bc4d914e400963b4443d522d52dd5d3f645db0cf38b50ab6c9baafac1b5e348e677500a16ceef1a5ac15c6a67003c2b2037cb86c1bd3654" - }, - "variants": [ - "bullseye", - "slim-bullseye", - "buster", - "slim-buster", - "alpine3.16" - ] - }, "3.1": { "version": "3.1.5", "date": "2024-04-23", diff --git a/versions.sh b/versions.sh index 65edfc8e5c..c25e060ad0 100755 --- a/versions.sh +++ b/versions.sh @@ -83,32 +83,20 @@ for version in "${versions[@]}"; do doc="$(jq <<<"$doc" -c ' .variants = [ ( - # https://bugs.ruby-lang.org/issues/18658 - # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if "3.0" == env.version then - "bullseye", - "buster" - else - "bookworm", - "bullseye", - empty # trailing comma hack - end + "bookworm", + "bullseye", + empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( - # Alpine 3.17+ defaults to OpenSSL 3 which is not supported by Ruby 3.0 - # https://bugs.ruby-lang.org/issues/18658 - # https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174 - if "3.0" == env.version then "3.16" else - "3.19", - "3.18", - empty # trailing comma hack - end + "3.19", + "3.18", + empty # trailing comma hack | "alpine" + .) ] ')" case "$rcVersion" in - 3.0 | 3.1) ;; + 3.1) ;; *) # YJIT doc="$(jq <<<"$doc" -sc ' From a4c6c26df171630eca259b1254a8b374c2eb0a43 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 22 May 2024 23:02:17 +0200 Subject: [PATCH 383/462] Add alpine 3.20 https://alpinelinux.org/posts/Alpine-3.20.0-released.html --- 3.1/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.2/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.3/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.4-rc/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.1/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.2/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.3/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.4-rc/{alpine3.18 => alpine3.20}/Dockerfile (99%) diff --git a/3.1/alpine3.18/Dockerfile b/3.1/alpine3.20/Dockerfile similarity index 99% rename from 3.1/alpine3.18/Dockerfile rename to 3.1/alpine3.20/Dockerfile index eed94cc85b..f8dbb65cee 100644 --- a/3.1/alpine3.18/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2/alpine3.18/Dockerfile b/3.2/alpine3.20/Dockerfile similarity index 99% rename from 3.2/alpine3.18/Dockerfile rename to 3.2/alpine3.20/Dockerfile index b7ad3ec2d3..acafda5044 100644 --- a/3.2/alpine3.18/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 RUN set -eux; \ apk add --no-cache \ diff --git a/3.3/alpine3.18/Dockerfile b/3.3/alpine3.20/Dockerfile similarity index 99% rename from 3.3/alpine3.18/Dockerfile rename to 3.3/alpine3.20/Dockerfile index 324bd23658..292ac6714c 100644 --- a/3.3/alpine3.18/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 RUN set -eux; \ apk add --no-cache \ diff --git a/3.4-rc/alpine3.18/Dockerfile b/3.4-rc/alpine3.20/Dockerfile similarity index 99% rename from 3.4-rc/alpine3.18/Dockerfile rename to 3.4-rc/alpine3.20/Dockerfile index 9931b5bb1a..3417b89dcb 100644 --- a/3.4-rc/alpine3.18/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index cc29bc2ad3..7cdcc8cc86 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ] }, "3.2": { @@ -71,8 +71,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "rust": { "version": "1.74.1" @@ -142,8 +142,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "rust": { "version": "1.74.1" @@ -219,8 +219,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "rust": { "version": "1.74.1" diff --git a/versions.sh b/versions.sh index c25e060ad0..d5e02efeeb 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.20", "3.19", - "3.18", empty # trailing comma hack | "alpine" + .) ] From 74a48e2248ff94c6ebf93958070bafaf5cbdffcc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 May 2024 04:03:11 -0700 Subject: [PATCH 384/462] Update 3.1 to 3.1.6 --- 3.1/alpine3.19/Dockerfile | 8 ++++---- 3.1/alpine3.20/Dockerfile | 8 ++++---- 3.1/bookworm/Dockerfile | 8 ++++---- 3.1/bullseye/Dockerfile | 8 ++++---- 3.1/slim-bookworm/Dockerfile | 8 ++++---- 3.1/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.19/Dockerfile index c965966336..b35693036f 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index f8dbb65cee..fd1ce5075a 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 8d4fe5ce4a..384052911e 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 07bad766c5..8b6e39e878 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index f6adcb60a9..626c5bab47 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index e442181419..66594aec2f 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/ -ENV RUBY_VERSION 3.1.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91 +# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ +ENV RUBY_VERSION 3.1.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 7cdcc8cc86..9ace346dbb 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.1": { - "version": "3.1.5", - "date": "2024-04-23", - "post": "/en/news/2024/04/23/ruby-3-1-5-released/", + "version": "3.1.6", + "date": "2024-05-29", + "post": "/en/news/2024/05/29/ruby-3-1-6-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.zip" }, "size": { - "gz": 20884264, - "xz": 15293020, - "zip": 25208327 + "gz": 20887803, + "xz": 15273916, + "zip": 25211787 }, "sha1": { - "gz": "e3387c8fa2b6faf20beade2239ebdfc701ee6268", - "xz": "807bf2b261cf71e7fe58641a6b5dac61fdeb05ea", - "zip": "83c6b2f26a35a1b23fef091e6db5c60ad0f52bf9" + "gz": "02832465f9b0f68b9fe2c443f9f602d6e840b2ca", + "xz": "2671606a00d0ad564fb93f92d093590563c4e25b", + "zip": "534e675022dc30c3674ee68a7b2fbe9300d64367" }, "sha256": { - "gz": "3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5", - "xz": "f9375a45bdf1cc41298558e7ac6c367f7b6cdcccf7196618b21f0886ff583b91", - "zip": "e5eefbd95844b0322f6b2650cdef4d884d31c08856df7362375d26360cca9ba4" + "gz": "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22", + "xz": "597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102", + "zip": "c21d16e7953d65d05824834e89d7e1a58ccf2bc018fe966f785774ea383f53db" }, "sha512": { - "gz": "23661cb1b61013d912b7433f8707bbcd723391694d91f413747c71428e74f8c7385c1304de7d08b70c9fa3bd649e4eb5e9acb472d89dc2ad5678cc54855a24ae", - "xz": "a9883f4d074825bb1f54ef3429a9a71341274bd2de1aa8ea32bce19b6b9c1bac5e5dc4c34a92b8e7caa73ba71d7ed7c546a6fec6f1fd3d8986974dce214f6d49", - "zip": "390e6f99b101aa80de924532bfb0b9fc29702b1e14b92e12cc596e9c76f9a2e52ba0e72eb95accb4bac16d5d10d81900a2e8afba80aa514ef870f52cfd50b4fd" + "gz": "624555ab3681bd6663bca7cf3529a969b9f0f16928559cfb713c57f763506c8740410c9b460d946922994859189ef2b9956167bd31423cf2e3acbf5a30086fe1", + "xz": "a3159648706d6d11ce9613201141e884b3accc69bf928c756de8a8f2b71d219886e91435d30cf2c30e85af31f87801138e10106344766100f1b80662c7244652", + "zip": "f8b5a0fda8dc0248f29796a0b5b67f93a825a013b92b0db437ecf0a5ffaf06a800285999a0e9a61e890a8000dd2e2c081a6ecb5dae62b1045761a13fd87c397b" }, "variants": [ "bookworm", From c5a28011c2bdefb4861ab10ab203dd9e948c0325 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 May 2024 22:03:18 -0700 Subject: [PATCH 385/462] Update 3.3 to 3.3.2 --- 3.3/alpine3.19/Dockerfile | 8 ++++---- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 37 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 43 deletions(-) diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 40fcaabad2..7e260e9f35 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 292ac6714c..87e5746f7f 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index edccd883ed..8f68b31325 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index f03e56f183..1a5c62143e 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 5af2387d6d..ecb3ac6c41 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 436b9af0f8..1a04eb1334 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -ENV RUBY_VERSION 3.3.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b +# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ +ENV RUBY_VERSION 3.3.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 9ace346dbb..797a295d2f 100644 --- a/versions.json +++ b/versions.json @@ -108,34 +108,33 @@ } }, "3.3": { - "version": "3.3.1", - "date": "2024-04-23", - "post": "/en/news/2024/04/23/ruby-3-3-1-released/", - "tag": "v3_3_1", + "version": "3.3.2", + "date": "2024-05-30", + "post": "/en/news/2024/05/30/ruby-3-3-2-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.1.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz" }, "size": { - "gz": 22074535, - "zip": 26953741, - "xz": 16350792 + "gz": 22095824, + "zip": 26981906, + "xz": 16349500 }, "sha1": { - "gz": "affd82947d7cd84bd586f7f487a1da0c0bd8b1fd", - "zip": "98b9858e3c125cfe6ca838ac4e4e269fa34bcaaa", - "xz": "88ef585faece4ed76f4330bce52903664d4fbfe0" + "gz": "b49719ef383c581008c1fd3b68690f874f78557b", + "zip": "ee641ef4a0c5b9d12456c565d402841ae2ec5ab2", + "xz": "5c9f7d5cf55d9e45b24c613014cbe2b605de009d" }, "sha256": { - "gz": "8dc2af2802cc700cd182d5430726388ccf885b3f0a14fcd6a0f21ff249c9aa99", - "zip": "d81c99dd03d095f116361c9d097145666f7bb2512cd856ee086545b1c3e54c55", - "xz": "0686941a3ec395a15ae2a852487b2a88e5fb8a5518e188df00d8d1bb71a6349b" + "gz": "3be1d100ebf2a0ce60c2cd8d22cd9db4d64b3e04a1943be2c4ff7b520f2bcb5b", + "zip": "06bf1aa3336afed66e2f89b0be3542c980fcdd76ffad0be284a860f25edea5b1", + "xz": "b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1" }, "sha512": { - "gz": "0c8ea922a79152ac7adbfb2541320565bce6a631692fd39d499a06f53ad6339c16fad8374d171351ed63f7bda3312b26d4f8c058c5b6df3d7548fde372c718f1", - "zip": "200bfcc1cc11282c64b03fe529287509684e01266d248ec85f51f6b382beebd8324321c2db59f52185f42c49fdde84aaa42cb59f0048faca389985431224564d", - "xz": "c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347" + "gz": "a15ba8d6c2830fcd1f2b36f671acf9028c303ec78608fd268da0585db8e95ddd971666e8029bcfa2584da2184a6534e1f2f2da07fa7ca4494e8d842eed206f00", + "zip": "e2bbff1fbe5d9a892bd9c21fe9f10ea7b23f111f3876538bffea3d5451645e155f9ddc61345a44e409d44f83e190ffe30b9c90cd75905dc079cf8803f2f8ccdf", + "xz": "70dd8eb933956f894c52a8ede42e8ee74ff0e062bd8134a0bfb6bffc83a2848a658b62c8df5530b4dd64087b2d5373909c48917528facb1e6f4e99e79b6ad449" }, "variants": [ "bookworm", From b8b0053a92b4f7232fe28c45e44a469c032affe2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jun 2024 22:03:19 -0700 Subject: [PATCH 386/462] Update 3.3 to 3.3.3 --- 3.3/alpine3.19/Dockerfile | 8 ++++---- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 7e260e9f35..6ea028ae9b 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 87e5746f7f..be423d9763 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 8f68b31325..a3816b54b7 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 1a5c62143e..314a883dbd 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index ecb3ac6c41..6c85ea67b7 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 1a04eb1334..2b7ee191f2 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/30/ruby-3-3-2-released/ -ENV RUBY_VERSION 3.3.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1 +# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ +ENV RUBY_VERSION 3.3.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 797a295d2f..4acba12b6f 100644 --- a/versions.json +++ b/versions.json @@ -108,33 +108,33 @@ } }, "3.3": { - "version": "3.3.2", - "date": "2024-05-30", - "post": "/en/news/2024/05/30/ruby-3-3-2-released/", + "version": "3.3.3", + "date": "2024-06-12", + "post": "/en/news/2024/06/12/ruby-3-3-3-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.2.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz" }, "size": { - "gz": 22095824, - "zip": 26981906, - "xz": 16349500 + "gz": 22105219, + "zip": 26990910, + "xz": 16361160 }, "sha1": { - "gz": "b49719ef383c581008c1fd3b68690f874f78557b", - "zip": "ee641ef4a0c5b9d12456c565d402841ae2ec5ab2", - "xz": "5c9f7d5cf55d9e45b24c613014cbe2b605de009d" + "gz": "b71971b141ee2325d99046a02291940fcca9830c", + "zip": "15a903003fba2fa5ae760263d6aa7b951747e545", + "xz": "70cc5db132ea277487ede490e430e066a7c862d9" }, "sha256": { - "gz": "3be1d100ebf2a0ce60c2cd8d22cd9db4d64b3e04a1943be2c4ff7b520f2bcb5b", - "zip": "06bf1aa3336afed66e2f89b0be3542c980fcdd76ffad0be284a860f25edea5b1", - "xz": "b5e8a8ed4a47cdd9a3358b5bdd998c37bd9e971ca63766a37d5ae5933fdb69f1" + "gz": "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2", + "zip": "a9e4a6650cc40643b2b4a005541587443e373fbdec0c03164502f710cfd87a01", + "xz": "83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e" }, "sha512": { - "gz": "a15ba8d6c2830fcd1f2b36f671acf9028c303ec78608fd268da0585db8e95ddd971666e8029bcfa2584da2184a6534e1f2f2da07fa7ca4494e8d842eed206f00", - "zip": "e2bbff1fbe5d9a892bd9c21fe9f10ea7b23f111f3876538bffea3d5451645e155f9ddc61345a44e409d44f83e190ffe30b9c90cd75905dc079cf8803f2f8ccdf", - "xz": "70dd8eb933956f894c52a8ede42e8ee74ff0e062bd8134a0bfb6bffc83a2848a658b62c8df5530b4dd64087b2d5373909c48917528facb1e6f4e99e79b6ad449" + "gz": "0388a96127eb6e53b836f7954af51ff62b84cdb7abeab823cb1349993d805b151204e426b9ac04ca8333fbd5e01c386d58bc37d34c4e9286b219dcda7542a150", + "zip": "ed5ed5bc26598ba8c39eaae45147159d742e4792d4d8478b2db04bffe25b75b8bd4131a86c010bff91e0368f906bff04e852deab415fefd25cec39bc53f70020", + "xz": "27dcae604e6613e1eaa20c6a75ee88b970bb0dd584d9bc0c021ad8da4340858e3c2e874ac841fcca0b0444a0c0146c4650d2d22bac3c9e12853533c37255f8f1" }, "variants": [ "bookworm", From f69cac9888c7909b402a1bc21a87331429318aae Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Jun 2024 12:31:34 -0700 Subject: [PATCH 387/462] Add more defensive `mkdir` for `GEM_HOME` --- 3.1/alpine3.19/Dockerfile | 6 ++++-- 3.1/alpine3.20/Dockerfile | 6 ++++-- 3.1/bookworm/Dockerfile | 6 ++++-- 3.1/bullseye/Dockerfile | 6 ++++-- 3.1/slim-bookworm/Dockerfile | 6 ++++-- 3.1/slim-bullseye/Dockerfile | 6 ++++-- 3.2/alpine3.19/Dockerfile | 6 ++++-- 3.2/alpine3.20/Dockerfile | 6 ++++-- 3.2/bookworm/Dockerfile | 6 ++++-- 3.2/bullseye/Dockerfile | 6 ++++-- 3.2/slim-bookworm/Dockerfile | 6 ++++-- 3.2/slim-bullseye/Dockerfile | 6 ++++-- 3.3/alpine3.19/Dockerfile | 6 ++++-- 3.3/alpine3.20/Dockerfile | 6 ++++-- 3.3/bookworm/Dockerfile | 6 ++++-- 3.3/bullseye/Dockerfile | 6 ++++-- 3.3/slim-bookworm/Dockerfile | 6 ++++-- 3.3/slim-bullseye/Dockerfile | 6 ++++-- 3.4-rc/alpine3.19/Dockerfile | 6 ++++-- 3.4-rc/alpine3.20/Dockerfile | 6 ++++-- 3.4-rc/bookworm/Dockerfile | 6 ++++-- 3.4-rc/bullseye/Dockerfile | 6 ++++-- 3.4-rc/slim-bookworm/Dockerfile | 6 ++++-- 3.4-rc/slim-bullseye/Dockerfile | 6 ++++-- Dockerfile.template | 6 ++++-- 25 files changed, 100 insertions(+), 50 deletions(-) diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.19/Dockerfile index b35693036f..ab93cb5278 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.19/Dockerfile @@ -136,7 +136,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index fd1ce5075a..7b0a19ee4d 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -136,7 +136,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 384052911e..3211192173 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -90,7 +90,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 8b6e39e878..245e907bab 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -90,7 +90,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 626c5bab47..6d83ac0675 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -117,7 +117,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 66594aec2f..22a77ef17f 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -117,7 +117,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index a8c92e9cfb..926f649a0a 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -160,7 +160,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index acafda5044..1ff7186392 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -160,7 +160,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 74ce1a0dfb..b66ce50157 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -114,7 +114,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 2b070f6c2f..e911735d22 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -114,7 +114,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index bf66d8db02..ae678bdd95 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -141,7 +141,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 23897b7fa5..904567677d 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -141,7 +141,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 6ea028ae9b..d0d5c8d343 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -158,7 +158,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index be423d9763..442db5182e 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -158,7 +158,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index a3816b54b7..7fe095b6a4 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -113,7 +113,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 314a883dbd..1f495fc110 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -113,7 +113,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 6c85ea67b7..36e3537df4 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -139,7 +139,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 2b7ee191f2..5e03116d7c 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -139,7 +139,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile index 9eb48f1426..fa9b0d1ad6 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.19/Dockerfile @@ -158,7 +158,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index 3417b89dcb..52e376e19f 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -158,7 +158,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index 4b736cbbf6..73b4609249 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -113,7 +113,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index bc900b2d0b..23f69e2e20 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -113,7 +113,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index b74c10f521..437c092c46 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -139,7 +139,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index c7a484607c..bf4736f8f9 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -139,7 +139,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index 66466f9447..84b22db427 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -292,7 +292,9 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" ENV PATH $GEM_HOME/bin:$PATH -# adjust permissions of a few directories for running "gem install" as an arbitrary user -RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME" +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" CMD [ "irb" ] From 2e432fc966a291fa241b14637557710d33a05b42 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 8 Jul 2024 22:04:38 -0700 Subject: [PATCH 388/462] Update 3.3 to 3.3.4 --- 3.3/alpine3.19/Dockerfile | 8 ++++---- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index d0d5c8d343..2ed3f1f516 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 442db5182e..904c97d84e 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 7fe095b6a4..19a5519dae 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 1f495fc110..9bb4c2cdfb 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 36e3537df4..2866190cbc 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 5e03116d7c..182509fcea 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/06/12/ruby-3-3-3-released/ -ENV RUBY_VERSION 3.3.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +ENV RUBY_VERSION 3.3.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 4acba12b6f..ebf3493af0 100644 --- a/versions.json +++ b/versions.json @@ -108,33 +108,33 @@ } }, "3.3": { - "version": "3.3.3", - "date": "2024-06-12", - "post": "/en/news/2024/06/12/ruby-3-3-3-released/", + "version": "3.3.4", + "date": "2024-07-09", + "post": "/en/news/2024/07/09/ruby-3-3-4-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz" }, "size": { - "gz": 22105219, - "zip": 26990910, - "xz": 16361160 + "gz": 22110179, + "zip": 26995054, + "xz": 16366580 }, "sha1": { - "gz": "b71971b141ee2325d99046a02291940fcca9830c", - "zip": "15a903003fba2fa5ae760263d6aa7b951747e545", - "xz": "70cc5db132ea277487ede490e430e066a7c862d9" + "gz": "408362dfb0413122e09d35bafdcced8922b54e71", + "zip": "dcd35f8d428e61807b5c95b6e2e79444fb32f214", + "xz": "4fac2e1609535f71cbdbf9ab9dcea6f6e80a304a" }, "sha256": { - "gz": "83c05b2177ee9c335b631b29b8c077b4770166d02fa527f3a9f6a40d13f3cce2", - "zip": "a9e4a6650cc40643b2b4a005541587443e373fbdec0c03164502f710cfd87a01", - "xz": "83c0995388399c9555bad87e70af069755b5a9d84bbaa74aa22d1e37ff70fc1e" + "gz": "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34", + "zip": "3cf0ee03dd4c98e78e8ab5e191af926870415770ef4995088ed069caef639b2a", + "xz": "1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad" }, "sha512": { - "gz": "0388a96127eb6e53b836f7954af51ff62b84cdb7abeab823cb1349993d805b151204e426b9ac04ca8333fbd5e01c386d58bc37d34c4e9286b219dcda7542a150", - "zip": "ed5ed5bc26598ba8c39eaae45147159d742e4792d4d8478b2db04bffe25b75b8bd4131a86c010bff91e0368f906bff04e852deab415fefd25cec39bc53f70020", - "xz": "27dcae604e6613e1eaa20c6a75ee88b970bb0dd584d9bc0c021ad8da4340858e3c2e874ac841fcca0b0444a0c0146c4650d2d22bac3c9e12853533c37255f8f1" + "gz": "56a0b88954a4efd0236626e49cc90cdb15d9bfd42b27d7fc34efae61f500058e58cb32c73fdef5f1505a36602f4632d6148bf3bd1df539cb5581ae157c78c22b", + "zip": "c24ca2e6b1114f9c489c049c07acccb0db0916c42c68ea90eaa9acc430973de68342df19710c58130fe264a291958c89e60815c5b00f91decf5a4d1d674a0b32", + "xz": "b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb" }, "variants": [ "bookworm", From 6438466b4fd948a31f66b2f2a934c799b598233e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 Jul 2024 09:23:41 -0700 Subject: [PATCH 389/462] Update 3.2 to 3.2.5 --- 3.2/alpine3.19/Dockerfile | 8 ++++---- 3.2/alpine3.20/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/bullseye/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 926f649a0a..745c0e4dc3 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 1ff7186392..7cda9dd6ac 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index b66ce50157..c6fb3f5bc0 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index e911735d22..5139f2d1b4 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index ae678bdd95..5e0a6d70c7 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 904567677d..9cd8698580 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/ -ENV RUBY_VERSION 3.2.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b +# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ +ENV RUBY_VERSION 3.2.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index ebf3493af0..db4a0ba58a 100644 --- a/versions.json +++ b/versions.json @@ -38,33 +38,33 @@ ] }, "3.2": { - "version": "3.2.4", - "date": "2024-04-23", - "post": "/en/news/2024/04/23/ruby-3-2-4-released/", + "version": "3.2.5", + "date": "2024-07-26", + "post": "/en/news/2024/07/26/ruby-3-2-5-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.zip" }, "size": { - "gz": 20581711, - "zip": 24739492, - "xz": 15175656 + "gz": 20619047, + "xz": 15189072, + "zip": 24777979 }, "sha1": { - "gz": "a177e809102270f1cd77bf23c6df30c50ee7c107", - "zip": "e81354859b904711ce18eda1f42960a53caf3019", - "xz": "2806593a486f54ce56e5ba83c152f397e48eb416" + "gz": "e5166c947a4d9057b1310710a2a963df12264ac9", + "xz": "b5f21884084077b1f684efe40144844b8b37a316", + "zip": "07e7638dd5ec40f261c820be523be619fdebe4aa" }, "sha256": { - "gz": "c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692", - "zip": "7edc0163bb033e895a8a97392be0146daec03769c1a6c7f8d084b6e8dc7f7299", - "xz": "e7f1653d653232ec433472489a91afbc7433c9f760cc822defe7437c9d95791b" + "gz": "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16", + "xz": "7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c", + "zip": "b001e6c157d79f6fb351d5be83ba389c6ca20000686bbdfc8d2b8a46d38a7183" }, "sha512": { - "gz": "b695b98dac7bb2c8755a106d949cb1b1b91551092fad263765171ddf8a4d86585259ffab5f7cc9bace70143d645dbe5932cfc61c6dba7817177de391d76bcd79", - "zip": "b52a95b19d98ff5bd29aa74cb7d2cbad58f1ccad75892ad966aec35eef1a57f7c9727b8fd2a51c5c6a1677eaf67226afceee8ce079e523c7b264e841790ddcae", - "xz": "fb0af37be4b6ad7b98ab9f8a508952238ee68b5828e3926331e4db52e2ebc1e6046f31114069322db0cd3bea7c9b82ace91c8564573ddcfa1f960877b237dbff" + "gz": "d86c0151fabf21b418b007465e3f5b3fd0b2de0a9652057fd465b1f7e91b01d00f83a737e972ea994a5d9231e8cb27e64e576852390fe6c2ad502f0d099fe5f4", + "xz": "092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305", + "zip": "f7a05c96a22bd4018c4a79ff595e62aa92dc844ebaf3e66d50c7b35041fade7608806668b5cb25c17b360a3cd98df1c3e0f97c49448a968accab59a9dac97e47" }, "variants": [ "bookworm", From 04175a1c782da7183d8cd1ebed8c91b3ce0fe50b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Sep 2024 04:03:18 -0700 Subject: [PATCH 390/462] Update 3.3 to 3.3.5 --- 3.3/alpine3.19/Dockerfile | 8 ++++---- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 2ed3f1f516..773faebcc2 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 904c97d84e..efdb58097e 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 19a5519dae..5978b00a73 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 9bb4c2cdfb..32baf57c8e 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 2866190cbc..caa2856ab9 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 182509fcea..33c527a4fd 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ -ENV RUBY_VERSION 3.3.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad +# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ +ENV RUBY_VERSION 3.3.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index db4a0ba58a..7ae303730d 100644 --- a/versions.json +++ b/versions.json @@ -108,33 +108,33 @@ } }, "3.3": { - "version": "3.3.4", - "date": "2024-07-09", - "post": "/en/news/2024/07/09/ruby-3-3-4-released/", + "version": "3.3.5", + "date": "2024-09-03", + "post": "/en/news/2024/09/03/3-3-5-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.4.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz" }, "size": { - "gz": 22110179, - "zip": 26995054, - "xz": 16366580 + "gz": 22129139, + "zip": 27020194, + "xz": 16403660 }, "sha1": { - "gz": "408362dfb0413122e09d35bafdcced8922b54e71", - "zip": "dcd35f8d428e61807b5c95b6e2e79444fb32f214", - "xz": "4fac2e1609535f71cbdbf9ab9dcea6f6e80a304a" + "gz": "59444476bbe9e789fc777d8fb4dd456bc057604f", + "zip": "ccb32746aef491ce05be42218301e2c47185e5fc", + "xz": "692bc3188bdb9ec30b8672543961b011d699590a" }, "sha256": { - "gz": "fe6a30f97d54e029768f2ddf4923699c416cdbc3a6e96db3e2d5716c7db96a34", - "zip": "3cf0ee03dd4c98e78e8ab5e191af926870415770ef4995088ed069caef639b2a", - "xz": "1caaee9a5a6befef54bab67da68ace8d985e4fb59cd17ce23c28d9ab04f4ddad" + "gz": "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196", + "zip": "d3c13e124707494935d00ebc5c7983b0252bc13de49223fd31104ba5467a057a", + "xz": "51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359" }, "sha512": { - "gz": "56a0b88954a4efd0236626e49cc90cdb15d9bfd42b27d7fc34efae61f500058e58cb32c73fdef5f1505a36602f4632d6148bf3bd1df539cb5581ae157c78c22b", - "zip": "c24ca2e6b1114f9c489c049c07acccb0db0916c42c68ea90eaa9acc430973de68342df19710c58130fe264a291958c89e60815c5b00f91decf5a4d1d674a0b32", - "xz": "b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb" + "gz": "5c482059628ef9de5d8a6ad4751f8043f2fc2b159b768265be7f3ee0574ad51d9500ee4fc9146c5978fbd51313039c3de39e7b7a4dedc9bcd5d09a41a713f1a7", + "zip": "bf83af835a74283aff21042538ee1f1eb70ff12dac1edd4672d787547cd29cb7b69a9299682f89c8499eb610737b10a7fc03eca038574cb4ba565205d96b0016", + "xz": "dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883" }, "variants": [ "bookworm", From 2895a675d1b1690faab2105c56aa0e14f6865ff2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Sep 2024 11:28:39 -0700 Subject: [PATCH 391/462] Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates See https://github.com/docker-library/official-images/pull/17640#issuecomment-2380308790 --- generate-stackbrew-library.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index da9269d380..88621d90ca 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -40,17 +40,19 @@ dirCommit() { getArches() { local repo="$1"; shift - local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' + local officialImagesBase="${BASHBREW_LIBRARY:-https://github.com/docker-library/official-images/raw/HEAD/library}/" - eval "declare -g -A parentRepoToArches=( $( - find -name 'Dockerfile' -exec awk ' + local parentRepoToArchesStr + parentRepoToArchesStr="$( + find -name 'Dockerfile' -exec awk -v officialImagesBase="$officialImagesBase" ' toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ { - print "'"$officialImagesUrl"'" $2 + printf "%s%s\n", officialImagesBase, $2 } ' '{}' + \ | sort -u \ - | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' - ) )" + | xargs -r bashbrew cat --format '["{{ .RepoName }}:{{ .TagName }}"]="{{ join " " .TagEntry.Architectures }}"' + )" + eval "declare -g -A parentRepoToArches=( $parentRepoToArchesStr )" } getArches 'ruby' From 4e09dcf80f32040cde8ff4bb226367d45beadcd8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 7 Oct 2024 10:03:27 -0700 Subject: [PATCH 392/462] Update 3.4-rc to 3.4.0-preview2 --- 3.4-rc/alpine3.19/Dockerfile | 8 +++--- 3.4-rc/alpine3.20/Dockerfile | 8 +++--- 3.4-rc/bookworm/Dockerfile | 8 +++--- 3.4-rc/bullseye/Dockerfile | 8 +++--- 3.4-rc/slim-bookworm/Dockerfile | 8 +++--- 3.4-rc/slim-bullseye/Dockerfile | 8 +++--- versions.json | 44 ++++++++++++++++----------------- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile index fa9b0d1ad6..31c122366d 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index 52e376e19f..f5069fcf57 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index 73b4609249..2b05b59294 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index 23f69e2e20..77f24fe450 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index 437c092c46..b1244cda92 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index bf4736f8f9..67435a9410 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/16/ruby-3-4-0-preview1-released/ -ENV RUBY_VERSION 3.4.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97 +# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ +ENV RUBY_VERSION 3.4.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 7ae303730d..7e390943f4 100644 --- a/versions.json +++ b/versions.json @@ -179,39 +179,39 @@ }, "3.4": null, "3.4-rc": { - "version": "3.4.0-preview1", - "date": "2024-05-16", - "post": "/en/news/2024/05/16/ruby-3-4-0-preview1-released/", - "tag": "v3_4_0_preview1", + "version": "3.4.0-preview2", + "date": "2024-10-07", + "post": "/en/news/2024/10/07/ruby-3-4-0-preview2-released/", + "tag": "v3_4_0_preview2", "stats": { - "files_changed": 3283, - "insertions": 107449, - "deletions": 115380 + "files_changed": 4422, + "insertions": 163889, + "deletions": 243380 }, "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview1.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz" }, "size": { - "gz": 22507726, - "zip": 27731060, - "xz": 16709536 + "gz": 22722332, + "zip": 28101194, + "xz": 16878876 }, "sha1": { - "gz": "1619cbe06b5a8c774711b3351d18bb0f84f1d017", - "zip": "5d79834050369ea9241d86467bf93e9e89e2ab7a", - "xz": "6041ad2651527d01c36106de3d3cdab680ed3132" + "gz": "c23265acf6c07b4c1df1e41eebf8b4cf2f25b97b", + "zip": "479bd223bca3225fb3a15984e3eae4efb9a40189", + "xz": "dbff404b969012702dc500cac72f4d6b3822068e" }, "sha256": { - "gz": "1a3c322e90cb22e5fba0b5d257bb2be9988affa3867eba7642ed981fdde895bb", - "zip": "bd2a6c0e8396698e6f6768c00b0f155510859bb6fb92420f7b7abec610e71dbb", - "xz": "4ee4ec44366050d4b2ee1d88034cc63e0b9174a1a6650285777f3d3447213a97" + "gz": "443cd7ec54ade4786bc974ce9f5d49f172a60f8edc84b597b7fe2bd2a94b8371", + "zip": "e00a6fbf6f9e25a725711a8aac7e38be6bed61de4db9862a405172b96bf38b5b", + "xz": "626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7" }, "sha512": { - "gz": "29c0e32179f7b823b6708f5328e495cd333fe8dd88f7df7d9051deab47add67b14d899bba565bba1a77e1b04c9693d9708541445c112925777bb6891cb7b2b62", - "zip": "36ea6897e6ad769141516f4c1bb18989fbde27a76f0f3abcce947f8b6b79639846ba93907e085181f7d305ab06ad73f1bbb37928049c8c951d33176ee444abbf", - "xz": "4ce306b9beb1e2d88c76d7f809724b66bed17e354c07a2b54aa050fc2035652e4d83deadc8dbf7a375bbdb1c816f2996334bb8e7ff5e6c24b71a858bf6b0cb7c" + "gz": "0946d256587597bdf13437a50f7a3298c151133edea161a1c4806a04dcbd8c2e8a7fd617f3eda16c5c05f6e6346317562cc30ba67698f1fdd92237c03bdbd23e", + "zip": "0d9ee1c41920e4d594b0f2c40d02339b4e9a2cd5232f5ee914cab5a685cb4a2279fbbfd8fbad40ef0a53866db4e1de96068c62580ede6d8fab02550393bcbe81", + "xz": "f23257896a35d3a581cbf5e8c94fe28e45725e39608a7669f47f31085338b1b4929a4db40d826d8fee628afb97b0c25b2f9e7bda4cd42e80c1208c46caf54265" }, "variants": [ "bookworm", From d49362dc77dc3594d7be5f72d2860a136b81754f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Oct 2024 14:43:44 -0700 Subject: [PATCH 393/462] Use jq's `IN()` instead of `index()` The end result is the same, but the construction is more ergonomic. --- Dockerfile.template | 8 ++++---- versions.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 84b22db427..c5ceed1ca4 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -63,7 +63,7 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ -{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -87,7 +87,7 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ -{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} readline-dev \ {{ ) else "" end -}} ruby \ @@ -100,7 +100,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ -{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -115,7 +115,7 @@ RUN set -eux; \ libgdbm-compat-dev \ libglib2.0-dev \ libncurses-dev \ -{{ if [ "3.1", "3.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} libreadline-dev \ {{ ) else "" end -}} libxml2-dev \ diff --git a/versions.sh b/versions.sh index d5e02efeeb..aa5e6bc116 100755 --- a/versions.sh +++ b/versions.sh @@ -100,13 +100,13 @@ for version in "${versions[@]}"; do *) # YJIT doc="$(jq <<<"$doc" -sc ' - .[1][].arches? |= if . then with_entries(select(.key as $arch | [ + .[1][].arches? |= if . then with_entries(select(.key | IN( # https://github.com/ruby/ruby/blob/v3_2_0/doc/yjit/yjit.md ("currently supported for macOS and Linux on x86-64 and arm64/aarch64 CPUs") # https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L3757-L3761 "amd64", "arm64v8", empty # trailing comma - ] | index($arch))) else empty end + ))) else empty end | add ' - rust.json)" ;; From e76791f7c9c3a7de9c6c40561561dc718dc77fbb Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:48:50 +0100 Subject: [PATCH 394/462] Bump rust version --- 3.2/alpine3.19/Dockerfile | 6 ++-- 3.2/alpine3.20/Dockerfile | 6 ++-- 3.2/bookworm/Dockerfile | 6 ++-- 3.2/bullseye/Dockerfile | 6 ++-- 3.2/slim-bookworm/Dockerfile | 6 ++-- 3.2/slim-bullseye/Dockerfile | 6 ++-- 3.3/alpine3.19/Dockerfile | 6 ++-- 3.3/alpine3.20/Dockerfile | 6 ++-- 3.3/bookworm/Dockerfile | 6 ++-- 3.3/bullseye/Dockerfile | 6 ++-- 3.3/slim-bookworm/Dockerfile | 6 ++-- 3.3/slim-bullseye/Dockerfile | 6 ++-- 3.4-rc/alpine3.19/Dockerfile | 6 ++-- 3.4-rc/alpine3.20/Dockerfile | 6 ++-- 3.4-rc/bookworm/Dockerfile | 6 ++-- 3.4-rc/bullseye/Dockerfile | 6 ++-- 3.4-rc/slim-bookworm/Dockerfile | 6 ++-- 3.4-rc/slim-bullseye/Dockerfile | 6 ++-- rust.json | 48 +++++++++++++------------- versions.json | 60 ++++++++++++++++----------------- 20 files changed, 108 insertions(+), 108 deletions(-) diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 745c0e4dc3..2d39acbe47 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -70,8 +70,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -83,7 +83,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 7cda9dd6ac..7ee9be6771 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -70,8 +70,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -83,7 +83,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index c6fb3f5bc0..058df1af0c 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -38,8 +38,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -51,7 +51,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 5139f2d1b4..09c7f1803c 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -38,8 +38,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -51,7 +51,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 5e0a6d70c7..c2108de019 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 9cd8698580..806c7ee1ed 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 773faebcc2..25844db3f6 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index efdb58097e..549eb8f454 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 5978b00a73..b36da74f9f 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 32baf57c8e..ac74f56eb3 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index caa2856ab9..34f488d96a 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 33c527a4fd..b6edf840d8 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile index 31c122366d..b2082a609c 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.19/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index f5069fcf57..d69b2c4ad9 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index 2b05b59294..9a455086cd 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index 77f24fe450..1301bc657a 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index b1244cda92..83cdc3b48f 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index 67435a9410..a4250e82e5 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/rust.json b/rust.json index d95ed803a2..d0918961eb 100644 --- a/rust.json +++ b/rust.json @@ -1,83 +1,83 @@ { "rust": { - "version": "1.74.1" + "version": "1.82.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm32v5": { "glibc": { "arch": "arm-unknown-linux-gnueabi", - "sha256": "1fca5ad0f877f65c76f07bb0cbbe22c28b6e4ba883bf057f1a05636e8e2a4b40", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabi/rustup-init" + "sha256": "3e347090c436066be3d1d170f8c6743b5f9aab89c0a175e2e0dc902abea6b739", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabi/rustup-init" } }, "arm32v6": { "glibc": { "arch": "arm-unknown-linux-gnueabihf", - "sha256": "8f7801e93ec2c80e0253cba0e25c1085f92e8f49c7ddf9930be62d13361bd808", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabihf/rustup-init" + "sha256": "5568c68b02f2ca1ddc8c448badc4b0b2750bee3e50fe51a28c35f5b7792e36a2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabihf/rustup-init" } }, "arm32v7": { "glibc": { "arch": "armv7-unknown-linux-gnueabihf", - "sha256": "f21c44b01678c645d8fbba1e55e4180a01ac5af2d38bcbd14aa665e0d96ed69a", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/armv7-unknown-linux-gnueabihf/rustup-init" + "sha256": "3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/armv7-unknown-linux-gnueabihf/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } }, "i386": { "glibc": { "arch": "i686-unknown-linux-gnu", - "sha256": "e7b0f47557c1afcd86939b118cbcf7fb95a5d1d917bdd355157b63ca00fc4333", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/i686-unknown-linux-gnu/rustup-init" + "sha256": "0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/i686-unknown-linux-gnu/rustup-init" } }, "mips64le": { "glibc": { "arch": "mips64el-unknown-linux-gnuabi64", - "sha256": "b8a30dd0d0ba34324c5b2399e76ba44e50a036439cb66c92aef62b485fdc97c8", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/mips64el-unknown-linux-gnuabi64/rustup-init" + "sha256": "644cec63e594707a6098585038cf47e28546c2abe0dde7149cde71d79a0be674", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/mips64el-unknown-linux-gnuabi64/rustup-init" } }, "ppc64le": { "glibc": { "arch": "powerpc64le-unknown-linux-gnu", - "sha256": "1032934fb154ad2d365e02dcf770c6ecfaec6ab2987204c618c21ba841c97b44", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/powerpc64le-unknown-linux-gnu/rustup-init" + "sha256": "079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/powerpc64le-unknown-linux-gnu/rustup-init" } }, "s390x": { "glibc": { "arch": "s390x-unknown-linux-gnu", - "sha256": "414210ffd294a39ee5963e05d9f5a8435945657a1ddf74b14fd63f6eb898d69e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/s390x-unknown-linux-gnu/rustup-init" + "sha256": "e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/s390x-unknown-linux-gnu/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } } diff --git a/versions.json b/versions.json index 7e390943f4..925e6948cc 100644 --- a/versions.json +++ b/versions.json @@ -75,36 +75,36 @@ "alpine3.19" ], "rust": { - "version": "1.74.1" + "version": "1.82.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } }, "3.3": { @@ -145,36 +145,36 @@ "alpine3.19" ], "rust": { - "version": "1.74.1" + "version": "1.82.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } }, "3.4": null, @@ -222,36 +222,36 @@ "alpine3.19" ], "rust": { - "version": "1.74.1" + "version": "1.82.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } } } From 3df1b04951937f41a01ae24a6867d833e78345c1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Oct 2024 04:03:14 -0700 Subject: [PATCH 395/462] Update 3.2 to 3.2.6 --- 3.2/alpine3.19/Dockerfile | 8 ++++---- 3.2/alpine3.20/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/bullseye/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 2d39acbe47..1c16ef224e 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 7ee9be6771..2583cc82b8 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 058df1af0c..3de71d0c41 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 09c7f1803c..1d17518caf 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index c2108de019..95bc80f2c8 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 806c7ee1ed..fd8352ce83 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/07/26/ruby-3-2-5-released/ -ENV RUBY_VERSION 3.2.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c +# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ +ENV RUBY_VERSION 3.2.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 925e6948cc..bd2247f073 100644 --- a/versions.json +++ b/versions.json @@ -38,33 +38,33 @@ ] }, "3.2": { - "version": "3.2.5", - "date": "2024-07-26", - "post": "/en/news/2024/07/26/ruby-3-2-5-released/", + "version": "3.2.6", + "date": "2024-10-30", + "post": "/en/news/2024/10/30/ruby-3-2-6-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz" }, "size": { - "gz": 20619047, - "xz": 15189072, - "zip": 24777979 + "gz": 20521981, + "zip": 24653808, + "xz": 15126888 }, "sha1": { - "gz": "e5166c947a4d9057b1310710a2a963df12264ac9", - "xz": "b5f21884084077b1f684efe40144844b8b37a316", - "zip": "07e7638dd5ec40f261c820be523be619fdebe4aa" + "gz": "bbf265f5e7a3f480056dc2fa6d600a97cba00713", + "zip": "efbcfc2c2e238a7201366fdefdcf0dc16e4072af", + "xz": "eabbe230df704e7141d53d8221314bb33b5f0dea" }, "sha256": { - "gz": "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16", - "xz": "7780d91130139406d39b29ed8fe16bba350d8fa00e510c76bef9b8ec1340903c", - "zip": "b001e6c157d79f6fb351d5be83ba389c6ca20000686bbdfc8d2b8a46d38a7183" + "gz": "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370", + "zip": "36ca2292b48d8f6a0281d6c772dc47c358cb838774addc0344e38d4d2735704f", + "xz": "671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb" }, "sha512": { - "gz": "d86c0151fabf21b418b007465e3f5b3fd0b2de0a9652057fd465b1f7e91b01d00f83a737e972ea994a5d9231e8cb27e64e576852390fe6c2ad502f0d099fe5f4", - "xz": "092348b84b513aec62e63ec10b326370d0e3d1fa3126c59c03c84f28e2d7741a4772c461b077ec6a7dac3964a20f434655729e1acd50a3438755d7ad64073305", - "zip": "f7a05c96a22bd4018c4a79ff595e62aa92dc844ebaf3e66d50c7b35041fade7608806668b5cb25c17b360a3cd98df1c3e0f97c49448a968accab59a9dac97e47" + "gz": "26ae9439043cf40e5eddde6b92ae51c9e1fa4e89c8ec6da36732c59c14873b022c683fb3007950d372f35de9b62a4fabbbc3ef1f4ef58cd53058bd56e1552cbe", + "zip": "8474829ebe13b3357f962571e8114e47634b5ed1f3e2dbfdf4ecb2ece1a3ed354f3506e8526a6768457e980ea4f056d77cd5b547419f2d8f9bea07348f64edc2", + "xz": "78f7fc76d47c772b9bc313cbcb57a2c0f1a975e09cfe46a3083f6f603d62b0031bd4c55896c8353c1c343974d45077e06e310111198d870883e06a0cf6fd03ce" }, "variants": [ "bookworm", From f268d3972ab3d0f8c8f6b546be8f0bb613a9dfd9 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:07:45 +0100 Subject: [PATCH 396/462] Revert "Bump rust version" This reverts commit e76791f7c9c3a7de9c6c40561561dc718dc77fbb. I chose an inopportune time to do this. There is an upstream issue where builds on alpine arm64/v8 fail: https://bugs.ruby-lang.org/issues/20506 Example failure: https://doi-janky.infosiftr.net/job/wip/job/new/job/build-arm64v8/45573/console I believe rust-lang/rust#131221 will fix this but it is only slated for Rust 1.83 --- 3.2/alpine3.19/Dockerfile | 6 ++-- 3.2/alpine3.20/Dockerfile | 6 ++-- 3.2/bookworm/Dockerfile | 6 ++-- 3.2/bullseye/Dockerfile | 6 ++-- 3.2/slim-bookworm/Dockerfile | 6 ++-- 3.2/slim-bullseye/Dockerfile | 6 ++-- 3.3/alpine3.19/Dockerfile | 6 ++-- 3.3/alpine3.20/Dockerfile | 6 ++-- 3.3/bookworm/Dockerfile | 6 ++-- 3.3/bullseye/Dockerfile | 6 ++-- 3.3/slim-bookworm/Dockerfile | 6 ++-- 3.3/slim-bullseye/Dockerfile | 6 ++-- 3.4-rc/alpine3.19/Dockerfile | 6 ++-- 3.4-rc/alpine3.20/Dockerfile | 6 ++-- 3.4-rc/bookworm/Dockerfile | 6 ++-- 3.4-rc/bullseye/Dockerfile | 6 ++-- 3.4-rc/slim-bookworm/Dockerfile | 6 ++-- 3.4-rc/slim-bullseye/Dockerfile | 6 ++-- rust.json | 48 +++++++++++++------------- versions.json | 60 ++++++++++++++++----------------- 20 files changed, 108 insertions(+), 108 deletions(-) diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 1c16ef224e..c13d2dc45f 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -70,8 +70,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -83,7 +83,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 2583cc82b8..5db5b2a3a9 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -70,8 +70,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -83,7 +83,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 3de71d0c41..a4b7dbc9de 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -38,8 +38,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -51,7 +51,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 1d17518caf..6bc60d287e 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -38,8 +38,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -51,7 +51,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 95bc80f2c8..4d9a904c0b 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index fd8352ce83..d1e1b7f222 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 25844db3f6..773faebcc2 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 549eb8f454..efdb58097e 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index b36da74f9f..5978b00a73 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index ac74f56eb3..32baf57c8e 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 34f488d96a..caa2856ab9 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index b6edf840d8..33c527a4fd 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile index b2082a609c..31c122366d 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.19/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index d69b2c4ad9..f5069fcf57 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -68,8 +68,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -81,7 +81,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index 9a455086cd..2b05b59294 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index 1301bc657a..77f24fe450 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -37,8 +37,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -50,7 +50,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index 83cdc3b48f..b1244cda92 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index a4250e82e5..67435a9410 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -63,8 +63,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -76,7 +76,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.82.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/rust.json b/rust.json index d0918961eb..d95ed803a2 100644 --- a/rust.json +++ b/rust.json @@ -1,83 +1,83 @@ { "rust": { - "version": "1.82.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm32v5": { "glibc": { "arch": "arm-unknown-linux-gnueabi", - "sha256": "3e347090c436066be3d1d170f8c6743b5f9aab89c0a175e2e0dc902abea6b739", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabi/rustup-init" + "sha256": "1fca5ad0f877f65c76f07bb0cbbe22c28b6e4ba883bf057f1a05636e8e2a4b40", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabi/rustup-init" } }, "arm32v6": { "glibc": { "arch": "arm-unknown-linux-gnueabihf", - "sha256": "5568c68b02f2ca1ddc8c448badc4b0b2750bee3e50fe51a28c35f5b7792e36a2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabihf/rustup-init" + "sha256": "8f7801e93ec2c80e0253cba0e25c1085f92e8f49c7ddf9930be62d13361bd808", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabihf/rustup-init" } }, "arm32v7": { "glibc": { "arch": "armv7-unknown-linux-gnueabihf", - "sha256": "3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/armv7-unknown-linux-gnueabihf/rustup-init" + "sha256": "f21c44b01678c645d8fbba1e55e4180a01ac5af2d38bcbd14aa665e0d96ed69a", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/armv7-unknown-linux-gnueabihf/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } }, "i386": { "glibc": { "arch": "i686-unknown-linux-gnu", - "sha256": "0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/i686-unknown-linux-gnu/rustup-init" + "sha256": "e7b0f47557c1afcd86939b118cbcf7fb95a5d1d917bdd355157b63ca00fc4333", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/i686-unknown-linux-gnu/rustup-init" } }, "mips64le": { "glibc": { "arch": "mips64el-unknown-linux-gnuabi64", - "sha256": "644cec63e594707a6098585038cf47e28546c2abe0dde7149cde71d79a0be674", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/mips64el-unknown-linux-gnuabi64/rustup-init" + "sha256": "b8a30dd0d0ba34324c5b2399e76ba44e50a036439cb66c92aef62b485fdc97c8", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/mips64el-unknown-linux-gnuabi64/rustup-init" } }, "ppc64le": { "glibc": { "arch": "powerpc64le-unknown-linux-gnu", - "sha256": "079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/powerpc64le-unknown-linux-gnu/rustup-init" + "sha256": "1032934fb154ad2d365e02dcf770c6ecfaec6ab2987204c618c21ba841c97b44", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/powerpc64le-unknown-linux-gnu/rustup-init" } }, "s390x": { "glibc": { "arch": "s390x-unknown-linux-gnu", - "sha256": "e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/s390x-unknown-linux-gnu/rustup-init" + "sha256": "414210ffd294a39ee5963e05d9f5a8435945657a1ddf74b14fd63f6eb898d69e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/s390x-unknown-linux-gnu/rustup-init" } } }, - "version": "1.27.1" + "version": "1.26.0" } } diff --git a/versions.json b/versions.json index bd2247f073..dd8fabb2cf 100644 --- a/versions.json +++ b/versions.json @@ -75,36 +75,36 @@ "alpine3.19" ], "rust": { - "version": "1.82.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.26.0" } }, "3.3": { @@ -145,36 +145,36 @@ "alpine3.19" ], "rust": { - "version": "1.82.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.26.0" } }, "3.4": null, @@ -222,36 +222,36 @@ "alpine3.19" ], "rust": { - "version": "1.82.0" + "version": "1.74.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.26.0" } } } From b511945b11599126f923b73533e7b906bb6e95cc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 4 Nov 2024 22:03:16 -0800 Subject: [PATCH 397/462] Update 3.3 to 3.3.6 --- 3.3/alpine3.19/Dockerfile | 8 ++++---- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 773faebcc2..0ea3669c6c 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index efdb58097e..99d1588d0c 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 5978b00a73..5b2e811d0e 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 32baf57c8e..2dba313aef 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -16,10 +16,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index caa2856ab9..8ad3904d07 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 33c527a4fd..72152688f8 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -30,10 +30,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/09/03/3-3-5-released/ -ENV RUBY_VERSION 3.3.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359 +# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ +ENV RUBY_VERSION 3.3.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index dd8fabb2cf..a79aa0fced 100644 --- a/versions.json +++ b/versions.json @@ -108,33 +108,33 @@ } }, "3.3": { - "version": "3.3.5", - "date": "2024-09-03", - "post": "/en/news/2024/09/03/3-3-5-released/", + "version": "3.3.6", + "date": "2024-11-05", + "post": "/en/news/2024/11/05/ruby-3-3-6-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz" }, "size": { - "gz": 22129139, - "zip": 27020194, - "xz": 16403660 + "gz": 22153657, + "zip": 27048656, + "xz": 16398228 }, "sha1": { - "gz": "59444476bbe9e789fc777d8fb4dd456bc057604f", - "zip": "ccb32746aef491ce05be42218301e2c47185e5fc", - "xz": "692bc3188bdb9ec30b8672543961b011d699590a" + "gz": "0106171cd1801fb5663e8e709f3d6c935d683c9b", + "zip": "88239456249cd80cadd1cbf98a317ae700ccd9df", + "xz": "25391e9bd8547cd07e09afcfc472777520a3178a" }, "sha256": { - "gz": "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196", - "zip": "d3c13e124707494935d00ebc5c7983b0252bc13de49223fd31104ba5467a057a", - "xz": "51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359" + "gz": "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d", + "zip": "a60240a6f9bcc8db6c07d40ad29c7dceb21430debe3ebc39bf339207818132f6", + "xz": "540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266" }, "sha512": { - "gz": "5c482059628ef9de5d8a6ad4751f8043f2fc2b159b768265be7f3ee0574ad51d9500ee4fc9146c5978fbd51313039c3de39e7b7a4dedc9bcd5d09a41a713f1a7", - "zip": "bf83af835a74283aff21042538ee1f1eb70ff12dac1edd4672d787547cd29cb7b69a9299682f89c8499eb610737b10a7fc03eca038574cb4ba565205d96b0016", - "xz": "dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883" + "gz": "4ae22f5c2a1f7ed84aab7587ff04ce4d9933cffe4347deaef0ab88d22c9780f274c1664a4ee1dd8235bc3cc749be828ffa8db7cb5f5002339a59a599acf3c729", + "zip": "c010c7d3e2b373b41a18bcadfb6dba276afabe479d75624569b5bdc605f3575bced2aff511708e25ceca43c7c918400222329e55e599c54154f203957f119ad2", + "xz": "c4b86188bf539fa737932e1ba5b746bc295e7c43b2f8cca2668eb7c88aa7228e2ce9032bbcd244a7d558a11bc842445b5fbeac3503ca7d223b63c53e08dba4ab" }, "variants": [ "bookworm", From cf905a63f0b9f9ab45b97922fd87464006a68f8f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Nov 2024 10:50:56 -0800 Subject: [PATCH 398/462] Update README See https://github.com/docker-library/docs/pull/2503 --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 43c76b2f9c..76e88e3e13 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,4 @@ For more information about the full official images change lifecycle, see [the " For outstanding `ruby` image PRs, check [PRs with the "library/ruby" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fruby). For the current "source of truth" for [`ruby`](https://hub.docker.com/_/ruby/), see [the `library/ruby` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/ruby). ---- - -- [![build status badge](https://img.shields.io/github/actions/workflow/status/docker-library/ruby/ci.yml?branch=master&label=GitHub%20CI)](https://github.com/docker-library/ruby/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/ruby.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/ruby/) - -| Build | Status | Badges | (per-arch) | -|:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/ruby/) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/ruby/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/ruby/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/ruby/) | -| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/ruby/) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/ruby/) | [![mips64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/ruby.svg?label=mips64le)](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/ruby/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/ruby/) | -| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/ruby/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/ruby/) | - From bbd386f9c78b59db5ba41a01cdbb8decd740c231 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:02:25 +0100 Subject: [PATCH 399/462] Remove alpine isnan/isinf workaround I believe this was fixed with https://github.com/ruby/ruby/commit/74f94b3e6ebf15b76f3b357e754095412b006e94 https://bugs.ruby-lang.org/issues/15595 This was shipped with Ruby 2.7, so it should be unnecessary now --- 3.1/alpine3.19/Dockerfile | 3 --- 3.1/alpine3.20/Dockerfile | 3 --- 3.2/alpine3.19/Dockerfile | 3 --- 3.2/alpine3.20/Dockerfile | 3 --- 3.3/alpine3.19/Dockerfile | 3 --- 3.3/alpine3.20/Dockerfile | 3 --- 3.4-rc/alpine3.19/Dockerfile | 3 --- 3.4-rc/alpine3.20/Dockerfile | 3 --- Dockerfile.template | 3 --- 9 files changed, 27 deletions(-) diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.19/Dockerfile index ab93cb5278..94b5ec47b4 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.19/Dockerfile @@ -84,9 +84,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index 7b0a19ee4d..c23adc3660 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -84,9 +84,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.19/Dockerfile index 1c16ef224e..84e7747328 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.19/Dockerfile @@ -106,9 +106,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 2583cc82b8..e460aba190 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -106,9 +106,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.19/Dockerfile index 25844db3f6..41524f2a47 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.19/Dockerfile @@ -104,9 +104,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 549eb8f454..963c1110bf 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -104,9 +104,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.19/Dockerfile index b2082a609c..ff329f04c0 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.19/Dockerfile @@ -104,9 +104,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index d69b2c4ad9..be4ce7f411 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -104,9 +104,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir { \ diff --git a/Dockerfile.template b/Dockerfile.template index c5ceed1ca4..ceb8c320e5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -215,9 +215,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# the configure script does not detect isnan/isinf as macros - export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \ - \ {{ ) else "" end -}} # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir From c79256398297d00ad8c393ef2a596767954b6042 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:28:03 +0100 Subject: [PATCH 400/462] https://alpinelinux.org/posts/Alpine-3.21.0-released.html As customary, drop alpine 3.19 --- 3.1/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.2/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.3/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.4-rc/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.1/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.2/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.3/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.4-rc/{alpine3.19 => alpine3.21}/Dockerfile (99%) diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.21/Dockerfile similarity index 99% rename from 3.1/alpine3.19/Dockerfile rename to 3.1/alpine3.21/Dockerfile index 94b5ec47b4..fea4377ce6 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.21/Dockerfile similarity index 99% rename from 3.2/alpine3.19/Dockerfile rename to 3.2/alpine3.21/Dockerfile index 34702e7fab..baf89084a7 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.21/Dockerfile similarity index 99% rename from 3.3/alpine3.19/Dockerfile rename to 3.3/alpine3.21/Dockerfile index cd3ef78009..f09af2234c 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.21/Dockerfile similarity index 99% rename from 3.4-rc/alpine3.19/Dockerfile rename to 3.4-rc/alpine3.21/Dockerfile index 49045d4c48..07c7820f05 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index a79aa0fced..e614243702 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ] }, "3.2": { @@ -71,8 +71,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" @@ -141,8 +141,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" @@ -218,8 +218,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" diff --git a/versions.sh b/versions.sh index aa5e6bc116..64bf090ebe 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.21", "3.20", - "3.19", empty # trailing comma hack | "alpine" + .) ] From 780654067ddce418269e6710c13b75de288c3c0d Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:18:01 +0100 Subject: [PATCH 401/462] Simplify gemrc nodoc Per https://stackoverflow.com/questions/1381725/how-to-make-no-ri-no-rdoc-the-default-for-gem-install#comment22636260_7662245 this is possible since rubygems 2.0.0 from 2012. I updated the comment to indicate this is only for the `gem` command, bundler already doesn't do this by default. It works: ``` $ gem install rubocop -v 1.69.0 Fetching rubocop-1.69.0.gem Successfully installed rubocop-1.69.0 1 gem installed $ gem update rubocop Updating installed gems Updating rubocop Fetching rubocop-1.69.1.gem Successfully installed rubocop-1.69.1 Gems updated: rubocop ``` --- 3.1/alpine3.20/Dockerfile | 7 ++----- 3.1/alpine3.21/Dockerfile | 7 ++----- 3.1/bookworm/Dockerfile | 7 ++----- 3.1/bullseye/Dockerfile | 7 ++----- 3.1/slim-bookworm/Dockerfile | 7 ++----- 3.1/slim-bullseye/Dockerfile | 7 ++----- 3.2/alpine3.20/Dockerfile | 7 ++----- 3.2/alpine3.21/Dockerfile | 7 ++----- 3.2/bookworm/Dockerfile | 7 ++----- 3.2/bullseye/Dockerfile | 7 ++----- 3.2/slim-bookworm/Dockerfile | 7 ++----- 3.2/slim-bullseye/Dockerfile | 7 ++----- 3.3/alpine3.20/Dockerfile | 7 ++----- 3.3/alpine3.21/Dockerfile | 7 ++----- 3.3/bookworm/Dockerfile | 7 ++----- 3.3/bullseye/Dockerfile | 7 ++----- 3.3/slim-bookworm/Dockerfile | 7 ++----- 3.3/slim-bullseye/Dockerfile | 7 ++----- 3.4-rc/alpine3.20/Dockerfile | 7 ++----- 3.4-rc/alpine3.21/Dockerfile | 7 ++----- 3.4-rc/bookworm/Dockerfile | 7 ++----- 3.4-rc/bullseye/Dockerfile | 7 ++----- 3.4-rc/slim-bookworm/Dockerfile | 7 ++----- 3.4-rc/slim-bullseye/Dockerfile | 7 ++----- Dockerfile.template | 7 ++----- 25 files changed, 50 insertions(+), 125 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index c23adc3660..f041772271 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index fea4377ce6..81fe32a009 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 3211192173..a2b97e9f35 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bookworm -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 245e907bab..627cd46b6f 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bullseye -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 6d83ac0675..eb96f931b9 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 22a77ef17f..3d51740b9d 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 0c31f8f0a5..30919ed40e 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index baf89084a7..1c1b1a8bac 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index a4b7dbc9de..394e1ea1f5 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bookworm -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 6bc60d287e..9dbdf061dd 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bullseye -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 4d9a904c0b..7142b0f356 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index d1e1b7f222..8d278ff263 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 8eae154635..4fdc15b5e2 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index f09af2234c..a12746bb93 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 5b2e811d0e..1b70985936 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bookworm -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 2dba313aef..330629dda2 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bullseye -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 8ad3904d07..6730cf491c 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 72152688f8..d68cc7a2b5 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index 383677edd0..7d62a786aa 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/alpine3.21/Dockerfile b/3.4-rc/alpine3.21/Dockerfile index 07c7820f05..9ae3322aad 100644 --- a/3.4-rc/alpine3.21/Dockerfile +++ b/3.4-rc/alpine3.21/Dockerfile @@ -17,13 +17,10 @@ RUN set -eux; \ zlib-dev \ ; -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index 2b05b59294..b7255c4144 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bookworm -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index 77f24fe450..22337629c7 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -6,13 +6,10 @@ FROM buildpack-deps:bullseye -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index b1244cda92..0eea038c9a 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index 67435a9410..412425643e 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -20,13 +20,10 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 diff --git a/Dockerfile.template b/Dockerfile.template index ceb8c320e5..3c17e98577 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -41,13 +41,10 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* {{ ) else "" end -}} -# skip installing gem documentation +# skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ - { \ - echo 'install: --no-document'; \ - echo 'update: --no-document'; \ - } >> /usr/local/etc/gemrc + echo 'gem: --no-document' >> /usr/local/etc/gemrc ENV LANG C.UTF-8 From 34da3c21b6eb8a63f2c72167f3ad46fe31260dc3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 12 Dec 2024 10:03:28 -0800 Subject: [PATCH 402/462] Update 3.4-rc to 3.4.0-rc1 --- 3.4-rc/alpine3.20/Dockerfile | 8 +++--- 3.4-rc/alpine3.21/Dockerfile | 8 +++--- 3.4-rc/bookworm/Dockerfile | 8 +++--- 3.4-rc/bullseye/Dockerfile | 8 +++--- 3.4-rc/slim-bookworm/Dockerfile | 8 +++--- 3.4-rc/slim-bullseye/Dockerfile | 8 +++--- versions.json | 44 ++++++++++++++++----------------- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile index 7d62a786aa..4d1ede484c 100644 --- a/3.4-rc/alpine3.20/Dockerfile +++ b/3.4-rc/alpine3.20/Dockerfile @@ -24,10 +24,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/alpine3.21/Dockerfile b/3.4-rc/alpine3.21/Dockerfile index 9ae3322aad..ae79b8a91a 100644 --- a/3.4-rc/alpine3.21/Dockerfile +++ b/3.4-rc/alpine3.21/Dockerfile @@ -24,10 +24,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile index b7255c4144..fea2d90147 100644 --- a/3.4-rc/bookworm/Dockerfile +++ b/3.4-rc/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile index 22337629c7..e7ea548dbd 100644 --- a/3.4-rc/bullseye/Dockerfile +++ b/3.4-rc/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile index 0eea038c9a..10045e7f27 100644 --- a/3.4-rc/slim-bookworm/Dockerfile +++ b/3.4-rc/slim-bookworm/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile index 412425643e..0238894b47 100644 --- a/3.4-rc/slim-bullseye/Dockerfile +++ b/3.4-rc/slim-bullseye/Dockerfile @@ -27,10 +27,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/ -ENV RUBY_VERSION 3.4.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7 +# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ +ENV RUBY_VERSION 3.4.0-rc1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index e614243702..ec5c2a6c90 100644 --- a/versions.json +++ b/versions.json @@ -179,39 +179,39 @@ }, "3.4": null, "3.4-rc": { - "version": "3.4.0-preview2", - "date": "2024-10-07", - "post": "/en/news/2024/10/07/ruby-3-4-0-preview2-released/", - "tag": "v3_4_0_preview2", + "version": "3.4.0-rc1", + "date": "2024-12-12", + "post": "/en/news/2024/12/12/ruby-3-4-0-rc1-released/", + "tag": "v3_4_0_rc1", "stats": { - "files_changed": 4422, - "insertions": 163889, - "deletions": 243380 + "files_changed": 4820, + "insertions": 196907, + "deletions": 253488 }, "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-preview2.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz" }, "size": { - "gz": 22722332, - "zip": 28101194, - "xz": 16878876 + "gz": 23055998, + "zip": 28323595, + "xz": 17116016 }, "sha1": { - "gz": "c23265acf6c07b4c1df1e41eebf8b4cf2f25b97b", - "zip": "479bd223bca3225fb3a15984e3eae4efb9a40189", - "xz": "dbff404b969012702dc500cac72f4d6b3822068e" + "gz": "216e3085ab8b886b9f74943ee5b62bd2e3d86671", + "zip": "4ae8ce4b15ccc3f0c6f42e408c44aa287a1ccc14", + "xz": "1424671cdc9c4bfe3778ac159d917c8bfe6107bd" }, "sha256": { - "gz": "443cd7ec54ade4786bc974ce9f5d49f172a60f8edc84b597b7fe2bd2a94b8371", - "zip": "e00a6fbf6f9e25a725711a8aac7e38be6bed61de4db9862a405172b96bf38b5b", - "xz": "626bf4fe952323c15ec9a8999f470ec136ef91c0fc34c484646aaaa9a0b62ca7" + "gz": "1f3187d3366e90af6d760994f8bfe1fe8999a8ba3553ea4dcfae63e548236e2a", + "zip": "653162a2db627e8e5feee22a00b20acf215509d88b06ffb281bc8788ed12c74c", + "xz": "9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17" }, "sha512": { - "gz": "0946d256587597bdf13437a50f7a3298c151133edea161a1c4806a04dcbd8c2e8a7fd617f3eda16c5c05f6e6346317562cc30ba67698f1fdd92237c03bdbd23e", - "zip": "0d9ee1c41920e4d594b0f2c40d02339b4e9a2cd5232f5ee914cab5a685cb4a2279fbbfd8fbad40ef0a53866db4e1de96068c62580ede6d8fab02550393bcbe81", - "xz": "f23257896a35d3a581cbf5e8c94fe28e45725e39608a7669f47f31085338b1b4929a4db40d826d8fee628afb97b0c25b2f9e7bda4cd42e80c1208c46caf54265" + "gz": "0b0420a39c0bf3b38600d4e28805a581c4b5a6cf2abe41be8c8164276a8044a19e676de74eea5dd5b4d7d667d821a6144119795fea510fd4ba6e34865a2ae172", + "zip": "c6c6b9a0e61308e3f3303cd148613feabb2ee12d8e2fefc1f4aa1403237310f7c9be5e2031248ea89ff01cdc0bca1a66ff60f9f1f19ed9c9fccef3d7a3bbebb8", + "xz": "5b92a2b5829ab23735617945839e45df984b319b8932e790a8e0c6f681b9bd74249511a76345516cc216c002ed7887bdd27151501491d5ecedc20acd3fb57cc5" }, "variants": [ "bookworm", From 15cf9d7e36c428e94867a4c8709246a426a83442 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 13 Dec 2024 15:02:49 -0800 Subject: [PATCH 403/462] Simplify and update `verify-templating.yml` This makes it print out a diff when there is an error (instead of just a list of files that are wrong), which will make the error more obvious. I also added `workflow_dispatch` so we can run it manually. --- .github/workflows/verify-templating.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 2e1fb78729..e822ba6bb9 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -3,6 +3,7 @@ name: Verify Templating on: pull_request: push: + workflow_dispatch: defaults: run: @@ -14,9 +15,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Apply Templates - run: ./apply-templates.sh - - name: Check Git Status - run: | - status="$(git status --short)" - [ -z "$status" ] + - run: ./apply-templates.sh + - run: git diff --exit-code From 3caadc6cd9931b347181c517968c2ad414c49760 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 25 Dec 2024 04:03:23 -0800 Subject: [PATCH 404/462] Update 3.4 to 3.4.1, rust 1.74.1, rustup 1.26.0 --- 3.4/alpine3.20/Dockerfile | 160 +++++++++++++++++++++++++++++++++++ 3.4/alpine3.21/Dockerfile | 160 +++++++++++++++++++++++++++++++++++ 3.4/bookworm/Dockerfile | 118 ++++++++++++++++++++++++++ 3.4/bullseye/Dockerfile | 118 ++++++++++++++++++++++++++ 3.4/slim-bookworm/Dockerfile | 144 +++++++++++++++++++++++++++++++ 3.4/slim-bullseye/Dockerfile | 144 +++++++++++++++++++++++++++++++ versions.json | 71 +++++++++++++++- 7 files changed, 914 insertions(+), 1 deletion(-) create mode 100644 3.4/alpine3.20/Dockerfile create mode 100644 3.4/alpine3.21/Dockerfile create mode 100644 3.4/bookworm/Dockerfile create mode 100644 3.4/bullseye/Dockerfile create mode 100644 3.4/slim-bookworm/Dockerfile create mode 100644 3.4/slim-bullseye/Dockerfile diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile new file mode 100644 index 0000000000..ff0e3a2966 --- /dev/null +++ b/3.4/alpine3.20/Dockerfile @@ -0,0 +1,160 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile new file mode 100644 index 0000000000..826e727fbc --- /dev/null +++ b/3.4/alpine3.21/Dockerfile @@ -0,0 +1,160 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-rundeps' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile new file mode 100644 index 0000000000..4566ff2398 --- /dev/null +++ b/3.4/bookworm/Dockerfile @@ -0,0 +1,118 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile new file mode 100644 index 0000000000..327b235ad7 --- /dev/null +++ b/3.4/bullseye/Dockerfile @@ -0,0 +1,118 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..b41f3d3019 --- /dev/null +++ b/3.4/slim-bookworm/Dockerfile @@ -0,0 +1,144 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..a00693b9d8 --- /dev/null +++ b/3.4/slim-bullseye/Dockerfile @@ -0,0 +1,144 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ +ENV RUBY_VERSION 3.4.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + g++ \ + gcc \ + libbz2-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libncurses-dev \ + libxml2-dev \ + libxslt-dev \ + make \ + wget \ + xz-utils \ + ; \ + rm -rf /var/lib/apt/lists/*; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# hack in "ENABLE_PATH_CHECK" disabling to suppress: +# warning: Insecure world writable dir + { \ + echo '#define ENABLE_PATH_CHECK 0'; \ + echo; \ + cat file.c; \ + } > file.c.new; \ + mv file.c.new file.c; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index ec5c2a6c90..17c7b90fbb 100644 --- a/versions.json +++ b/versions.json @@ -177,7 +177,76 @@ "version": "1.26.0" } }, - "3.4": null, + "3.4": { + "version": "3.4.1", + "date": "2024-12-25", + "post": "/en/news/2024/12/25/ruby-3-4-1-released/", + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz" + }, + "size": { + "gz": 23152739, + "zip": 28310267, + "xz": 17222800 + }, + "sha1": { + "gz": "dc42fe22bcdfbd30f63cd93296d893c53b1dadcc", + "zip": "a7145041a0178f2423dbad5d1dd67ba0862b9ee7", + "xz": "61783f85c57da9f05201e491029889d71742a83f" + }, + "sha256": { + "gz": "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f", + "zip": "a0c62089fb75c47e392bc96778dd76bd7ad1baa40a7ed040372c805de20bccc8", + "xz": "018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af" + }, + "sha512": { + "gz": "93acc262e3b7cf86aeddebdad5b8938c187b9c44a73b0c252b6f873745964001459ae45ece7376745916e317c24895596a42b4544e836670fc6e90058e6f0de4", + "zip": "4f96c56b0a26c0d4d554cf47764f4acdc2e59545da0b85fe4d5235a17d26ac47f0c609af66099173056e3405849a9f847c32e7aaaa3a057c7d46007968aa4c73", + "xz": "8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680" + }, + "variants": [ + "bookworm", + "slim-bookworm", + "bullseye", + "slim-bullseye", + "alpine3.21", + "alpine3.20" + ], + "rust": { + "version": "1.74.1" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", + "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.26.0" + } + }, "3.4-rc": { "version": "3.4.0-rc1", "date": "2024-12-12", From 559bc1286b221710db63f19681f28e24bb17cef7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 25 Dec 2024 04:52:17 -0800 Subject: [PATCH 405/462] Update 3.4-rc --- 3.4-rc/alpine3.20/Dockerfile | 160 -------------------------------- 3.4-rc/alpine3.21/Dockerfile | 160 -------------------------------- 3.4-rc/bookworm/Dockerfile | 118 ----------------------- 3.4-rc/bullseye/Dockerfile | 118 ----------------------- 3.4-rc/slim-bookworm/Dockerfile | 144 ---------------------------- 3.4-rc/slim-bullseye/Dockerfile | 144 ---------------------------- versions.json | 76 --------------- 7 files changed, 920 deletions(-) delete mode 100644 3.4-rc/alpine3.20/Dockerfile delete mode 100644 3.4-rc/alpine3.21/Dockerfile delete mode 100644 3.4-rc/bookworm/Dockerfile delete mode 100644 3.4-rc/bullseye/Dockerfile delete mode 100644 3.4-rc/slim-bookworm/Dockerfile delete mode 100644 3.4-rc/slim-bullseye/Dockerfile diff --git a/3.4-rc/alpine3.20/Dockerfile b/3.4-rc/alpine3.20/Dockerfile deleted file mode 100644 index 4d1ede484c..0000000000 --- a/3.4-rc/alpine3.20/Dockerfile +++ /dev/null @@ -1,160 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.4-rc/alpine3.21/Dockerfile b/3.4-rc/alpine3.21/Dockerfile deleted file mode 100644 index ae79b8a91a..0000000000 --- a/3.4-rc/alpine3.21/Dockerfile +++ /dev/null @@ -1,160 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-rundeps' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.4-rc/bookworm/Dockerfile b/3.4-rc/bookworm/Dockerfile deleted file mode 100644 index fea2d90147..0000000000 --- a/3.4-rc/bookworm/Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bookworm - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.4-rc/bullseye/Dockerfile b/3.4-rc/bullseye/Dockerfile deleted file mode 100644 index e7ea548dbd..0000000000 --- a/3.4-rc/bullseye/Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.4-rc/slim-bookworm/Dockerfile b/3.4-rc/slim-bookworm/Dockerfile deleted file mode 100644 index 10045e7f27..0000000000 --- a/3.4-rc/slim-bookworm/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.4-rc/slim-bullseye/Dockerfile b/3.4-rc/slim-bullseye/Dockerfile deleted file mode 100644 index 0238894b47..0000000000 --- a/3.4-rc/slim-bullseye/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2024/12/12/ruby-3-4-0-rc1-released/ -ENV RUBY_VERSION 3.4.0-rc1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - g++ \ - gcc \ - libbz2-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libncurses-dev \ - libxml2-dev \ - libxslt-dev \ - make \ - wget \ - xz-utils \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/versions.json b/versions.json index 17c7b90fbb..5df1475bab 100644 --- a/versions.json +++ b/versions.json @@ -246,81 +246,5 @@ }, "version": "1.26.0" } - }, - "3.4-rc": { - "version": "3.4.0-rc1", - "date": "2024-12-12", - "post": "/en/news/2024/12/12/ruby-3-4-0-rc1-released/", - "tag": "v3_4_0_rc1", - "stats": { - "files_changed": 4820, - "insertions": 196907, - "deletions": 253488 - }, - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.0-rc1.tar.xz" - }, - "size": { - "gz": 23055998, - "zip": 28323595, - "xz": 17116016 - }, - "sha1": { - "gz": "216e3085ab8b886b9f74943ee5b62bd2e3d86671", - "zip": "4ae8ce4b15ccc3f0c6f42e408c44aa287a1ccc14", - "xz": "1424671cdc9c4bfe3778ac159d917c8bfe6107bd" - }, - "sha256": { - "gz": "1f3187d3366e90af6d760994f8bfe1fe8999a8ba3553ea4dcfae63e548236e2a", - "zip": "653162a2db627e8e5feee22a00b20acf215509d88b06ffb281bc8788ed12c74c", - "xz": "9c54225747f7a786727aa6213503083d5d8ff7097505d4b7456ff60880ee4a17" - }, - "sha512": { - "gz": "0b0420a39c0bf3b38600d4e28805a581c4b5a6cf2abe41be8c8164276a8044a19e676de74eea5dd5b4d7d667d821a6144119795fea510fd4ba6e34865a2ae172", - "zip": "c6c6b9a0e61308e3f3303cd148613feabb2ee12d8e2fefc1f4aa1403237310f7c9be5e2031248ea89ff01cdc0bca1a66ff60f9f1f19ed9c9fccef3d7a3bbebb8", - "xz": "5b92a2b5829ab23735617945839e45df984b319b8932e790a8e0c6f681b9bd74249511a76345516cc216c002ed7887bdd27151501491d5ecedc20acd3fb57cc5" - }, - "variants": [ - "bookworm", - "slim-bookworm", - "bullseye", - "slim-bullseye", - "alpine3.21", - "alpine3.20" - ], - "rust": { - "version": "1.74.1" - }, - "rustup": { - "arches": { - "amd64": { - "glibc": { - "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" - } - }, - "arm64v8": { - "glibc": { - "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" - } - } - }, - "version": "1.26.0" - } } } From 7f078b1b01338e19130eb8b01cb7f35153ba6b04 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 7 Jan 2025 16:22:15 -0800 Subject: [PATCH 406/462] Remove runtime dependencies from slim and alpine variants These were never intended to be part of the "interface" of the `slim` and `alpine` images -- they were included before we had fancy `ldd`/`scanelf`-based runtime dependency inclusion, and were a metapackage that helped us avoid the complexity of `libyaml3` vs `libyaml4` (and making sure we install the correct one). This moves them to explicit build-time dependencies accordingly, as they should've always been. --- 3.1/alpine3.20/Dockerfile | 14 +++----------- 3.1/alpine3.21/Dockerfile | 14 +++----------- 3.1/slim-bookworm/Dockerfile | 13 ++++++------- 3.1/slim-bullseye/Dockerfile | 13 ++++++------- 3.2/alpine3.20/Dockerfile | 14 +++----------- 3.2/alpine3.21/Dockerfile | 14 +++----------- 3.2/slim-bookworm/Dockerfile | 13 ++++++------- 3.2/slim-bullseye/Dockerfile | 13 ++++++------- 3.3/alpine3.20/Dockerfile | 14 +++----------- 3.3/alpine3.21/Dockerfile | 14 +++----------- 3.3/slim-bookworm/Dockerfile | 13 ++++++------- 3.3/slim-bullseye/Dockerfile | 13 ++++++------- 3.4/alpine3.20/Dockerfile | 14 +++----------- 3.4/alpine3.21/Dockerfile | 14 +++----------- 3.4/slim-bookworm/Dockerfile | 13 ++++++------- 3.4/slim-bullseye/Dockerfile | 13 ++++++------- Dockerfile.template | 30 ++++++++++-------------------- 17 files changed, 82 insertions(+), 164 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index f041772271..c24521655a 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index 81fe32a009..0082054811 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index eb96f931b9..0ca7f68ca9 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,18 +37,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 3d51740b9d..e0cfccd508 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,18 +37,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 30919ed40e..ce2f4483fb 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index 1c1b1a8bac..17f0a3aed4 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 7142b0f356..43106aaf5e 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,18 +37,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 8d278ff263..c2608ee5b1 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,18 +37,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 4fdc15b5e2..60fe9edc9a 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index a12746bb93..45f40fd994 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 6730cf491c..0b785c50c1 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,17 +36,23 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index d68cc7a2b5..3efa48c8b1 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,17 +36,23 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index ff0e3a2966..535373b753 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 826e727fbc..714021fbb9 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index b41f3d3019..5043d21158 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,17 +36,23 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index a00693b9d8..8a0494a274 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,17 +36,23 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index 3c17e98577..821dd3f38e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -13,30 +13,11 @@ FROM debian:{{ env.variant | ltrimstr("slim-") }}-slim FROM buildpack-deps:{{ env.variant }} {{ ) end -}} -{{ if is_alpine then ( -}} -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -{{ ) elif is_slim then ( -}} +{{ if is_slim then ( -}} RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -73,6 +54,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -84,6 +66,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} readline-dev \ {{ ) else "" end -}} @@ -106,20 +90,26 @@ RUN set -eux; \ ruby \ {{ if is_slim then ( -}} autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} libreadline-dev \ {{ ) else "" end -}} + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ {{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/*; \ From d86ed5ea3aead8dc6c3d30bf7bc8d0344cc65466 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:45:10 +0100 Subject: [PATCH 407/462] Bump Rust to 1.84.0 This is a redo of https://github.com/docker-library/ruby/pull/478, now that there are no compilation issues for some platforms anymore. See https://bugs.ruby-lang.org/issues/20506 --- 3.2/alpine3.20/Dockerfile | 6 ++-- 3.2/alpine3.21/Dockerfile | 6 ++-- 3.2/bookworm/Dockerfile | 6 ++-- 3.2/bullseye/Dockerfile | 6 ++-- 3.2/slim-bookworm/Dockerfile | 6 ++-- 3.2/slim-bullseye/Dockerfile | 6 ++-- 3.3/alpine3.20/Dockerfile | 6 ++-- 3.3/alpine3.21/Dockerfile | 6 ++-- 3.3/bookworm/Dockerfile | 6 ++-- 3.3/bullseye/Dockerfile | 6 ++-- 3.3/slim-bookworm/Dockerfile | 6 ++-- 3.3/slim-bullseye/Dockerfile | 6 ++-- 3.4/alpine3.20/Dockerfile | 6 ++-- 3.4/alpine3.21/Dockerfile | 6 ++-- 3.4/bookworm/Dockerfile | 6 ++-- 3.4/bullseye/Dockerfile | 6 ++-- 3.4/slim-bookworm/Dockerfile | 6 ++-- 3.4/slim-bullseye/Dockerfile | 6 ++-- rust.json | 48 ++++++++++++++--------------- versions.json | 60 ++++++++++++++++++------------------ 20 files changed, 108 insertions(+), 108 deletions(-) diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 30919ed40e..330acb6343 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -67,8 +67,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -80,7 +80,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index 1c1b1a8bac..e00ccd602b 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -67,8 +67,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -80,7 +80,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 394e1ea1f5..5f83a1d7ba 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -35,8 +35,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -48,7 +48,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 9dbdf061dd..8a55a96d78 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -35,8 +35,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -48,7 +48,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 7142b0f356..9c2a74350a 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -75,7 +75,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 8d278ff263..e3632881e3 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -62,8 +62,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -75,7 +75,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 4fdc15b5e2..318bd8aa15 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index a12746bb93..01e6102561 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 1b70985936..7965037b98 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 330629dda2..62a747ccfb 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 6730cf491c..430108915a 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index d68cc7a2b5..8b1c61ccc4 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index ff0e3a2966..3c98fb1e47 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 826e727fbc..5e3a3f9008 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -65,8 +65,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -78,7 +78,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 4566ff2398..bfb3ccc039 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 327b235ad7..3e96669f5f 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index b41f3d3019..bcfc6898bf 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index a00693b9d8..ecee584356 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.74.1' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/rust.json b/rust.json index d95ed803a2..9e22f30435 100644 --- a/rust.json +++ b/rust.json @@ -1,83 +1,83 @@ { "rust": { - "version": "1.74.1" + "version": "1.84.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm32v5": { "glibc": { "arch": "arm-unknown-linux-gnueabi", - "sha256": "1fca5ad0f877f65c76f07bb0cbbe22c28b6e4ba883bf057f1a05636e8e2a4b40", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabi/rustup-init" + "sha256": "3e347090c436066be3d1d170f8c6743b5f9aab89c0a175e2e0dc902abea6b739", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabi/rustup-init" } }, "arm32v6": { "glibc": { "arch": "arm-unknown-linux-gnueabihf", - "sha256": "8f7801e93ec2c80e0253cba0e25c1085f92e8f49c7ddf9930be62d13361bd808", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/arm-unknown-linux-gnueabihf/rustup-init" + "sha256": "5568c68b02f2ca1ddc8c448badc4b0b2750bee3e50fe51a28c35f5b7792e36a2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabihf/rustup-init" } }, "arm32v7": { "glibc": { "arch": "armv7-unknown-linux-gnueabihf", - "sha256": "f21c44b01678c645d8fbba1e55e4180a01ac5af2d38bcbd14aa665e0d96ed69a", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/armv7-unknown-linux-gnueabihf/rustup-init" + "sha256": "3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/armv7-unknown-linux-gnueabihf/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } }, "i386": { "glibc": { "arch": "i686-unknown-linux-gnu", - "sha256": "e7b0f47557c1afcd86939b118cbcf7fb95a5d1d917bdd355157b63ca00fc4333", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/i686-unknown-linux-gnu/rustup-init" + "sha256": "0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/i686-unknown-linux-gnu/rustup-init" } }, "mips64le": { "glibc": { "arch": "mips64el-unknown-linux-gnuabi64", - "sha256": "b8a30dd0d0ba34324c5b2399e76ba44e50a036439cb66c92aef62b485fdc97c8", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/mips64el-unknown-linux-gnuabi64/rustup-init" + "sha256": "644cec63e594707a6098585038cf47e28546c2abe0dde7149cde71d79a0be674", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/mips64el-unknown-linux-gnuabi64/rustup-init" } }, "ppc64le": { "glibc": { "arch": "powerpc64le-unknown-linux-gnu", - "sha256": "1032934fb154ad2d365e02dcf770c6ecfaec6ab2987204c618c21ba841c97b44", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/powerpc64le-unknown-linux-gnu/rustup-init" + "sha256": "079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/powerpc64le-unknown-linux-gnu/rustup-init" } }, "s390x": { "glibc": { "arch": "s390x-unknown-linux-gnu", - "sha256": "414210ffd294a39ee5963e05d9f5a8435945657a1ddf74b14fd63f6eb898d69e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/s390x-unknown-linux-gnu/rustup-init" + "sha256": "e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/s390x-unknown-linux-gnu/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } } diff --git a/versions.json b/versions.json index 5df1475bab..2d087d8046 100644 --- a/versions.json +++ b/versions.json @@ -75,36 +75,36 @@ "alpine3.20" ], "rust": { - "version": "1.74.1" + "version": "1.84.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } }, "3.3": { @@ -145,36 +145,36 @@ "alpine3.20" ], "rust": { - "version": "1.74.1" + "version": "1.84.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } }, "3.4": { @@ -215,36 +215,36 @@ "alpine3.20" ], "rust": { - "version": "1.74.1" + "version": "1.84.0" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "7aa9e2a380a9958fc1fc426a3323209b2c86181c6816640979580f62ff7d48d4", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/x86_64-unknown-linux-musl/rustup-init" + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "b1962dfc18e1fd47d01341e6897cace67cddfabf547ef394e8883939bd6e002e", - "url": "https://static.rust-lang.org/rustup/archive/1.26.0/aarch64-unknown-linux-musl/rustup-init" + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.26.0" + "version": "1.27.1" } } } From 6f84caae95715928a3ed9c9753f844e03b3d5ff4 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:23:56 +0100 Subject: [PATCH 408/462] Revert "Remove runtime dependencies from slim and alpine variants" This reverts commit 7f078b1b01338e19130eb8b01cb7f35153ba6b04. It looks like this change is too disruptive. For example, modern rails apps all depend in `psych` which requires libyaml. I still think it makes sense, but should probably only be part of the next Ruby version so it doesn't suddently break for lots of people. --- 3.1/alpine3.20/Dockerfile | 14 +++++++++++--- 3.1/alpine3.21/Dockerfile | 14 +++++++++++--- 3.1/slim-bookworm/Dockerfile | 13 +++++++------ 3.1/slim-bullseye/Dockerfile | 13 +++++++------ 3.2/alpine3.20/Dockerfile | 14 +++++++++++--- 3.2/alpine3.21/Dockerfile | 14 +++++++++++--- 3.2/slim-bookworm/Dockerfile | 13 +++++++------ 3.2/slim-bullseye/Dockerfile | 13 +++++++------ 3.3/alpine3.20/Dockerfile | 14 +++++++++++--- 3.3/alpine3.21/Dockerfile | 14 +++++++++++--- 3.3/slim-bookworm/Dockerfile | 13 +++++++------ 3.3/slim-bullseye/Dockerfile | 13 +++++++------ 3.4/alpine3.20/Dockerfile | 14 +++++++++++--- 3.4/alpine3.21/Dockerfile | 14 +++++++++++--- 3.4/slim-bookworm/Dockerfile | 13 +++++++------ 3.4/slim-bullseye/Dockerfile | 13 +++++++------ Dockerfile.template | 30 ++++++++++++++++++++---------- 17 files changed, 164 insertions(+), 82 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index c24521655a..f041772271 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.20 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -34,7 +45,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -46,8 +56,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index 0082054811..81fe32a009 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.21 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -34,7 +45,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -46,8 +56,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 0ca7f68ca9..eb96f931b9 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -37,24 +44,18 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index e0cfccd508..3d51740b9d 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -37,24 +44,18 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 2938a880ab..330acb6343 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.20 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -34,7 +45,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -46,8 +56,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index b93c9512fd..e00ccd602b 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.21 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -34,7 +45,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -46,8 +56,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ readline-dev \ ruby \ tar \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 146d50f07f..9c2a74350a 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -37,24 +44,18 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 8b134b0365..e3632881e3 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -37,24 +44,18 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ libreadline-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index cfb7603a00..318bd8aa15 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.20 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -33,7 +44,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -45,8 +55,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ ruby \ tar \ xz \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 6bd871dc8e..01e6102561 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.21 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -33,7 +44,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -45,8 +55,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ ruby \ tar \ xz \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index baa8bd6d89..430108915a 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -36,23 +43,17 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index b95a1b2b00..8b1c61ccc4 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -36,23 +43,17 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index f458507f22..3c98fb1e47 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.20 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -33,7 +44,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -45,8 +55,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ ruby \ tar \ xz \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 1d6234fd07..5e3a3f9008 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -6,6 +6,17 @@ FROM alpine:3.21 +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -33,7 +44,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -45,8 +55,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ ruby \ tar \ xz \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index d99457ca25..bcfc6898bf 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -36,23 +43,17 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 49f290cfe0..ecee584356 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -9,7 +9,14 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -36,23 +43,17 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ diff --git a/Dockerfile.template b/Dockerfile.template index 821dd3f38e..3c17e98577 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -13,11 +13,30 @@ FROM debian:{{ env.variant | ltrimstr("slim-") }}-slim FROM buildpack-deps:{{ env.variant }} {{ ) end -}} -{{ if is_slim then ( -}} +{{ if is_alpine then ( -}} +RUN set -eux; \ + apk add --no-cache \ + bzip2 \ + ca-certificates \ + gmp-dev \ + libffi-dev \ + procps \ + yaml-dev \ + zlib-dev \ + ; + +{{ ) elif is_slim then ( -}} RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ + bzip2 \ ca-certificates \ + libffi-dev \ + libgmp-dev \ + libssl-dev \ + libyaml-dev \ + procps \ + zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -54,7 +73,6 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ - gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -66,8 +84,6 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ - yaml-dev \ - zlib-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} readline-dev \ {{ ) else "" end -}} @@ -90,26 +106,20 @@ RUN set -eux; \ ruby \ {{ if is_slim then ( -}} autoconf \ - bzip2 \ g++ \ gcc \ libbz2-dev \ - libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ - libgmp-dev \ libncurses-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} libreadline-dev \ {{ ) else "" end -}} - libssl-dev \ libxml2-dev \ libxslt-dev \ - libyaml-dev \ make \ wget \ xz-utils \ - zlib1g-dev \ {{ ) else "" end -}} ; \ rm -rf /var/lib/apt/lists/*; \ From 1ea0c595e6a6e477a66142b8ed40c82c2af3a28a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 14 Jan 2025 11:28:22 -0800 Subject: [PATCH 409/462] Remove packages again at next minor release of each series This adjusts the backwards-compatibility shim to be easier to remove in the future (and automatically removes it at each next minor release). --- 3.1/alpine3.20/Dockerfile | 29 ++++++++++------- 3.1/alpine3.21/Dockerfile | 29 ++++++++++------- 3.1/bookworm/Dockerfile | 2 +- 3.1/bullseye/Dockerfile | 2 +- 3.1/slim-bookworm/Dockerfile | 29 ++++++++++++----- 3.1/slim-bullseye/Dockerfile | 29 ++++++++++++----- 3.2/alpine3.20/Dockerfile | 29 ++++++++++------- 3.2/alpine3.21/Dockerfile | 29 ++++++++++------- 3.2/bookworm/Dockerfile | 2 +- 3.2/bullseye/Dockerfile | 2 +- 3.2/slim-bookworm/Dockerfile | 29 ++++++++++++----- 3.2/slim-bullseye/Dockerfile | 29 ++++++++++++----- 3.3/alpine3.20/Dockerfile | 29 ++++++++++------- 3.3/alpine3.21/Dockerfile | 29 ++++++++++------- 3.3/bookworm/Dockerfile | 2 +- 3.3/bullseye/Dockerfile | 2 +- 3.3/slim-bookworm/Dockerfile | 29 ++++++++++++----- 3.3/slim-bullseye/Dockerfile | 29 ++++++++++++----- 3.4/alpine3.20/Dockerfile | 29 ++++++++++------- 3.4/alpine3.21/Dockerfile | 29 ++++++++++------- 3.4/bookworm/Dockerfile | 2 +- 3.4/bullseye/Dockerfile | 2 +- 3.4/slim-bookworm/Dockerfile | 29 ++++++++++++----- 3.4/slim-bullseye/Dockerfile | 29 ++++++++++++----- Dockerfile.template | 62 +++++++++++++++++++++++------------- 25 files changed, 352 insertions(+), 190 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index f041772271..79df48905e 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ @@ -100,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' \ @@ -114,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 81fe32a009..9707f9727a 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ @@ -100,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' \ @@ -114,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 a2b97e9f35..f9394ef22a 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 627cd46b6f..dc1f558088 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 eb96f931b9..dfd77923e7 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,20 +37,25 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ 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; \ @@ -87,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 '{}' ';' \ @@ -98,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 3d51740b9d..81bcbd0ee2 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,20 +37,25 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ 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; \ @@ -87,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 '{}' ';' \ @@ -98,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 330acb6343..f8148ff66b 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ @@ -123,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 \ @@ -138,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 e00ccd602b..9e3b079642 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -45,6 +34,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -56,6 +46,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ readline-dev \ ruby \ tar \ @@ -123,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 \ @@ -138,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 5f83a1d7ba..d6b96fc48d 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 8a55a96d78..8c1b3baada 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 9c2a74350a..0c3aeb3e52 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,20 +37,25 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -110,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; \ @@ -122,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 e3632881e3..fc120633e7 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -44,20 +37,25 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ libreadline-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -110,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; \ @@ -122,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 318bd8aa15..d29ad2ed2d 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ @@ -121,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 \ @@ -136,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 01e6102561..5677ccfacf 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ @@ -121,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 \ @@ -136,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 7965037b98..4d0d7d7927 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 62a747ccfb..808e9e2ce5 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 430108915a..c3f0e9daea 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,19 +36,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -108,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; \ @@ -120,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 8b1c61ccc4..2969f9b92a 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,19 +36,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -108,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; \ @@ -120,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 3c98fb1e47..8eab13943b 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.20 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ @@ -121,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 \ @@ -136,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 5e3a3f9008..ab5ede4494 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -6,17 +6,6 @@ FROM alpine:3.21 -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ mkdir -p /usr/local/etc; \ @@ -44,6 +33,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -55,6 +45,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ ruby \ tar \ xz \ @@ -121,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 \ @@ -136,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 bfb3ccc039..a46fff501f 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 3e96669f5f..0280de385d 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 bcfc6898bf..fa29284278 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,19 +36,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -108,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; \ @@ -120,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 ecee584356..1033a5b43d 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -9,14 +9,7 @@ FROM debian:bullseye-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -43,19 +36,24 @@ RUN set -eux; \ libgdbm-dev \ ruby \ autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/*; \ \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ @@ -108,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; \ @@ -120,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 3c17e98577..4a3fc4aeeb 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -13,30 +13,11 @@ FROM debian:{{ env.variant | ltrimstr("slim-") }}-slim FROM buildpack-deps:{{ env.variant }} {{ ) end -}} -{{ if is_alpine then ( -}} -RUN set -eux; \ - apk add --no-cache \ - bzip2 \ - ca-certificates \ - gmp-dev \ - libffi-dev \ - procps \ - yaml-dev \ - zlib-dev \ - ; - -{{ ) elif is_slim then ( -}} +{{ if is_slim then ( -}} RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ - bzip2 \ ca-certificates \ - libffi-dev \ - libgmp-dev \ - libssl-dev \ - libyaml-dev \ - procps \ - zlib1g-dev \ ; \ rm -rf /var/lib/apt/lists/* @@ -73,6 +54,7 @@ RUN set -eux; \ gcc \ gdbm-dev \ glib-dev \ + gmp-dev \ libc-dev \ libffi-dev \ libxml2-dev \ @@ -84,6 +66,8 @@ RUN set -eux; \ openssl-dev \ patch \ procps \ + yaml-dev \ + zlib-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} readline-dev \ {{ ) else "" end -}} @@ -106,23 +90,28 @@ RUN set -eux; \ ruby \ {{ if is_slim then ( -}} autoconf \ + bzip2 \ g++ \ gcc \ libbz2-dev \ + libffi-dev \ libgdbm-compat-dev \ libglib2.0-dev \ + libgmp-dev \ libncurses-dev \ {{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} libreadline-dev \ {{ ) else "" end -}} + libssl-dev \ libxml2-dev \ libxslt-dev \ + libyaml-dev \ make \ wget \ xz-utils \ + zlib1g-dev \ {{ ) else "" end -}} ; \ - rm -rf /var/lib/apt/lists/*; \ {{ ) end -}} {{ if .rust.version then ( -}} \ @@ -235,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 -}} @@ -259,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 /; \ @@ -267,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; \ From 59bb4e05d063fe3fbf2ec0fc96d226a8e7c4f41d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 15 Jan 2025 04:03:22 -0800 Subject: [PATCH 410/462] Update 3.3 to 3.3.7 --- 3.3/alpine3.20/Dockerfile | 21 ++++----------------- 3.3/alpine3.21/Dockerfile | 21 ++++----------------- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 22 ++++------------------ 3.3/slim-bullseye/Dockerfile | 22 ++++------------------ versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 96 deletions(-) diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index d29ad2ed2d..c910b9b56b 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -113,19 +113,6 @@ 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 \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 5677ccfacf..55a0d9a68c 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -113,19 +113,6 @@ 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 \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 4d0d7d7927..5c7f0208b0 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 808e9e2ce5..e318266d68 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index c3f0e9daea..a99ba66dcb 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -106,20 +106,6 @@ 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; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 2969f9b92a..2efbb2d9ea 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/11/05/ruby-3-3-6-released/ -ENV RUBY_VERSION 3.3.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266 +# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ +ENV RUBY_VERSION 3.3.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -106,20 +106,6 @@ 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; \ diff --git a/versions.json b/versions.json index 2d087d8046..84666db1a2 100644 --- a/versions.json +++ b/versions.json @@ -108,33 +108,33 @@ } }, "3.3": { - "version": "3.3.6", - "date": "2024-11-05", - "post": "/en/news/2024/11/05/ruby-3-3-6-released/", + "version": "3.3.7", + "date": "2025-01-15", + "post": "/en/news/2025/01/15/ruby-3-3-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz" }, "size": { - "gz": 22153657, - "zip": 27048656, - "xz": 16398228 + "gz": 22163173, + "zip": 27589557, + "xz": 16379504 }, "sha1": { - "gz": "0106171cd1801fb5663e8e709f3d6c935d683c9b", - "zip": "88239456249cd80cadd1cbf98a317ae700ccd9df", - "xz": "25391e9bd8547cd07e09afcfc472777520a3178a" + "gz": "aaa94abd1a5676dd24e927876935597a505e2a4d", + "zip": "afe9800b8711aba57df5e11005a1710b48c9377e", + "xz": "b5498e7174328fe0af0d93ee9667d39dda36621b" }, "sha256": { - "gz": "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d", - "zip": "a60240a6f9bcc8db6c07d40ad29c7dceb21430debe3ebc39bf339207818132f6", - "xz": "540975969d1af42190d26ff629bc93b1c3f4bffff4ab253e245e125085e66266" + "gz": "9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628", + "zip": "9c6b1d13a03d8423391e070e324b1380a597d3ac9eb5d8ea40bc4fd5226556a5", + "xz": "5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72" }, "sha512": { - "gz": "4ae22f5c2a1f7ed84aab7587ff04ce4d9933cffe4347deaef0ab88d22c9780f274c1664a4ee1dd8235bc3cc749be828ffa8db7cb5f5002339a59a599acf3c729", - "zip": "c010c7d3e2b373b41a18bcadfb6dba276afabe479d75624569b5bdc605f3575bced2aff511708e25ceca43c7c918400222329e55e599c54154f203957f119ad2", - "xz": "c4b86188bf539fa737932e1ba5b746bc295e7c43b2f8cca2668eb7c88aa7228e2ce9032bbcd244a7d558a11bc842445b5fbeac3503ca7d223b63c53e08dba4ab" + "gz": "9b48be05d1210e9194c8a6d77dfc3227599bff2b55fc9bb2049b11547927deef530ece9a2a505600cdc492c8517b1bef7ab5f2520ebd79ffcf76f0a734fa763d", + "zip": "20f0ad9e80528c5c5d42c0be8e85cf3f120a20a973a7d8303785f4201263d7896c9a7462d8b862330c2d4039ab8d47616fa13ef487a2ed05490ca4e731c97ef2", + "xz": "4082a7684c1b0d53a0ce493f79568e851d37a864f59c58b2e0c273b2659e0ca75318ddff939fdf5e9d0a3eeba1b6d8f03bf88afb49a5ffd77714f1c8a7dfdd55" }, "variants": [ "bookworm", From 3a813c18eea9fa2060e02d238e39382b15618995 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 4 Feb 2025 10:03:17 -0800 Subject: [PATCH 411/462] Update 3.2 to 3.2.7 --- 3.2/alpine3.20/Dockerfile | 21 ++++----------------- 3.2/alpine3.21/Dockerfile | 21 ++++----------------- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/bullseye/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 22 ++++------------------ 3.2/slim-bullseye/Dockerfile | 22 ++++------------------ versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 96 deletions(-) diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index f8148ff66b..0c6e08f553 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -115,19 +115,6 @@ 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 \ diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index 9e3b079642..5057beee7a 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -115,19 +115,6 @@ 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 \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index d6b96fc48d..091fc56603 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 8c1b3baada..8780b712f8 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 0c3aeb3e52..b8adaa1781 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -108,20 +108,6 @@ 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; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index fc120633e7..0c6e0ba3f7 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/10/30/ruby-3-2-6-released/ -ENV RUBY_VERSION 3.2.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb +# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ +ENV RUBY_VERSION 3.2.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -108,20 +108,6 @@ 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; \ diff --git a/versions.json b/versions.json index 84666db1a2..8355b68f43 100644 --- a/versions.json +++ b/versions.json @@ -38,33 +38,33 @@ ] }, "3.2": { - "version": "3.2.6", - "date": "2024-10-30", - "post": "/en/news/2024/10/30/ruby-3-2-6-released/", + "version": "3.2.7", + "date": "2025-02-04", + "post": "/en/news/2025/02/04/ruby-3-2-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.6.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz" }, "size": { - "gz": 20521981, - "zip": 24653808, - "xz": 15126888 + "gz": 20548416, + "zip": 25129063, + "xz": 15128228 }, "sha1": { - "gz": "bbf265f5e7a3f480056dc2fa6d600a97cba00713", - "zip": "efbcfc2c2e238a7201366fdefdcf0dc16e4072af", - "xz": "eabbe230df704e7141d53d8221314bb33b5f0dea" + "gz": "c45aa881a7ea1175212d385fe5c8b6e9ff14b2e5", + "zip": "d18fbf11004fdc98bc2c221b167b0d62bfc98dd2", + "xz": "54e07b3adf1e948f5a35fc4ef9b24dd5976f1740" }, "sha256": { - "gz": "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370", - "zip": "36ca2292b48d8f6a0281d6c772dc47c358cb838774addc0344e38d4d2735704f", - "xz": "671134022238c2c4a9d79dc7d1e58c909634197617901d25863642f735a27ecb" + "gz": "8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741", + "zip": "e4efb7d9e8f8fee6c717917760796c3e29d6c644f9777e4a46bd0a69ed21d5fd", + "xz": "fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2" }, "sha512": { - "gz": "26ae9439043cf40e5eddde6b92ae51c9e1fa4e89c8ec6da36732c59c14873b022c683fb3007950d372f35de9b62a4fabbbc3ef1f4ef58cd53058bd56e1552cbe", - "zip": "8474829ebe13b3357f962571e8114e47634b5ed1f3e2dbfdf4ecb2ece1a3ed354f3506e8526a6768457e980ea4f056d77cd5b547419f2d8f9bea07348f64edc2", - "xz": "78f7fc76d47c772b9bc313cbcb57a2c0f1a975e09cfe46a3083f6f603d62b0031bd4c55896c8353c1c343974d45077e06e310111198d870883e06a0cf6fd03ce" + "gz": "174e70ac20a21ea77e2c5055a9123a6812109fd7b54c0f7b948312b8159eedbfb11c06120390c158430ca8543e36893da6c809883c82757082d22e08004c5055", + "zip": "5f57fb8b2d44187a8f900095cbe7bc90d9439c6436e3e361241b83102b85f665e3d7ed64fe1f6150dfb94eb289467f375ef24b46d5ac9b5f03b01ef31ed39606", + "xz": "c10b6fd27fad3bbd33d780c0a3eccb5df2a8465a89d2294ea6f14c7e5e8f7c8ea30b8a8b68bf8903c76f9133c5d984d5d66052ec4eb413153c739e6eea24beed" }, "variants": [ "bookworm", From c12fe5b7bc5547bb6d90f5ae3010d77869ce6918 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:36:37 +0100 Subject: [PATCH 412/462] Remove `ENABLE_PATH_CHECK` workaround Since Ruby 2.7, this warning is not emitted anymore It was removed as part of https://bugs.ruby-lang.org/issues/16131 Here's the output of running `ENV['PATH']` against various ruby versions, when `$PATH` contains a world-writable folder: ``` ===============1.8.7-p374================ -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 ===============1.9.3-p551================ -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 ===============2.0.0-p648================ -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 =================2.1.10================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 =================2.2.10================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 ==================2.3.8================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 =================2.4.10================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 ==================2.5.9================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 =================2.6.10================== -e:1: warning: Insecure world writable dir /app/whatever in PATH, mode 040757 ==================2.7.8================== ==================3.0.7================== ==================3.1.6================== ==================3.2.6================== ==================3.3.6================== ================3.4.0-rc1================ ``` In https://bugs.ruby-lang.org/issues/20971, it was OKed to officially deprecate since not emitting this was unintentional at the time --- 3.1/alpine3.20/Dockerfile | 9 --------- 3.1/alpine3.21/Dockerfile | 9 --------- 3.1/bookworm/Dockerfile | 9 --------- 3.1/bullseye/Dockerfile | 9 --------- 3.1/slim-bookworm/Dockerfile | 9 --------- 3.1/slim-bullseye/Dockerfile | 9 --------- 3.2/alpine3.20/Dockerfile | 9 --------- 3.2/alpine3.21/Dockerfile | 9 --------- 3.2/bookworm/Dockerfile | 9 --------- 3.2/bullseye/Dockerfile | 9 --------- 3.2/slim-bookworm/Dockerfile | 9 --------- 3.2/slim-bullseye/Dockerfile | 9 --------- 3.3/alpine3.20/Dockerfile | 9 --------- 3.3/alpine3.21/Dockerfile | 9 --------- 3.3/bookworm/Dockerfile | 9 --------- 3.3/bullseye/Dockerfile | 9 --------- 3.3/slim-bookworm/Dockerfile | 9 --------- 3.3/slim-bullseye/Dockerfile | 9 --------- 3.4/alpine3.20/Dockerfile | 9 --------- 3.4/alpine3.21/Dockerfile | 9 --------- 3.4/bookworm/Dockerfile | 9 --------- 3.4/bullseye/Dockerfile | 9 --------- 3.4/slim-bookworm/Dockerfile | 9 --------- 3.4/slim-bullseye/Dockerfile | 9 --------- Dockerfile.template | 9 --------- 25 files changed, 225 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index c24521655a..d72efdbd50 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -73,15 +73,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index 0082054811..7bfc4529e3 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -73,15 +73,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index a2b97e9f35..1935b0a3a7 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -41,15 +41,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 627cd46b6f..d599801722 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -41,15 +41,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 0ca7f68ca9..3dba1945e8 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -67,15 +67,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index e0cfccd508..7fa0019f96 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -67,15 +67,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index 2938a880ab..d2afd4e9fa 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -95,15 +95,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index b93c9512fd..5f828d922f 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -95,15 +95,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 5f83a1d7ba..ba9b4fe2b0 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -63,15 +63,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 8a55a96d78..0a93322b68 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -63,15 +63,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 146d50f07f..5447f826cf 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -89,15 +89,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 8b134b0365..92b0d6b803 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -89,15 +89,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index cfb7603a00..c4e58fe2bc 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -93,15 +93,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 6bd871dc8e..1c723c2cd6 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -93,15 +93,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 7965037b98..027509f391 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -62,15 +62,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 62a747ccfb..18ad718295 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -62,15 +62,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index baa8bd6d89..a24b6c4183 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -87,15 +87,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index b95a1b2b00..d38681238d 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -87,15 +87,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index f458507f22..e61bdbc71f 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -93,15 +93,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 1d6234fd07..81637b8254 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -93,15 +93,6 @@ RUN set -eux; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index bfb3ccc039..73c03cd28b 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -62,15 +62,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 3e96669f5f..0f023cd752 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -62,15 +62,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index d99457ca25..5c4467ec06 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -87,15 +87,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 49f290cfe0..bc12a637b8 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -87,15 +87,6 @@ RUN set -eux; \ \ cd /usr/src/ruby; \ \ -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ diff --git a/Dockerfile.template b/Dockerfile.template index 821dd3f38e..c5f6199076 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -203,15 +203,6 @@ RUN set -eux; \ rm thread-stack-fix.patch; \ \ {{ ) else "" end -}} -# hack in "ENABLE_PATH_CHECK" disabling to suppress: -# warning: Insecure world writable dir - { \ - echo '#define ENABLE_PATH_CHECK 0'; \ - echo; \ - cat file.c; \ - } > file.c.new; \ - mv file.c.new file.c; \ - \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ ./configure \ From b8c490723bba11a80431effaee96030475f643bb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 14 Feb 2025 16:00:36 -0800 Subject: [PATCH 413/462] Update 3.4 to 3.4.2 --- 3.4/alpine3.20/Dockerfile | 21 ++++----------------- 3.4/alpine3.21/Dockerfile | 21 ++++----------------- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/bullseye/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 22 ++++------------------ 3.4/slim-bullseye/Dockerfile | 22 ++++------------------ versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 96 deletions(-) diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index d542d7a333..4c54026937 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -104,19 +104,6 @@ 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 \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index db9d7c88b6..69b8e9cb09 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -104,19 +104,6 @@ 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 \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 59145070fb..0ae6caddcd 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 5d664b5674..4b0263baa9 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 21bfab0e1f..6781a996ab 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -97,20 +97,6 @@ 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; \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 4a42ac7e1d..3f81a3cd48 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/12/25/ruby-3-4-1-released/ -ENV RUBY_VERSION 3.4.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af +# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ +ENV RUBY_VERSION 3.4.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -97,20 +97,6 @@ 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; \ diff --git a/versions.json b/versions.json index 8355b68f43..8dbb885ce2 100644 --- a/versions.json +++ b/versions.json @@ -178,33 +178,33 @@ } }, "3.4": { - "version": "3.4.1", - "date": "2024-12-25", - "post": "/en/news/2024/12/25/ruby-3-4-1-released/", + "version": "3.4.2", + "date": "2025-02-14", + "post": "/en/news/2025/02/14/ruby-3-4-2-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz" }, "size": { - "gz": 23152739, - "zip": 28310267, - "xz": 17222800 + "gz": 23174066, + "zip": 28336243, + "xz": 17218200 }, "sha1": { - "gz": "dc42fe22bcdfbd30f63cd93296d893c53b1dadcc", - "zip": "a7145041a0178f2423dbad5d1dd67ba0862b9ee7", - "xz": "61783f85c57da9f05201e491029889d71742a83f" + "gz": "1537911b4a47940f11c309898e04187344a43167", + "zip": "5a790b8a5aa662df6512f865bb042e93b8520864", + "xz": "b169f9e0d35cf85085c5f23d774485ba6c00ebac" }, "sha256": { - "gz": "3d385e5d22d368b064c817a13ed8e3cc3f71a7705d7ed1bae78013c33aa7c87f", - "zip": "a0c62089fb75c47e392bc96778dd76bd7ad1baa40a7ed040372c805de20bccc8", - "xz": "018d59ffb52be3c0a6d847e22d3fd7a2c52d0ddfee249d3517a0c8c6dbfa70af" + "gz": "41328ac21f2bfdd7de6b3565ef4f0dd7543354d37e96f157a1552a6bd0eb364b", + "zip": "e14b850e831bf046cf78d66f14207782da13e76777610596666a74fd6c786021", + "xz": "ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0" }, "sha512": { - "gz": "93acc262e3b7cf86aeddebdad5b8938c187b9c44a73b0c252b6f873745964001459ae45ece7376745916e317c24895596a42b4544e836670fc6e90058e6f0de4", - "zip": "4f96c56b0a26c0d4d554cf47764f4acdc2e59545da0b85fe4d5235a17d26ac47f0c609af66099173056e3405849a9f847c32e7aaaa3a057c7d46007968aa4c73", - "xz": "8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680" + "gz": "edc3aede0aadcaa62343f38ea6cab7adacedba810d883f1d9c3e6e24e28e24e0e27a7df2c8e517cc2aab940168fc4872ab8cad000598aab5940aa79072ac190b", + "zip": "ac897cdc013b71ac3f76d1f70e9b79155a08197e458ddb7bfb638d1168d166b08fbc022aae95953bdade19ccd68989d666b76b6d681ee3480bb5936fb475959d", + "xz": "cb8b5023bce316393716548c5f0a44c7d0240724ff79b995517641266af30bedc6f402c1c8fa27368ea607e2aa6d36bbb201e00c6e9dd2a80d837431d32343b5" }, "variants": [ "bookworm", From 5331b92f3bb60480a551b28b325e5c312d5ee794 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 26 Mar 2025 04:03:11 -0700 Subject: [PATCH 414/462] Update 3.1 to 3.1.7 --- 3.1/alpine3.20/Dockerfile | 21 ++++----------------- 3.1/alpine3.21/Dockerfile | 21 ++++----------------- 3.1/bookworm/Dockerfile | 8 ++++---- 3.1/bullseye/Dockerfile | 8 ++++---- 3.1/slim-bookworm/Dockerfile | 22 ++++------------------ 3.1/slim-bullseye/Dockerfile | 22 ++++------------------ versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 96 deletions(-) diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile index 7ce90cf43e..8f23fa1ee3 100644 --- a/3.1/alpine3.20/Dockerfile +++ b/3.1/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,19 +83,6 @@ 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' \ diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile index c1d4a8936e..9d1f1f005e 100644 --- a/3.1/alpine3.21/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -83,19 +83,6 @@ 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' \ diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile index 98fd6d4db1..335e515fac 100644 --- a/3.1/bookworm/Dockerfile +++ b/3.1/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile index 5ef4702fc5..531bd7c46e 100644 --- a/3.1/bullseye/Dockerfile +++ b/3.1/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile index 93f999eb68..9d30273f7c 100644 --- a/3.1/slim-bookworm/Dockerfile +++ b/3.1/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -76,20 +76,6 @@ 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 '{}' ';' \ diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile index 6ee3d66502..e0bda294ae 100644 --- a/3.1/slim-bullseye/Dockerfile +++ b/3.1/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2024/05/29/ruby-3-1-6-released/ -ENV RUBY_VERSION 3.1.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ +ENV RUBY_VERSION 3.1.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built @@ -76,20 +76,6 @@ 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 '{}' ';' \ diff --git a/versions.json b/versions.json index 8dbb885ce2..75e1dca73a 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.1": { - "version": "3.1.6", - "date": "2024-05-29", - "post": "/en/news/2024/05/29/ruby-3-1-6-released/", + "version": "3.1.7", + "date": "2025-03-26", + "post": "/en/news/2025/03/26/ruby-3-1-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.zip" }, "size": { - "gz": 20887803, - "xz": 15273916, - "zip": 25211787 + "gz": 20811481, + "xz": 15196628, + "zip": 25555673 }, "sha1": { - "gz": "02832465f9b0f68b9fe2c443f9f602d6e840b2ca", - "xz": "2671606a00d0ad564fb93f92d093590563c4e25b", - "zip": "534e675022dc30c3674ee68a7b2fbe9300d64367" + "gz": "c2023f05989241d1f21409b980ffbda83b1cbe7b", + "xz": "1437e9ec92f2c166f5b04dbb0c21ac299aca0542", + "zip": "c2eeaba7ebdabc84ca7b77a14a1f83b16397c87e" }, "sha256": { - "gz": "0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22", - "xz": "597bd1849f252d8a6863cb5d38014ac54152b508c36dca156f6356a9e63c6102", - "zip": "c21d16e7953d65d05824834e89d7e1a58ccf2bc018fe966f785774ea383f53db" + "gz": "0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b", + "xz": "658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035", + "zip": "ab91106d0686cd30c375c309c58a5b96e68ac56e96c453c1d4f3fbb6c548dec7" }, "sha512": { - "gz": "624555ab3681bd6663bca7cf3529a969b9f0f16928559cfb713c57f763506c8740410c9b460d946922994859189ef2b9956167bd31423cf2e3acbf5a30086fe1", - "xz": "a3159648706d6d11ce9613201141e884b3accc69bf928c756de8a8f2b71d219886e91435d30cf2c30e85af31f87801138e10106344766100f1b80662c7244652", - "zip": "f8b5a0fda8dc0248f29796a0b5b67f93a825a013b92b0db437ecf0a5ffaf06a800285999a0e9a61e890a8000dd2e2c081a6ecb5dae62b1045761a13fd87c397b" + "gz": "a8432aaeaee4f48027ab30b7870bc61350840761b9d72b0b399d8fdfa96acb3c8f1ebe63663bcd8d835dd89b21128a07ef8f0c0c47eb41b942c169954ccb7edd", + "xz": "44e013f6e8d159a49125d24eaf02f58e02997fcd7bd4f4370250248c2d3264fb45183e33797638a7d9a2907fb48fe1b46f5f45514d60a800f96bce2c10baca82", + "zip": "febc49a0350558a8f3ad0d683c94321fc3437201c1adafdaa4e1a454234eef857d324e6ee1f95f5998d96fafce7f3a6c39483b3251a4a9ed4f64d80a1f73964e" }, "variants": [ "bookworm", From 00121708b79e89ee4c477dbae3035467ebe2484e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 26 Mar 2025 04:33:53 -0700 Subject: [PATCH 415/462] Update 3.2 to 3.2.8 --- 3.2/alpine3.20/Dockerfile | 8 ++++---- 3.2/alpine3.21/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/bullseye/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.20/Dockerfile index e439a31a7b..e47593ef3a 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index 5d8a44c8b5..e64238a9eb 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 0fedd902e3..9c6424988f 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index 506340ce95..d0cc1cbe1f 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index 16205f2401..e31d6d5af7 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 63cc60594d..11ee9e2026 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/04/ruby-3-2-7-released/ -ENV RUBY_VERSION 3.2.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2 +# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ +ENV RUBY_VERSION 3.2.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 75e1dca73a..fab612c6aa 100644 --- a/versions.json +++ b/versions.json @@ -38,33 +38,33 @@ ] }, "3.2": { - "version": "3.2.7", - "date": "2025-02-04", - "post": "/en/news/2025/02/04/ruby-3-2-7-released/", + "version": "3.2.8", + "date": "2025-03-26", + "post": "/en/news/2025/03/26/ruby-3-2-8-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.zip" }, "size": { - "gz": 20548416, - "zip": 25129063, - "xz": 15128228 + "gz": 20549999, + "xz": 15130380, + "zip": 25134315 }, "sha1": { - "gz": "c45aa881a7ea1175212d385fe5c8b6e9ff14b2e5", - "zip": "d18fbf11004fdc98bc2c221b167b0d62bfc98dd2", - "xz": "54e07b3adf1e948f5a35fc4ef9b24dd5976f1740" + "gz": "419ecff4a0f8e805ddb1314344ffad33afde91d8", + "xz": "570b529a10784fc16bb0339e6d37408adf9cd31d", + "zip": "c80bf2e90b3bbfbedc9c8b65d401ce4bd0ed4263" }, "sha256": { - "gz": "8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741", - "zip": "e4efb7d9e8f8fee6c717917760796c3e29d6c644f9777e4a46bd0a69ed21d5fd", - "xz": "fc159b0d4a8ce412948fb69e61493839a0b3e1d5c919180f27036f1c948cfbe2" + "gz": "77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075", + "xz": "1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c", + "zip": "c8ca517937c05e03ae52c41dad16ccf12ffae323365e73f3720142421f3aa2c7" }, "sha512": { - "gz": "174e70ac20a21ea77e2c5055a9123a6812109fd7b54c0f7b948312b8159eedbfb11c06120390c158430ca8543e36893da6c809883c82757082d22e08004c5055", - "zip": "5f57fb8b2d44187a8f900095cbe7bc90d9439c6436e3e361241b83102b85f665e3d7ed64fe1f6150dfb94eb289467f375ef24b46d5ac9b5f03b01ef31ed39606", - "xz": "c10b6fd27fad3bbd33d780c0a3eccb5df2a8465a89d2294ea6f14c7e5e8f7c8ea30b8a8b68bf8903c76f9133c5d984d5d66052ec4eb413153c739e6eea24beed" + "gz": "342d9ce337936cdbaa5d63a4d393edf0594e431add8cec3b6f17b884075bfdc5aa7a843c03f4ee3bece01700dfa4707bba653715a628d9dcb230762dbd3e5ac8", + "xz": "19ff96619945d907e509803b85ecf21750ffa4ae033045272feb43c183ab180d0033b98cf47c18804e448f01bc1928e3b833c61c98446dbe6be31fb9ea6b059d", + "zip": "e248bc2a37b32edca0508df3016ac933089170deba6eec5479d8fb45a3d022c4c9532de2b5486863d30233bd276b14335e8d5ee97c371746b26d64f4864e80d3" }, "variants": [ "bookworm", From 193c69e863a4c2bf86f6e323cb294fe1b8e1e845 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 26 Mar 2025 13:32:41 +0100 Subject: [PATCH 416/462] Remove slim/alpine temporary code None of these specific versions are build anymroe --- Dockerfile.template | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index a8ea7ef7f8..f9bb8795ae 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -215,34 +215,6 @@ 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 -}} From 85d6f77e0343ae00a355a56a3732353afb57ad7b Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 26 Mar 2025 13:37:48 +0100 Subject: [PATCH 417/462] Drop Ruby 3.1 Ruby 3.1.7 was released, which will be the last version. https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ --- 3.1/alpine3.20/Dockerfile | 121 ----------------------------------- 3.1/alpine3.21/Dockerfile | 121 ----------------------------------- 3.1/bookworm/Dockerfile | 86 ------------------------- 3.1/bullseye/Dockerfile | 86 ------------------------- 3.1/slim-bookworm/Dockerfile | 112 -------------------------------- 3.1/slim-bullseye/Dockerfile | 112 -------------------------------- Dockerfile.template | 8 +-- versions.json | 38 ----------- versions.sh | 27 ++++---- 9 files changed, 15 insertions(+), 696 deletions(-) delete mode 100644 3.1/alpine3.20/Dockerfile delete mode 100644 3.1/alpine3.21/Dockerfile delete mode 100644 3.1/bookworm/Dockerfile delete mode 100644 3.1/bullseye/Dockerfile delete mode 100644 3.1/slim-bookworm/Dockerfile delete mode 100644 3.1/slim-bullseye/Dockerfile diff --git a/3.1/alpine3.20/Dockerfile b/3.1/alpine3.20/Dockerfile deleted file mode 100644 index 8f23fa1ee3..0000000000 --- a/3.1/alpine3.20/Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/alpine3.21/Dockerfile b/3.1/alpine3.21/Dockerfile deleted file mode 100644 index 9d1f1f005e..0000000000 --- a/3.1/alpine3.21/Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/bookworm/Dockerfile b/3.1/bookworm/Dockerfile deleted file mode 100644 index 335e515fac..0000000000 --- a/3.1/bookworm/Dockerfile +++ /dev/null @@ -1,86 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bookworm - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/bullseye/Dockerfile b/3.1/bullseye/Dockerfile deleted file mode 100644 index 531bd7c46e..0000000000 --- a/3.1/bullseye/Dockerfile +++ /dev/null @@ -1,86 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bullseye - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/slim-bookworm/Dockerfile b/3.1/slim-bookworm/Dockerfile deleted file mode 100644 index 9d30273f7c..0000000000 --- a/3.1/slim-bookworm/Dockerfile +++ /dev/null @@ -1,112 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libreadline-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.1/slim-bullseye/Dockerfile b/3.1/slim-bullseye/Dockerfile deleted file mode 100644 index e0bda294ae..0000000000 --- a/3.1/slim-bullseye/Dockerfile +++ /dev/null @@ -1,112 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-1-7-released/ -ENV RUBY_VERSION 3.1.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libreadline-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index a8ea7ef7f8..a51d1d4548 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -41,7 +41,7 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ -{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -68,7 +68,7 @@ RUN set -eux; \ procps \ yaml-dev \ zlib-dev \ -{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} readline-dev \ {{ ) else "" end -}} ruby \ @@ -81,7 +81,7 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ -{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} {{ # https://github.com/docker-library/ruby/pull/438 -}} bison \ {{ ) else "" end -}} @@ -99,7 +99,7 @@ RUN set -eux; \ libglib2.0-dev \ libgmp-dev \ libncurses-dev \ -{{ if env.version | rtrimstr("-rc") | IN("3.1", "3.2") then ( -}} +{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} libreadline-dev \ {{ ) else "" end -}} libssl-dev \ diff --git a/versions.json b/versions.json index fab612c6aa..762f9f0b95 100644 --- a/versions.json +++ b/versions.json @@ -1,42 +1,4 @@ { - "3.1": { - "version": "3.1.7", - "date": "2025-03-26", - "post": "/en/news/2025/03/26/ruby-3-1-7-released/", - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.zip" - }, - "size": { - "gz": 20811481, - "xz": 15196628, - "zip": 25555673 - }, - "sha1": { - "gz": "c2023f05989241d1f21409b980ffbda83b1cbe7b", - "xz": "1437e9ec92f2c166f5b04dbb0c21ac299aca0542", - "zip": "c2eeaba7ebdabc84ca7b77a14a1f83b16397c87e" - }, - "sha256": { - "gz": "0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b", - "xz": "658acc455b6bda87ac6cc1380e86552b9c1af87055e7a127589c5bf7ed80b035", - "zip": "ab91106d0686cd30c375c309c58a5b96e68ac56e96c453c1d4f3fbb6c548dec7" - }, - "sha512": { - "gz": "a8432aaeaee4f48027ab30b7870bc61350840761b9d72b0b399d8fdfa96acb3c8f1ebe63663bcd8d835dd89b21128a07ef8f0c0c47eb41b942c169954ccb7edd", - "xz": "44e013f6e8d159a49125d24eaf02f58e02997fcd7bd4f4370250248c2d3264fb45183e33797638a7d9a2907fb48fe1b46f5f45514d60a800f96bce2c10baca82", - "zip": "febc49a0350558a8f3ad0d683c94321fc3437201c1adafdaa4e1a454234eef857d324e6ee1f95f5998d96fafce7f3a6c39483b3251a4a9ed4f64d80a1f73964e" - }, - "variants": [ - "bookworm", - "slim-bookworm", - "bullseye", - "slim-bullseye", - "alpine3.21", - "alpine3.20" - ] - }, "3.2": { "version": "3.2.8", "date": "2025-03-26", diff --git a/versions.sh b/versions.sh index 64bf090ebe..689ee3b4d1 100755 --- a/versions.sh +++ b/versions.sh @@ -95,22 +95,17 @@ for version in "${versions[@]}"; do ] ')" - case "$rcVersion" in - 3.1) ;; - *) - # YJIT - doc="$(jq <<<"$doc" -sc ' - .[1][].arches? |= if . then with_entries(select(.key | IN( - # https://github.com/ruby/ruby/blob/v3_2_0/doc/yjit/yjit.md ("currently supported for macOS and Linux on x86-64 and arm64/aarch64 CPUs") - # https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L3757-L3761 - "amd64", - "arm64v8", - empty # trailing comma - ))) else empty end - | add - ' - rust.json)" - ;; - esac + # YJIT + doc="$(jq <<<"$doc" -sc ' + .[1][].arches? |= if . then with_entries(select(.key | IN( + # https://github.com/ruby/ruby/blob/v3_2_0/doc/yjit/yjit.md ("currently supported for macOS and Linux on x86-64 and arm64/aarch64 CPUs") + # https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L3757-L3761 + "amd64", + "arm64v8", + empty # trailing comma + ))) else empty end + | add + ' - rust.json)" json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" From fd391a024df0e026b289e60e7bf1ed8db0c41e48 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 9 Apr 2025 10:03:15 -0700 Subject: [PATCH 418/462] Update 3.3 to 3.3.8 --- 3.3/alpine3.20/Dockerfile | 8 ++++---- 3.3/alpine3.21/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.20/Dockerfile index 622d21b22e..07fc6138bd 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 31fa7b2920..cdcdb14cb9 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 0a087ff3d8..e9dac0fde6 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 5eb24c77db..9182be7390 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index cad0fa8515..1bcd5a4be6 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index d6111c3607..05f20e99b0 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/01/15/ruby-3-3-7-released/ -ENV RUBY_VERSION 3.3.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72 +# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ +ENV RUBY_VERSION 3.3.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 762f9f0b95..db609ea2c6 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.3": { - "version": "3.3.7", - "date": "2025-01-15", - "post": "/en/news/2025/01/15/ruby-3-3-7-released/", + "version": "3.3.8", + "date": "2025-04-09", + "post": "/en/news/2025/04/09/ruby-3-3-8-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.zip" }, "size": { - "gz": 22163173, - "zip": 27589557, - "xz": 16379504 + "gz": 22197497, + "xz": 16435924, + "zip": 27628937 }, "sha1": { - "gz": "aaa94abd1a5676dd24e927876935597a505e2a4d", - "zip": "afe9800b8711aba57df5e11005a1710b48c9377e", - "xz": "b5498e7174328fe0af0d93ee9667d39dda36621b" + "gz": "71b8362d413f58ed5aef2ecd132769210c45f058", + "xz": "9ee07098fd930744d8df5d4945b5f99d2fecb9ef", + "zip": "4c0d938d2791ab696e921557aec19613bb364a67" }, "sha256": { - "gz": "9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628", - "zip": "9c6b1d13a03d8423391e070e324b1380a597d3ac9eb5d8ea40bc4fd5226556a5", - "xz": "5dbcbc605e0ed4b09c52703241577eb7edc3a2dc747e184c72b5285719b6ad72" + "gz": "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab", + "xz": "44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642", + "zip": "389b8deae02849e769855dea892c921d3387b6548209189837a00f1cdf353797" }, "sha512": { - "gz": "9b48be05d1210e9194c8a6d77dfc3227599bff2b55fc9bb2049b11547927deef530ece9a2a505600cdc492c8517b1bef7ab5f2520ebd79ffcf76f0a734fa763d", - "zip": "20f0ad9e80528c5c5d42c0be8e85cf3f120a20a973a7d8303785f4201263d7896c9a7462d8b862330c2d4039ab8d47616fa13ef487a2ed05490ca4e731c97ef2", - "xz": "4082a7684c1b0d53a0ce493f79568e851d37a864f59c58b2e0c273b2659e0ca75318ddff939fdf5e9d0a3eeba1b6d8f03bf88afb49a5ffd77714f1c8a7dfdd55" + "gz": "c5005ba4019fbae19650a9a9ce139e13608345065da9e2277dbeac9d0ac9e3b07b666816afe7be690088080c8c9cf88a8c372971d429479dcebea80d6c2e3883", + "xz": "71c2f3ac9955e088fa885fd2ff695e67362a770a5d33e5160081eda3dd298ca2c692e299b03d757caecfbc94043fedc4ad093de84c505585d480cb36bbf978b9", + "zip": "1aa6a0412760d0d1f423cd5f02533696b7c952c04f567b89aa875997e1d53a548c294c0b771a9e06e666daab038e3481a6251e361163449f92b02ab3a89a6373" }, "variants": [ "bookworm", From 235b3ffb2060c837137b32ea55f75816f2f4e4c4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 14 Apr 2025 10:03:18 -0700 Subject: [PATCH 419/462] Update 3.4 to 3.4.3 --- 3.4/alpine3.20/Dockerfile | 8 ++++---- 3.4/alpine3.21/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/bullseye/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index 4c54026937..866b27472d 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 69b8e9cb09..fae4148fe5 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 0ae6caddcd..591c6d6c5a 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 4b0263baa9..58ac4f272b 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 6781a996ab..7d973c2233 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 3f81a3cd48..7ab39e74de 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/02/14/ruby-3-4-2-released/ -ENV RUBY_VERSION 3.4.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0 +# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ +ENV RUBY_VERSION 3.4.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index db609ea2c6..d76b580e62 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.2", - "date": "2025-02-14", - "post": "/en/news/2025/02/14/ruby-3-4-2-released/", + "version": "3.4.3", + "date": "2025-04-14", + "post": "/en/news/2025/04/14/ruby-3-4-3-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz" }, "size": { - "gz": 23174066, - "zip": 28336243, - "xz": 17218200 + "gz": 23194448, + "zip": 28356998, + "xz": 17230984 }, "sha1": { - "gz": "1537911b4a47940f11c309898e04187344a43167", - "zip": "5a790b8a5aa662df6512f865bb042e93b8520864", - "xz": "b169f9e0d35cf85085c5f23d774485ba6c00ebac" + "gz": "c269cd122ab9d4620a1e0e6a8f4de378deec3799", + "zip": "87cb747a766660cf487a2e9dbbc7a18a8f6b65d9", + "xz": "d0d86fdfe6bcf9f2eb3b450f3209f655ceda86da" }, "sha256": { - "gz": "41328ac21f2bfdd7de6b3565ef4f0dd7543354d37e96f157a1552a6bd0eb364b", - "zip": "e14b850e831bf046cf78d66f14207782da13e76777610596666a74fd6c786021", - "xz": "ebf1c2eb58f5da17c23e965d658dd7e6202c5c50f5179154c5574452bef4b3e0" + "gz": "55a4cd1dcbe5ca27cf65e89a935a482c2bb2284832939266551c0ec68b437f46", + "zip": "06b8bf2ddf2642327c992d30f5d414ffa5a5df0c4c706d7b2507b42509fb5055", + "xz": "174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd" }, "sha512": { - "gz": "edc3aede0aadcaa62343f38ea6cab7adacedba810d883f1d9c3e6e24e28e24e0e27a7df2c8e517cc2aab940168fc4872ab8cad000598aab5940aa79072ac190b", - "zip": "ac897cdc013b71ac3f76d1f70e9b79155a08197e458ddb7bfb638d1168d166b08fbc022aae95953bdade19ccd68989d666b76b6d681ee3480bb5936fb475959d", - "xz": "cb8b5023bce316393716548c5f0a44c7d0240724ff79b995517641266af30bedc6f402c1c8fa27368ea607e2aa6d36bbb201e00c6e9dd2a80d837431d32343b5" + "gz": "7019889939713c3e649003fed4d973dced36239fc354cfdee2d01dbdeb7e8512881a31b00efc3d5017f08cd492aed7914d15927bc8d076c0cae7534273e471e9", + "zip": "b25289c899318ce5071b075fc1b75f602e0a543faeefa44df7e8064933500f9c357685fe21d09abc4034d481c22c89491c841f596d07e1cd269d800e6266cc24", + "xz": "b30aad675cdcc1bdfe9e5fffe9d1925db3b3ac854a5e34180c368bc6e66f73e29ba5d802fea249353b7d799c01384c58bdd763fd1b679303158baa7824b9c08e" }, "variants": [ "bookworm", From f0bf5f365387703579af740f915b6f32c4ee4c28 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 21 Apr 2025 15:41:34 -0700 Subject: [PATCH 420/462] Add 3.5 pre-release See https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ --- 3.5-rc/alpine3.20/Dockerfile | 143 ++++++++++++++++++++++++++++++++ 3.5-rc/alpine3.21/Dockerfile | 143 ++++++++++++++++++++++++++++++++ 3.5-rc/bookworm/Dockerfile | 109 ++++++++++++++++++++++++ 3.5-rc/bullseye/Dockerfile | 109 ++++++++++++++++++++++++ 3.5-rc/slim-bookworm/Dockerfile | 134 ++++++++++++++++++++++++++++++ 3.5-rc/slim-bullseye/Dockerfile | 134 ++++++++++++++++++++++++++++++ versions.json | 77 +++++++++++++++++ 7 files changed, 849 insertions(+) create mode 100644 3.5-rc/alpine3.20/Dockerfile create mode 100644 3.5-rc/alpine3.21/Dockerfile create mode 100644 3.5-rc/bookworm/Dockerfile create mode 100644 3.5-rc/bullseye/Dockerfile create mode 100644 3.5-rc/slim-bookworm/Dockerfile create mode 100644 3.5-rc/slim-bullseye/Dockerfile diff --git a/3.5-rc/alpine3.20/Dockerfile b/3.5-rc/alpine3.20/Dockerfile new file mode 100644 index 0000000000..100d0d5bad --- /dev/null +++ b/3.5-rc/alpine3.20/Dockerfile @@ -0,0 +1,143 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.5-rc/alpine3.21/Dockerfile b/3.5-rc/alpine3.21/Dockerfile new file mode 100644 index 0000000000..abfabe7935 --- /dev/null +++ b/3.5-rc/alpine3.21/Dockerfile @@ -0,0 +1,143 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.5-rc/bookworm/Dockerfile b/3.5-rc/bookworm/Dockerfile new file mode 100644 index 0000000000..7e3b5a1cb1 --- /dev/null +++ b/3.5-rc/bookworm/Dockerfile @@ -0,0 +1,109 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.5-rc/bullseye/Dockerfile b/3.5-rc/bullseye/Dockerfile new file mode 100644 index 0000000000..2aa035aa9d --- /dev/null +++ b/3.5-rc/bullseye/Dockerfile @@ -0,0 +1,109 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bullseye + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.5-rc/slim-bookworm/Dockerfile b/3.5-rc/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..7604e847c5 --- /dev/null +++ b/3.5-rc/slim-bookworm/Dockerfile @@ -0,0 +1,134 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/3.5-rc/slim-bullseye/Dockerfile b/3.5-rc/slim-bullseye/Dockerfile new file mode 100644 index 0000000000..d538daea28 --- /dev/null +++ b/3.5-rc/slim-bullseye/Dockerfile @@ -0,0 +1,134 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ +ENV RUBY_VERSION 3.5.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index d76b580e62..941205fb85 100644 --- a/versions.json +++ b/versions.json @@ -208,5 +208,82 @@ }, "version": "1.27.1" } + }, + "3.5": null, + "3.5-rc": { + "version": "3.5.0-preview1", + "date": "2025-04-18", + "post": "/en/news/2025/04/18/ruby-3-5-0-preview1-released/", + "tag": "v3_5_0_preview1", + "stats": { + "files_changed": 2065, + "insertions": 36581, + "deletions": 203037 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz" + }, + "size": { + "gz": 23146162, + "zip": 28548713, + "xz": 17443928 + }, + "sha1": { + "gz": "ee0fcfe1342116f05060279ff0c9eb1e215db0b9", + "zip": "bd0c32bc84ac1ce9edbc9c0a50e8c72e56b1229d", + "xz": "8a78a9189afa20cde42207a466bcf7d421ee144b" + }, + "sha256": { + "gz": "ecf09c7eb902e91cdaf9cc553cd00cca9b848b3fc0e14297850f9ab08cdd46f0", + "zip": "3e1d9df578c69976a01a69b961819d00c4e8942f8b5fe4fb8e135fca4f7e7e5e", + "xz": "c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa" + }, + "sha512": { + "gz": "d718973648705636eff5933a0919132fd1f6b9afea432e09cce1265c6e0125e11cc94dbff84cba1caefc03190c48d8af4a27337d2af031f3f1660ca3a3531211", + "zip": "47057e1615b2b59d5bbd0d6629e1320ed74f3d70748f1db4e8b88d6c8a3ecd255eacc7dac0cccd01923fae4b4dff9e6b9457a9858c81dab81c1ab9ee514b15fa", + "xz": "835bd0b65d546722c83b0ab454256357b48898a0de9aa8e38966f53d2370a6e99552eeaff76a0b680aefbbe7491e701e5e7357797e50f063c53e79d9561c1dac" + }, + "variants": [ + "bookworm", + "slim-bookworm", + "bullseye", + "slim-bullseye", + "alpine3.21", + "alpine3.20" + ], + "rust": { + "version": "1.84.0" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", + "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.27.1" + } } } From 1630a4622130d562bcb4cc0265b9d8b1494ce2fd Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Tue, 6 May 2025 13:42:23 +0200 Subject: [PATCH 421/462] Remove `.rust.version` check All versions are build with rust, so it is always present --- Dockerfile.template | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 9c77298098..9f9a68542e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -113,7 +113,6 @@ RUN set -eux; \ {{ ) else "" end -}} ; \ {{ ) end -}} -{{ if .rust.version then ( -}} \ rustArch=; \ {{ def archVar: if is_alpine then "apkArch" else "dpkgArch" end -}} @@ -181,7 +180,6 @@ RUN set -eux; \ rustc --version; \ cargo --version; \ fi; \ -{{ ) else "" end -}} \ wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ @@ -208,16 +206,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ -{{ if .rust.version then ( -}} ${rustArch:+--enable-yjit} \ -{{ ) else "" end -}} ; \ make -j "$(nproc)"; \ make install; \ \ -{{ if .rust.version then ( -}} rm -rf /tmp/rust; \ -{{ ) else "" end -}} {{ if is_alpine then ( -}} runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ From 7d865400f938b2597b3feffbd900040c11b41eed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 14 May 2025 16:03:19 -0700 Subject: [PATCH 422/462] Update 3.4 to 3.4.4 --- 3.4/alpine3.20/Dockerfile | 8 ++++---- 3.4/alpine3.21/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/bullseye/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.20/Dockerfile index 866b27472d..32c7ff4e9c 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.20/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index fae4148fe5..64acc59b1b 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 591c6d6c5a..254f64947e 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index 58ac4f272b..b9fe02e316 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 7d973c2233..c758f7d4b2 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 7ab39e74de..66e770c11d 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/14/ruby-3-4-3-released/ -ENV RUBY_VERSION 3.4.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd +# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ +ENV RUBY_VERSION 3.4.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 941205fb85..8283ab0335 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.3", - "date": "2025-04-14", - "post": "/en/news/2025/04/14/ruby-3-4-3-released/", + "version": "3.4.4", + "date": "2025-05-14", + "post": "/en/news/2025/05/14/ruby-3-4-4-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz" }, "size": { - "gz": 23194448, - "zip": 28356998, - "xz": 17230984 + "gz": 23204581, + "zip": 28372208, + "xz": 17255388 }, "sha1": { - "gz": "c269cd122ab9d4620a1e0e6a8f4de378deec3799", - "zip": "87cb747a766660cf487a2e9dbbc7a18a8f6b65d9", - "xz": "d0d86fdfe6bcf9f2eb3b450f3209f655ceda86da" + "gz": "aff18f17868d076f4516ea4209931ad55b264f73", + "zip": "77377010d19109939fe11cadf1c210deda8ec202", + "xz": "83ddf983c194b353634e91a86b466ce0d01bff39" }, "sha256": { - "gz": "55a4cd1dcbe5ca27cf65e89a935a482c2bb2284832939266551c0ec68b437f46", - "zip": "06b8bf2ddf2642327c992d30f5d414ffa5a5df0c4c706d7b2507b42509fb5055", - "xz": "174dcd8c516694f833fd3c93ea227fa6c3321464577a3882a6fc7e4fe20237fd" + "gz": "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85", + "zip": "7c64e2c303ef8433e01cb3afd9be094707a9aa60355fcee08d12ca90e1e46399", + "xz": "f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4" }, "sha512": { - "gz": "7019889939713c3e649003fed4d973dced36239fc354cfdee2d01dbdeb7e8512881a31b00efc3d5017f08cd492aed7914d15927bc8d076c0cae7534273e471e9", - "zip": "b25289c899318ce5071b075fc1b75f602e0a543faeefa44df7e8064933500f9c357685fe21d09abc4034d481c22c89491c841f596d07e1cd269d800e6266cc24", - "xz": "b30aad675cdcc1bdfe9e5fffe9d1925db3b3ac854a5e34180c368bc6e66f73e29ba5d802fea249353b7d799c01384c58bdd763fd1b679303158baa7824b9c08e" + "gz": "ec52e338a9558e5fb0975be4249ff47a2d8c7926d8ae3af58f4e5a233f400f75da88ce8254bac7a8cd7a6b0b87fd4eb7315944c76be43719782bd0c16040197b", + "zip": "f8dada5fae978b3eb82ed6863d3e8e25dfd90b3348eace2400d7428b0a1a9362bf88dc3138ef4b68bc5aaff781e90388e428390f5f55c5667fd24e4754544814", + "xz": "0d258cf790daad424c866404b5cbdc8adba0e4e13764847a89adf2335229e5184095c9f3e9594705897697e48bcc322d9a9f919b04047abb2075daca9fce8871" }, "variants": [ "bookworm", From 7d367fd4559ed09fedea90e1184638b36cfb64d2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 14:16:58 -0700 Subject: [PATCH 423/462] Add Alpine 3.22 (remove Alpine 3.20) --- 3.2/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 3.3/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 3.4/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 3.5-rc/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.2/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 3.3/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 3.4/{alpine3.20 => alpine3.22}/Dockerfile (99%) rename 3.5-rc/{alpine3.20 => alpine3.22}/Dockerfile (99%) diff --git a/3.2/alpine3.20/Dockerfile b/3.2/alpine3.22/Dockerfile similarity index 99% rename from 3.2/alpine3.20/Dockerfile rename to 3.2/alpine3.22/Dockerfile index e47593ef3a..16dd9848a5 100644 --- a/3.2/alpine3.20/Dockerfile +++ b/3.2/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.3/alpine3.20/Dockerfile b/3.3/alpine3.22/Dockerfile similarity index 99% rename from 3.3/alpine3.20/Dockerfile rename to 3.3/alpine3.22/Dockerfile index 07fc6138bd..c4529641e2 100644 --- a/3.3/alpine3.20/Dockerfile +++ b/3.3/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.4/alpine3.20/Dockerfile b/3.4/alpine3.22/Dockerfile similarity index 99% rename from 3.4/alpine3.20/Dockerfile rename to 3.4/alpine3.22/Dockerfile index 32c7ff4e9c..6120a0ccdd 100644 --- a/3.4/alpine3.20/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.5-rc/alpine3.20/Dockerfile b/3.5-rc/alpine3.22/Dockerfile similarity index 99% rename from 3.5-rc/alpine3.20/Dockerfile rename to 3.5-rc/alpine3.22/Dockerfile index 100d0d5bad..412062066f 100644 --- a/3.5-rc/alpine3.20/Dockerfile +++ b/3.5-rc/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/versions.json b/versions.json index 8283ab0335..61e1e627b6 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "rust": { "version": "1.84.0" @@ -103,8 +103,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "rust": { "version": "1.84.0" @@ -173,8 +173,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "rust": { "version": "1.84.0" @@ -250,8 +250,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "rust": { "version": "1.84.0" diff --git a/versions.sh b/versions.sh index 689ee3b4d1..9bcde726a3 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.22", "3.21", - "3.20", empty # trailing comma hack | "alpine" + .) ] From 3c44d7ea4e3913a0792bc55cd4509150acd6ebcf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 15 Jul 2025 10:53:49 -0700 Subject: [PATCH 424/462] Update 3.4 to 3.4.5 --- 3.4/alpine3.21/Dockerfile | 8 ++++---- 3.4/alpine3.22/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/bullseye/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 64acc59b1b..626fbb13c4 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index 6120a0ccdd..8444e9b888 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 254f64947e..9c1ef3f64a 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bullseye/Dockerfile b/3.4/bullseye/Dockerfile index b9fe02e316..e3c7445da3 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index c758f7d4b2..935df7afff 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-bullseye/Dockerfile index 66e770c11d..31cdaaaf2e 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/05/14/ruby-3-4-4-released/ -ENV RUBY_VERSION 3.4.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4 +# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ +ENV RUBY_VERSION 3.4.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 61e1e627b6..3b2f6c86b5 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.4", - "date": "2025-05-14", - "post": "/en/news/2025/05/14/ruby-3-4-4-released/", + "version": "3.4.5", + "date": "2025-07-15", + "post": "/en/news/2025/07/15/ruby-3-4-5-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz" }, "size": { - "gz": 23204581, - "zip": 28372208, - "xz": 17255388 + "gz": 23237143, + "zip": 28405937, + "xz": 17265032 }, "sha1": { - "gz": "aff18f17868d076f4516ea4209931ad55b264f73", - "zip": "77377010d19109939fe11cadf1c210deda8ec202", - "xz": "83ddf983c194b353634e91a86b466ce0d01bff39" + "gz": "ae40a537434bf432aa3b828bc4d13a295854cf40", + "zip": "33cb17388dfa915638eeea3ddd156b5c79f79428", + "xz": "d4e7363acb04604bd67276ed3c2ad016c2de87b2" }, "sha256": { - "gz": "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85", - "zip": "7c64e2c303ef8433e01cb3afd9be094707a9aa60355fcee08d12ca90e1e46399", - "xz": "f76d63efe9499dedd8526b74365c0c811af00dc9feb0bed7f5356488476e28f4" + "gz": "1d88d8a27b442fdde4aa06dc99e86b0bbf0b288963d8433112dd5fac798fd5ee", + "zip": "e1672ad3da2a8ea7820f4ede55d1d6f451c7f011c160991d4c9bdd4a38d18658", + "xz": "7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536" }, "sha512": { - "gz": "ec52e338a9558e5fb0975be4249ff47a2d8c7926d8ae3af58f4e5a233f400f75da88ce8254bac7a8cd7a6b0b87fd4eb7315944c76be43719782bd0c16040197b", - "zip": "f8dada5fae978b3eb82ed6863d3e8e25dfd90b3348eace2400d7428b0a1a9362bf88dc3138ef4b68bc5aaff781e90388e428390f5f55c5667fd24e4754544814", - "xz": "0d258cf790daad424c866404b5cbdc8adba0e4e13764847a89adf2335229e5184095c9f3e9594705897697e48bcc322d9a9f919b04047abb2075daca9fce8871" + "gz": "985928770dc8cd551de8df75c95e33b454586e88b532d98fef2d1bcaf74750ebc0265cf0517a5a7df8dbf273e33fb8f6f22c3915327f8a26227cc0abcfd4964f", + "zip": "557e220bca925d05af83d6779dbdf698f32f6e8b57c5138e9da80b02085faa134568a894949d2242ea1fe22b020035aa2b279c04791ac37c17f89dbf597a66c4", + "xz": "1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560" }, "variants": [ "bookworm", From 33e4f980322b70f078a64d9e61eae1af040df5c2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Jul 2025 04:03:09 -0700 Subject: [PATCH 425/462] Update 3.2 to 3.2.9 --- 3.2/alpine3.21/Dockerfile | 8 ++++---- 3.2/alpine3.22/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/bullseye/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.21/Dockerfile index e64238a9eb..0e0658c3a2 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.22/Dockerfile b/3.2/alpine3.22/Dockerfile index 16dd9848a5..8247a24ad4 100644 --- a/3.2/alpine3.22/Dockerfile +++ b/3.2/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 9c6424988f..11f2e3f51b 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bullseye/Dockerfile b/3.2/bullseye/Dockerfile index d0cc1cbe1f..b2052355d4 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index e31d6d5af7..b7057d03c5 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-bullseye/Dockerfile index 11ee9e2026..76afd63c56 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/03/26/ruby-3-2-8-released/ -ENV RUBY_VERSION 3.2.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ +ENV RUBY_VERSION 3.2.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 3b2f6c86b5..66999cbdb5 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.2": { - "version": "3.2.8", - "date": "2025-03-26", - "post": "/en/news/2025/03/26/ruby-3-2-8-released/", + "version": "3.2.9", + "date": "2025-07-24", + "post": "/en/news/2025/07/24/ruby-3-2-9-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.zip" }, "size": { - "gz": 20549999, - "xz": 15130380, - "zip": 25134315 + "gz": 20560944, + "xz": 15141728, + "zip": 25144424 }, "sha1": { - "gz": "419ecff4a0f8e805ddb1314344ffad33afde91d8", - "xz": "570b529a10784fc16bb0339e6d37408adf9cd31d", - "zip": "c80bf2e90b3bbfbedc9c8b65d401ce4bd0ed4263" + "gz": "174f37666192a3fdc9cf24e5eddc0cf4d5de0b1e", + "xz": "c1bb7eb3b2254f9513abfc0b9335f4da14bfa093", + "zip": "a853b1413e73a827ca2bee640550f4ae54c9fe18" }, "sha256": { - "gz": "77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075", - "xz": "1cccd3100155275293ae5d4ea0a1a1068f5de69e71732220f144acce26327a3c", - "zip": "c8ca517937c05e03ae52c41dad16ccf12ffae323365e73f3720142421f3aa2c7" + "gz": "abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a", + "xz": "cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2", + "zip": "a3fc780839729c138ac9ef543ac505d67f04e404b65a404419843a2fed2f661b" }, "sha512": { - "gz": "342d9ce337936cdbaa5d63a4d393edf0594e431add8cec3b6f17b884075bfdc5aa7a843c03f4ee3bece01700dfa4707bba653715a628d9dcb230762dbd3e5ac8", - "xz": "19ff96619945d907e509803b85ecf21750ffa4ae033045272feb43c183ab180d0033b98cf47c18804e448f01bc1928e3b833c61c98446dbe6be31fb9ea6b059d", - "zip": "e248bc2a37b32edca0508df3016ac933089170deba6eec5479d8fb45a3d022c4c9532de2b5486863d30233bd276b14335e8d5ee97c371746b26d64f4864e80d3" + "gz": "d3fc84ee71a85f5a9bc75d7354508adf197238ee6fa0f83d72bb7659aaf9d4294ae577d64f4a937b511abf241d44d190643227577dcd9cd04dc0553375913975", + "xz": "4db0656694c25c971bcf3591516e6feddb7fc60c4474b63dd1d2c1481c3629421edc904666067b2dcbc47357db1a32b7bf412055306fe29cee30fa048f89b6e3", + "zip": "6a313a36d6e630fb795d37f18da1e908d03c05d7200ef86e2260a18b5fc71f8f3201431f255e3cf7a47e0ee25ab5b9158b9477100ad6729e1f7ebf13f9b0a840" }, "variants": [ "bookworm", From 7381a0d50ab2347b8e3fe4ea3068ee18b0b60115 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Jul 2025 04:34:09 -0700 Subject: [PATCH 426/462] Update 3.3 to 3.3.9 --- 3.3/alpine3.21/Dockerfile | 8 ++++---- 3.3/alpine3.22/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/bullseye/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-bullseye/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index cdcdb14cb9..867a0105d4 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.22/Dockerfile b/3.3/alpine3.22/Dockerfile index c4529641e2..4d3728510c 100644 --- a/3.3/alpine3.22/Dockerfile +++ b/3.3/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index e9dac0fde6..a6c3a713c1 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bullseye/Dockerfile b/3.3/bullseye/Dockerfile index 9182be7390..bf468ae30c 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/bullseye/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 1bcd5a4be6..1ee20ce462 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-bullseye/Dockerfile index 05f20e99b0..e1291c858e 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-bullseye/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/09/ruby-3-3-8-released/ -ENV RUBY_VERSION 3.3.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642 +# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ +ENV RUBY_VERSION 3.3.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 66999cbdb5..b8f8d5de70 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.3": { - "version": "3.3.8", - "date": "2025-04-09", - "post": "/en/news/2025/04/09/ruby-3-3-8-released/", + "version": "3.3.9", + "date": "2025-07-24", + "post": "/en/news/2025/07/24/ruby-3-3-9-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.zip" }, "size": { - "gz": 22197497, - "xz": 16435924, - "zip": 27628937 + "gz": 22217076, + "xz": 16436904, + "zip": 27649882 }, "sha1": { - "gz": "71b8362d413f58ed5aef2ecd132769210c45f058", - "xz": "9ee07098fd930744d8df5d4945b5f99d2fecb9ef", - "zip": "4c0d938d2791ab696e921557aec19613bb364a67" + "gz": "26c37cff59c72a9249fa5fd3d9a301f320315ea1", + "xz": "b303b2dbcb46ce97c24e40ac0e3f5148058a2299", + "zip": "eff79d7ee7f23bf0d5c68a81b3f006878037fcd5" }, "sha256": { - "gz": "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab", - "xz": "44ae70fee043da3ce48289b7a52618ebe32dc083253993d486211c7e445c8642", - "zip": "389b8deae02849e769855dea892c921d3387b6548209189837a00f1cdf353797" + "gz": "d1991690a4e17233ec6b3c7844c1e1245c0adce3e00d713551d0458467b727b1", + "xz": "2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb", + "zip": "110546854051d5142eba38e9f212ac69a7862835634174a641f88796fefcf987" }, "sha512": { - "gz": "c5005ba4019fbae19650a9a9ce139e13608345065da9e2277dbeac9d0ac9e3b07b666816afe7be690088080c8c9cf88a8c372971d429479dcebea80d6c2e3883", - "xz": "71c2f3ac9955e088fa885fd2ff695e67362a770a5d33e5160081eda3dd298ca2c692e299b03d757caecfbc94043fedc4ad093de84c505585d480cb36bbf978b9", - "zip": "1aa6a0412760d0d1f423cd5f02533696b7c952c04f567b89aa875997e1d53a548c294c0b771a9e06e666daab038e3481a6251e361163449f92b02ab3a89a6373" + "gz": "3a8215e42dcaa9d28a74afbf371e88c7393ace54a606f96d3027edf23a41953ba53360d2dcd74a38008a4ec9ca18af3acf44686253d819891c0c613c29327254", + "xz": "52be800daf9e983dd7539f6961ee6d4e863c8f4eefdce4fb1091fdfe05339531832dd88d2a8b6f5cdcd790f9d5aefa3bc08574fcb2bab399200d20fa0ad1db18", + "zip": "67a6e0bdce21b237d8db62a8351fb544dc8cf15a1afcb111d0589b0384f6b977a3f779042ef49eb170256ac168e0477b8b56f343ab381422e788850c1d171382" }, "variants": [ "bookworm", From 26c507eea2fc314ad774636f40acac38233bf942 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 7 Aug 2025 21:20:07 +0200 Subject: [PATCH 427/462] Add debian trixie/Drop debian bullseye For Ruby 3.2 `libreadline-dev` is being installed which causes unwanted output during `dpkg-query --search`: ```sh dpkg-query --search *lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-merged libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8.2 libreadline8t64:amd64: /usr/lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.usr-is-merged diversion by libreadline8t64 from: /lib/x86_64-linux-gnu/libreadline.so.8.2 diversion by libreadline8t64 to: /lib/x86_64-linux-gnu/libreadline.so.8.2.usr-is-merged ``` I don't believe there is any way to control this output, so ignore those lines. Doesn't hurt to have this run on other versions, even though there aren't any other relevant packages that are affected. --- 3.2/bookworm/Dockerfile | 3 ++- 3.2/slim-bookworm/Dockerfile | 3 ++- 3.2/{slim-bullseye => slim-trixie}/Dockerfile | 9 +++++---- 3.2/{bullseye => trixie}/Dockerfile | 7 ++++--- 3.3/bookworm/Dockerfile | 3 ++- 3.3/slim-bookworm/Dockerfile | 3 ++- 3.3/{slim-bullseye => slim-trixie}/Dockerfile | 9 +++++---- 3.3/{bullseye => trixie}/Dockerfile | 7 ++++--- 3.4/bookworm/Dockerfile | 3 ++- 3.4/slim-bookworm/Dockerfile | 3 ++- 3.4/{slim-bullseye => slim-trixie}/Dockerfile | 9 +++++---- 3.4/{bullseye => trixie}/Dockerfile | 7 ++++--- 3.5-rc/bookworm/Dockerfile | 3 ++- 3.5-rc/slim-bookworm/Dockerfile | 3 ++- 3.5-rc/{slim-bullseye => slim-trixie}/Dockerfile | 9 +++++---- 3.5-rc/{bullseye => trixie}/Dockerfile | 7 ++++--- Dockerfile.template | 13 ++++++++++--- versions.json | 16 ++++++++-------- versions.sh | 2 +- 19 files changed, 71 insertions(+), 48 deletions(-) rename 3.2/{slim-bullseye => slim-trixie}/Dockerfile (93%) rename 3.2/{bullseye => trixie}/Dockerfile (92%) rename 3.3/{slim-bullseye => slim-trixie}/Dockerfile (93%) rename 3.3/{bullseye => trixie}/Dockerfile (92%) rename 3.4/{slim-bullseye => slim-trixie}/Dockerfile (93%) rename 3.4/{bullseye => trixie}/Dockerfile (92%) rename 3.5-rc/{slim-bullseye => slim-trixie}/Dockerfile (93%) rename 3.5-rc/{bullseye => trixie}/Dockerfile (92%) diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 11f2e3f51b..b3bc48359c 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -80,7 +80,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index b7057d03c5..f98bd9c664 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -106,7 +106,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-trixie/Dockerfile similarity index 93% rename from 3.2/slim-bullseye/Dockerfile rename to 3.2/slim-trixie/Dockerfile index 76afd63c56..790b4d7c15 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-trixie/Dockerfile @@ -4,14 +4,14 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ ca-certificates \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -106,12 +106,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/trixie/Dockerfile similarity index 92% rename from 3.2/bullseye/Dockerfile rename to 3.2/trixie/Dockerfile index b2052355d4..5101672e01 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -80,12 +80,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index a6c3a713c1..ef0157c5ac 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -79,7 +79,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 1ee20ce462..a40030513f 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-trixie/Dockerfile similarity index 93% rename from 3.3/slim-bullseye/Dockerfile rename to 3.3/slim-trixie/Dockerfile index e1291c858e..96ef30aa88 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -4,14 +4,14 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ ca-certificates \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -104,12 +104,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.3/bullseye/Dockerfile b/3.3/trixie/Dockerfile similarity index 92% rename from 3.3/bullseye/Dockerfile rename to 3.3/trixie/Dockerfile index bf468ae30c..b9aaf1553a 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -79,12 +79,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 9c1ef3f64a..49e674538d 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -79,7 +79,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 935df7afff..601a1952e5 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-trixie/Dockerfile similarity index 93% rename from 3.4/slim-bullseye/Dockerfile rename to 3.4/slim-trixie/Dockerfile index 31cdaaaf2e..24a1a291b9 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -4,14 +4,14 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ ca-certificates \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -104,12 +104,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.4/bullseye/Dockerfile b/3.4/trixie/Dockerfile similarity index 92% rename from 3.4/bullseye/Dockerfile rename to 3.4/trixie/Dockerfile index e3c7445da3..830ccb5878 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -79,12 +79,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.5-rc/bookworm/Dockerfile b/3.5-rc/bookworm/Dockerfile index 7e3b5a1cb1..abb1e8ab54 100644 --- a/3.5-rc/bookworm/Dockerfile +++ b/3.5-rc/bookworm/Dockerfile @@ -79,7 +79,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.5-rc/slim-bookworm/Dockerfile b/3.5-rc/slim-bookworm/Dockerfile index 7604e847c5..9f359ead41 100644 --- a/3.5-rc/slim-bookworm/Dockerfile +++ b/3.5-rc/slim-bookworm/Dockerfile @@ -104,7 +104,8 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ diff --git a/3.5-rc/slim-bullseye/Dockerfile b/3.5-rc/slim-trixie/Dockerfile similarity index 93% rename from 3.5-rc/slim-bullseye/Dockerfile rename to 3.5-rc/slim-trixie/Dockerfile index d538daea28..12f1096f41 100644 --- a/3.5-rc/slim-bullseye/Dockerfile +++ b/3.5-rc/slim-trixie/Dockerfile @@ -4,14 +4,14 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ ca-certificates \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -104,12 +104,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/3.5-rc/bullseye/Dockerfile b/3.5-rc/trixie/Dockerfile similarity index 92% rename from 3.5-rc/bullseye/Dockerfile rename to 3.5-rc/trixie/Dockerfile index 2aa035aa9d..33b582a2d8 100644 --- a/3.5-rc/bullseye/Dockerfile +++ b/3.5-rc/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ @@ -79,12 +79,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ \ cd /; \ rm -r /usr/src/ruby; \ diff --git a/Dockerfile.template b/Dockerfile.template index 9f9a68542e..c402e7366d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -4,6 +4,12 @@ ; def is_slim: env.variant | startswith("slim-") + ; + def clean_apt: + # TODO once bookworm is EOL, remove this and just hard-code "apt-get dist-clean" instead + if env.variant | contains("bookworm") then + "rm -rf /var/lib/apt/lists/*" + else "apt-get dist-clean" end -}} {{ if is_alpine then ( -}} FROM alpine:{{ env.variant | ltrimstr("alpine") }} @@ -19,7 +25,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ ca-certificates \ ; \ - rm -rf /var/lib/apt/lists/* + {{ clean_apt }} {{ ) else "" end -}} # skip installing gem documentation with `gem install`/`gem update` @@ -228,12 +234,13 @@ RUN set -eux; \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ | sort -u \ | xargs -r dpkg-query --search \ - | cut -d: -f1 \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ | sort -u \ | xargs -r apt-mark manual \ ; \ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/*; \ + {{ clean_apt }}; \ {{ ) end -}} \ cd /; \ diff --git a/versions.json b/versions.json index b8f8d5de70..e264455423 100644 --- a/versions.json +++ b/versions.json @@ -29,10 +29,10 @@ "zip": "6a313a36d6e630fb795d37f18da1e908d03c05d7200ef86e2260a18b5fc71f8f3201431f255e3cf7a47e0ee25ab5b9158b9477100ad6729e1f7ebf13f9b0a840" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -99,10 +99,10 @@ "zip": "67a6e0bdce21b237d8db62a8351fb544dc8cf15a1afcb111d0589b0384f6b977a3f779042ef49eb170256ac168e0477b8b56f343ab381422e788850c1d171382" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -169,10 +169,10 @@ "xz": "1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -246,10 +246,10 @@ "xz": "835bd0b65d546722c83b0ab454256357b48898a0de9aa8e38966f53d2370a6e99552eeaff76a0b680aefbbe7491e701e5e7357797e50f063c53e79d9561c1dac" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], diff --git a/versions.sh b/versions.sh index 9bcde726a3..3e9a90c914 100755 --- a/versions.sh +++ b/versions.sh @@ -83,8 +83,8 @@ for version in "${versions[@]}"; do doc="$(jq <<<"$doc" -c ' .variants = [ ( + "trixie", "bookworm", - "bullseye", empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( From 333f3821ba0612b148789456fe30af82fa4fa690 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 15 Sep 2025 22:03:19 -0700 Subject: [PATCH 428/462] Update 3.4 to 3.4.6 --- 3.4/alpine3.21/Dockerfile | 8 ++++---- 3.4/alpine3.22/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 626fbb13c4..3e35b6f8d5 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index 8444e9b888..919b626c32 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 49e674538d..7b813dd23b 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 601a1952e5..8647f134f9 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 24a1a291b9..89818b7178 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 830ccb5878..dda6a31e1f 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/15/ruby-3-4-5-released/ -ENV RUBY_VERSION 3.4.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536 +# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ +ENV RUBY_VERSION 3.4.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index e264455423..d38fd2dd03 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.5", - "date": "2025-07-15", - "post": "/en/news/2025/07/15/ruby-3-4-5-released/", + "version": "3.4.6", + "date": "2025-09-16", + "post": "/en/news/2025/09/16/ruby-3-4-6-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.5.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz" }, "size": { - "gz": 23237143, - "zip": 28405937, - "xz": 17265032 + "gz": 23266686, + "zip": 28452232, + "xz": 17303436 }, "sha1": { - "gz": "ae40a537434bf432aa3b828bc4d13a295854cf40", - "zip": "33cb17388dfa915638eeea3ddd156b5c79f79428", - "xz": "d4e7363acb04604bd67276ed3c2ad016c2de87b2" + "gz": "f44d45ca26d54ff92ab00a3515335cae755b18ec", + "zip": "fa2c444cf6e1bbd6833dba73552c54ed1b42d207", + "xz": "78541f3cdce140ec79ff481492244f04e8bc8f88" }, "sha256": { - "gz": "1d88d8a27b442fdde4aa06dc99e86b0bbf0b288963d8433112dd5fac798fd5ee", - "zip": "e1672ad3da2a8ea7820f4ede55d1d6f451c7f011c160991d4c9bdd4a38d18658", - "xz": "7b3a905b84b8777aa29f557bada695c3ce108390657e614d2cc9e2fb7e459536" + "gz": "e3c19ab9e8f41b3723124fbc0114cde7cbf55e65aa9c58c12acd89ec9c0dd1b9", + "zip": "408f04e22717ea8ba78c81544723d805e9ca955d06615192cfaa71b7903c66c4", + "xz": "804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8" }, "sha512": { - "gz": "985928770dc8cd551de8df75c95e33b454586e88b532d98fef2d1bcaf74750ebc0265cf0517a5a7df8dbf273e33fb8f6f22c3915327f8a26227cc0abcfd4964f", - "zip": "557e220bca925d05af83d6779dbdf698f32f6e8b57c5138e9da80b02085faa134568a894949d2242ea1fe22b020035aa2b279c04791ac37c17f89dbf597a66c4", - "xz": "1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560" + "gz": "94a0e316a4845243ba27e718c5c33e6ebad0432536454b2a1444000050e092f6c2b36a70c8f0b51e4ea68ef48519a117890d304cc6786560b8ee57a1d7a848e9", + "zip": "0066dfdec7a3ff27202e37fd97ec66880e9490dd0d2d49d06c786826eda261603eed80a058a4959fe0c12d446581992e10ae551ffd24810043bd1ad422a0bd2e", + "xz": "29000b3396ab95fc2dc13d2d78441ff5c34258e5421115181c54b1b4d55d5c0d4f3d0c3cec6b32b9a1bb8de5c51b383fcad4369ec3fb244fd0ce182afbe79ba4" }, "variants": [ "trixie", From 7b7c8319337974e0df7e809c2360027d873ab259 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 7 Oct 2025 16:03:17 -0700 Subject: [PATCH 429/462] Update 3.4 to 3.4.7 --- 3.4/alpine3.21/Dockerfile | 8 ++++---- 3.4/alpine3.22/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.21/Dockerfile index 3e35b6f8d5..cf78c1bd55 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index 919b626c32..f86ccca233 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 7b813dd23b..7573a26228 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 8647f134f9..d85e2452c5 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 89818b7178..d046ae6da4 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index dda6a31e1f..6da127a791 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/09/16/ruby-3-4-6-released/ -ENV RUBY_VERSION 3.4.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 +# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ +ENV RUBY_VERSION 3.4.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index d38fd2dd03..3212e45132 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.6", - "date": "2025-09-16", - "post": "/en/news/2025/09/16/ruby-3-4-6-released/", + "version": "3.4.7", + "date": "2025-10-07", + "post": "/en/news/2025/10/07/ruby-3-4-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.6.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz" }, "size": { - "gz": 23266686, - "zip": 28452232, - "xz": 17303436 + "gz": 23271433, + "zip": 28455721, + "xz": 17312044 }, "sha1": { - "gz": "f44d45ca26d54ff92ab00a3515335cae755b18ec", - "zip": "fa2c444cf6e1bbd6833dba73552c54ed1b42d207", - "xz": "78541f3cdce140ec79ff481492244f04e8bc8f88" + "gz": "eabc902f52d1580e63108bf5f5fe3f646d855e74", + "zip": "4cad16704d1031cba7395619111f0291ece50605", + "xz": "a07f568bda581a4b4f23c6fe91e1cef44e71f8f8" }, "sha256": { - "gz": "e3c19ab9e8f41b3723124fbc0114cde7cbf55e65aa9c58c12acd89ec9c0dd1b9", - "zip": "408f04e22717ea8ba78c81544723d805e9ca955d06615192cfaa71b7903c66c4", - "xz": "804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8" + "gz": "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36", + "zip": "0b250054d4330198bd98bcc30852e59a66d546d84ef1d347e05419bede537aef", + "xz": "db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7" }, "sha512": { - "gz": "94a0e316a4845243ba27e718c5c33e6ebad0432536454b2a1444000050e092f6c2b36a70c8f0b51e4ea68ef48519a117890d304cc6786560b8ee57a1d7a848e9", - "zip": "0066dfdec7a3ff27202e37fd97ec66880e9490dd0d2d49d06c786826eda261603eed80a058a4959fe0c12d446581992e10ae551ffd24810043bd1ad422a0bd2e", - "xz": "29000b3396ab95fc2dc13d2d78441ff5c34258e5421115181c54b1b4d55d5c0d4f3d0c3cec6b32b9a1bb8de5c51b383fcad4369ec3fb244fd0ce182afbe79ba4" + "gz": "7c9b807aa794a19377b0048da0e94869bf57905cf68d4f30b959aefb9f67834a51e06a23c9eee858e7f90938dbc38a5072bc946df502a6bcf86bf198ae061e22", + "zip": "3bf68557df908e51532f0b168c1d4cea335e20d38f7ad3b9fc80d747e0ce35391c78881df69b2f2eb0d4681a773d1c29cea717791a75e524793d6ed1ec7d2f8d", + "xz": "a6b99a2f1d0115d5e7efa710da440b9066c524c335928367c80852630f8db5da36c0a82d6e7ace90e8c40cb20c6097cbdca15a51c343254cadf5f0adf60f8505" }, "variants": [ "trixie", From 54c82927da7b67b0cb60a1bcd300d702ef565b7d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 23 Oct 2025 09:47:55 -0700 Subject: [PATCH 430/462] Update 3.3 to 3.3.10 --- 3.3/alpine3.21/Dockerfile | 8 ++++---- 3.3/alpine3.22/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-trixie/Dockerfile | 8 ++++---- 3.3/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.21/Dockerfile index 867a0105d4..fbc8adc153 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.22/Dockerfile b/3.3/alpine3.22/Dockerfile index 4d3728510c..83203e2254 100644 --- a/3.3/alpine3.22/Dockerfile +++ b/3.3/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index ef0157c5ac..8b394ec695 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index a40030513f..471e013439 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 96ef30aa88..44bdb24235 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index b9aaf1553a..707af44898 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-3-9-released/ -ENV RUBY_VERSION 3.3.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb +# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ +ENV RUBY_VERSION 3.3.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 3212e45132..b1b32ed549 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.3": { - "version": "3.3.9", - "date": "2025-07-24", - "post": "/en/news/2025/07/24/ruby-3-3-9-released/", + "version": "3.3.10", + "date": "2025-10-23", + "post": "/en/news/2025/10/23/ruby-3-3-10-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.zip" }, "size": { - "gz": 22217076, - "xz": 16436904, - "zip": 27649882 + "gz": 22233705, + "xz": 16450140, + "zip": 27696234 }, "sha1": { - "gz": "26c37cff59c72a9249fa5fd3d9a301f320315ea1", - "xz": "b303b2dbcb46ce97c24e40ac0e3f5148058a2299", - "zip": "eff79d7ee7f23bf0d5c68a81b3f006878037fcd5" + "gz": "e4be04af44d536ba3572c2ccedcaeb06078d021b", + "xz": "5db7cd707e7e79cd99f5d1009c754466c9d8d9e3", + "zip": "a86f6f429436f4caf445b335e13cf32a0a902394" }, "sha256": { - "gz": "d1991690a4e17233ec6b3c7844c1e1245c0adce3e00d713551d0458467b727b1", - "xz": "2b24a2180a2f7f63c099851a1d01e6928cf56d515d136a91bd2075423a7a76bb", - "zip": "110546854051d5142eba38e9f212ac69a7862835634174a641f88796fefcf987" + "gz": "b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928", + "xz": "3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c", + "zip": "157fc378c0e6a4a7a3e72669039b828986338188765260b5530957c1b8b57ea6" }, "sha512": { - "gz": "3a8215e42dcaa9d28a74afbf371e88c7393ace54a606f96d3027edf23a41953ba53360d2dcd74a38008a4ec9ca18af3acf44686253d819891c0c613c29327254", - "xz": "52be800daf9e983dd7539f6961ee6d4e863c8f4eefdce4fb1091fdfe05339531832dd88d2a8b6f5cdcd790f9d5aefa3bc08574fcb2bab399200d20fa0ad1db18", - "zip": "67a6e0bdce21b237d8db62a8351fb544dc8cf15a1afcb111d0589b0384f6b977a3f779042ef49eb170256ac168e0477b8b56f343ab381422e788850c1d171382" + "gz": "abfe212c189f7fd94ba2bb42efc45f20369ced193bbfdb4a677bd868b71e1d2f3941fed6e0b62c444fc16bc5c2073a5fee2c69037015408e2933308f407ad0a8", + "xz": "8b81cab7b98acb6ff7bdf864da5e97596ee1efa441e2a65991e12a7e3f3ad3d83b1b5c65ae108484252ec8f6d85db60eb381a174c759023beb202b5a0d20818a", + "zip": "70ee931fe6ceca0f105e270c882fc019299450fbe75b3da4cadc14a544270eda876eb8cba47a164cac2ada3116b70e6c24efa7061ceab62c1d4af20a16caaf35" }, "variants": [ "trixie", From 7e8d616d1a178acd0f6e570c9f208f8c5e1a11d6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 17 Nov 2025 13:24:51 -0800 Subject: [PATCH 431/462] Update to 4.0.0-preview2 3.5 is now 4.0: https://github.com/ruby/ruby/commit/6d81969b475262aba251e99b518181bdf7c5a523 --- {3.5-rc => 4.0-rc}/alpine3.21/Dockerfile | 8 ++-- {3.5-rc => 4.0-rc}/alpine3.22/Dockerfile | 8 ++-- {3.5-rc => 4.0-rc}/bookworm/Dockerfile | 8 ++-- {3.5-rc => 4.0-rc}/slim-bookworm/Dockerfile | 8 ++-- {3.5-rc => 4.0-rc}/slim-trixie/Dockerfile | 8 ++-- {3.5-rc => 4.0-rc}/trixie/Dockerfile | 8 ++-- versions.json | 48 ++++++++++----------- 7 files changed, 48 insertions(+), 48 deletions(-) rename {3.5-rc => 4.0-rc}/alpine3.21/Dockerfile (93%) rename {3.5-rc => 4.0-rc}/alpine3.22/Dockerfile (93%) rename {3.5-rc => 4.0-rc}/bookworm/Dockerfile (92%) rename {3.5-rc => 4.0-rc}/slim-bookworm/Dockerfile (93%) rename {3.5-rc => 4.0-rc}/slim-trixie/Dockerfile (93%) rename {3.5-rc => 4.0-rc}/trixie/Dockerfile (92%) diff --git a/3.5-rc/alpine3.21/Dockerfile b/4.0-rc/alpine3.21/Dockerfile similarity index 93% rename from 3.5-rc/alpine3.21/Dockerfile rename to 4.0-rc/alpine3.21/Dockerfile index abfabe7935..be1dfcf855 100644 --- a/3.5-rc/alpine3.21/Dockerfile +++ b/4.0-rc/alpine3.21/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.5-rc/alpine3.22/Dockerfile b/4.0-rc/alpine3.22/Dockerfile similarity index 93% rename from 3.5-rc/alpine3.22/Dockerfile rename to 4.0-rc/alpine3.22/Dockerfile index 412062066f..92223e7d58 100644 --- a/3.5-rc/alpine3.22/Dockerfile +++ b/4.0-rc/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.5-rc/bookworm/Dockerfile b/4.0-rc/bookworm/Dockerfile similarity index 92% rename from 3.5-rc/bookworm/Dockerfile rename to 4.0-rc/bookworm/Dockerfile index abb1e8ab54..a0ab98856d 100644 --- a/3.5-rc/bookworm/Dockerfile +++ b/4.0-rc/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.5-rc/slim-bookworm/Dockerfile b/4.0-rc/slim-bookworm/Dockerfile similarity index 93% rename from 3.5-rc/slim-bookworm/Dockerfile rename to 4.0-rc/slim-bookworm/Dockerfile index 9f359ead41..8902a6954b 100644 --- a/3.5-rc/slim-bookworm/Dockerfile +++ b/4.0-rc/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.5-rc/slim-trixie/Dockerfile b/4.0-rc/slim-trixie/Dockerfile similarity index 93% rename from 3.5-rc/slim-trixie/Dockerfile rename to 4.0-rc/slim-trixie/Dockerfile index 12f1096f41..84ad5cb0d6 100644 --- a/3.5-rc/slim-trixie/Dockerfile +++ b/4.0-rc/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.5-rc/trixie/Dockerfile b/4.0-rc/trixie/Dockerfile similarity index 92% rename from 3.5-rc/trixie/Dockerfile rename to 4.0-rc/trixie/Dockerfile index 33b582a2d8..686f2bfc66 100644 --- a/3.5-rc/trixie/Dockerfile +++ b/4.0-rc/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/04/18/ruby-3-5-0-preview1-released/ -ENV RUBY_VERSION 3.5.0-preview1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa +# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ +ENV RUBY_VERSION 4.0.0-preview2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index b1b32ed549..ae1a1a0d6d 100644 --- a/versions.json +++ b/versions.json @@ -209,41 +209,41 @@ "version": "1.27.1" } }, - "3.5": null, - "3.5-rc": { - "version": "3.5.0-preview1", - "date": "2025-04-18", - "post": "/en/news/2025/04/18/ruby-3-5-0-preview1-released/", - "tag": "v3_5_0_preview1", + "4.0": null, + "4.0-rc": { + "version": "4.0.0-preview2", + "date": "2025-11-17", + "post": "/en/news/2025/11/17/ruby-4-0-0-preview2-released/", + "tag": "v4_0_0_preview2", "stats": { - "files_changed": 2065, - "insertions": 36581, - "deletions": 203037 + "files_changed": 3607, + "insertions": 197451, + "deletions": 285607 }, "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.5/ruby-3.5.0-preview1.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz" }, "size": { - "gz": 23146162, - "zip": 28548713, - "xz": 17443928 + "gz": 23444451, + "zip": 28933540, + "xz": 17554228 }, "sha1": { - "gz": "ee0fcfe1342116f05060279ff0c9eb1e215db0b9", - "zip": "bd0c32bc84ac1ce9edbc9c0a50e8c72e56b1229d", - "xz": "8a78a9189afa20cde42207a466bcf7d421ee144b" + "gz": "132e450bbee3f61ed0b463ed1e2bd3a3a324339c", + "zip": "48a235cfbfd4252dce81da870c792e32309e62b9", + "xz": "f8e8b98ea85ac82610ab601a21dc9a90c5c56a97" }, "sha256": { - "gz": "ecf09c7eb902e91cdaf9cc553cd00cca9b848b3fc0e14297850f9ab08cdd46f0", - "zip": "3e1d9df578c69976a01a69b961819d00c4e8942f8b5fe4fb8e135fca4f7e7e5e", - "xz": "c6cc1e9f23fe4719b024b8305345ca0cff4e1bc159f3ebff86cb5b87969863aa" + "gz": "0a3330dae710302e11f7f0323e83219ab3c6517984691a312c662f329c5120e1", + "zip": "f5c68ee44dfcb76b61c07c437fa945814dfc516570b1c921506ac886960160ca", + "xz": "0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43" }, "sha512": { - "gz": "d718973648705636eff5933a0919132fd1f6b9afea432e09cce1265c6e0125e11cc94dbff84cba1caefc03190c48d8af4a27337d2af031f3f1660ca3a3531211", - "zip": "47057e1615b2b59d5bbd0d6629e1320ed74f3d70748f1db4e8b88d6c8a3ecd255eacc7dac0cccd01923fae4b4dff9e6b9457a9858c81dab81c1ab9ee514b15fa", - "xz": "835bd0b65d546722c83b0ab454256357b48898a0de9aa8e38966f53d2370a6e99552eeaff76a0b680aefbbe7491e701e5e7357797e50f063c53e79d9561c1dac" + "gz": "b5e681cc84be59148485b9a2212dcf54d61cfee27431ceddb49bedc8baa913ec8b36da43242cb4f1791b25e4bfc1dcf72b5527288a0656f2933da898d0e0b40f", + "zip": "508c685e46a641c74e2968daf650559503ce2bcaac3403654713adb2345c3ede2bace929294a1367afecac5edd6b2c42fa833f5313456f78c79151d310c860cf", + "xz": "7afaa8d8e832ef0ded28f1caf874da69f16105e1b3aad5947c6911364159b4c6ebd3d7ea5d7d86708e9f2f06a047921b8302ca6e75ec429a3da846845f896976" }, "variants": [ "trixie", From 6785f2adeba05201537f991bf70d5e3985278826 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 Dec 2025 11:55:18 -0800 Subject: [PATCH 432/462] Update to Alpine 3.23 Drop Alpine 3.21 accordingly --- 3.2/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.3/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.4/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 4.0-rc/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.2/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.3/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.4/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 4.0-rc/{alpine3.21 => alpine3.23}/Dockerfile (99%) diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.23/Dockerfile similarity index 99% rename from 3.2/alpine3.21/Dockerfile rename to 3.2/alpine3.23/Dockerfile index 0e0658c3a2..5ff74f74b4 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.23/Dockerfile similarity index 99% rename from 3.3/alpine3.21/Dockerfile rename to 3.3/alpine3.23/Dockerfile index fbc8adc153..382f1daae1 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.23/Dockerfile similarity index 99% rename from 3.4/alpine3.21/Dockerfile rename to 3.4/alpine3.23/Dockerfile index cf78c1bd55..1ba3b38f0e 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/4.0-rc/alpine3.21/Dockerfile b/4.0-rc/alpine3.23/Dockerfile similarity index 99% rename from 4.0-rc/alpine3.21/Dockerfile rename to 4.0-rc/alpine3.23/Dockerfile index be1dfcf855..a05d31240f 100644 --- a/4.0-rc/alpine3.21/Dockerfile +++ b/4.0-rc/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/versions.json b/versions.json index ae1a1a0d6d..ffc2355de2 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -103,8 +103,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -173,8 +173,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -250,8 +250,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" diff --git a/versions.sh b/versions.sh index 3e9a90c914..e7750774ff 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.23", "3.22", - "3.21", empty # trailing comma hack | "alpine" + .) ] From 55e358c6dfe15e9513eb02725a983d4e9daf37d2 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Tue, 9 Dec 2025 11:41:07 +0100 Subject: [PATCH 433/462] Build Ruby 4.0 or greater with zjit More details at https://bugs.ruby-lang.org/issues/21221 ZJIT requires rust 1.85, so bump the version. --- 3.2/alpine3.22/Dockerfile | 6 +-- 3.2/alpine3.23/Dockerfile | 6 +-- 3.2/bookworm/Dockerfile | 6 +-- 3.2/slim-bookworm/Dockerfile | 6 +-- 3.2/slim-trixie/Dockerfile | 6 +-- 3.2/trixie/Dockerfile | 6 +-- 3.3/alpine3.22/Dockerfile | 6 +-- 3.3/alpine3.23/Dockerfile | 6 +-- 3.3/bookworm/Dockerfile | 6 +-- 3.3/slim-bookworm/Dockerfile | 6 +-- 3.3/slim-trixie/Dockerfile | 6 +-- 3.3/trixie/Dockerfile | 6 +-- 3.4/alpine3.22/Dockerfile | 6 +-- 3.4/alpine3.23/Dockerfile | 6 +-- 3.4/bookworm/Dockerfile | 6 +-- 3.4/slim-bookworm/Dockerfile | 6 +-- 3.4/slim-trixie/Dockerfile | 6 +-- 3.4/trixie/Dockerfile | 6 +-- 4.0-rc/alpine3.22/Dockerfile | 7 +-- 4.0-rc/alpine3.23/Dockerfile | 7 +-- 4.0-rc/bookworm/Dockerfile | 7 +-- 4.0-rc/slim-bookworm/Dockerfile | 7 +-- 4.0-rc/slim-trixie/Dockerfile | 7 +-- 4.0-rc/trixie/Dockerfile | 7 +-- Dockerfile.template | 3 ++ rust.json | 46 +++++++++---------- versions.json | 80 ++++++++++++++++----------------- 27 files changed, 144 insertions(+), 135 deletions(-) diff --git a/3.2/alpine3.22/Dockerfile b/3.2/alpine3.22/Dockerfile index 8247a24ad4..afee446107 100644 --- a/3.2/alpine3.22/Dockerfile +++ b/3.2/alpine3.22/Dockerfile @@ -59,8 +59,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -72,7 +72,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/alpine3.23/Dockerfile b/3.2/alpine3.23/Dockerfile index 5ff74f74b4..21c77bf87d 100644 --- a/3.2/alpine3.23/Dockerfile +++ b/3.2/alpine3.23/Dockerfile @@ -59,8 +59,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -72,7 +72,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index b3bc48359c..05045d9b1f 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index f98bd9c664..c549281b71 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/slim-trixie/Dockerfile b/3.2/slim-trixie/Dockerfile index 790b4d7c15..5cd185f4aa 100644 --- a/3.2/slim-trixie/Dockerfile +++ b/3.2/slim-trixie/Dockerfile @@ -60,8 +60,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -73,7 +73,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.2/trixie/Dockerfile b/3.2/trixie/Dockerfile index 5101672e01..887297696e 100644 --- a/3.2/trixie/Dockerfile +++ b/3.2/trixie/Dockerfile @@ -34,8 +34,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -47,7 +47,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.22/Dockerfile b/3.3/alpine3.22/Dockerfile index 83203e2254..5948c13904 100644 --- a/3.3/alpine3.22/Dockerfile +++ b/3.3/alpine3.22/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/alpine3.23/Dockerfile b/3.3/alpine3.23/Dockerfile index 382f1daae1..89b43d286e 100644 --- a/3.3/alpine3.23/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 8b394ec695..c2c08c9b1d 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 471e013439..5fc4a16b56 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 44bdb24235..082045f501 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index 707af44898..e10db7d4db 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index f86ccca233..4abb32d3a7 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index 1ba3b38f0e..2f809650a3 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 7573a26228..f7529dff7d 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index d85e2452c5..5fb732f7ab 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index d046ae6da4..c676c6964b 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 6da127a791..7fa05b848e 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ diff --git a/4.0-rc/alpine3.22/Dockerfile b/4.0-rc/alpine3.22/Dockerfile index 92223e7d58..ea9a438508 100644 --- a/4.0-rc/alpine3.22/Dockerfile +++ b/4.0-rc/alpine3.22/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -100,6 +100,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/4.0-rc/alpine3.23/Dockerfile b/4.0-rc/alpine3.23/Dockerfile index a05d31240f..13ddf5d729 100644 --- a/4.0-rc/alpine3.23/Dockerfile +++ b/4.0-rc/alpine3.23/Dockerfile @@ -57,8 +57,8 @@ RUN set -eux; \ rustArch=; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64' ;; \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -70,7 +70,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -100,6 +100,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/4.0-rc/bookworm/Dockerfile b/4.0-rc/bookworm/Dockerfile index a0ab98856d..585145c944 100644 --- a/4.0-rc/bookworm/Dockerfile +++ b/4.0-rc/bookworm/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -68,6 +68,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/4.0-rc/slim-bookworm/Dockerfile b/4.0-rc/slim-bookworm/Dockerfile index 8902a6954b..4154d08375 100644 --- a/4.0-rc/slim-bookworm/Dockerfile +++ b/4.0-rc/slim-bookworm/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -93,6 +93,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/4.0-rc/slim-trixie/Dockerfile b/4.0-rc/slim-trixie/Dockerfile index 84ad5cb0d6..eec896dff5 100644 --- a/4.0-rc/slim-trixie/Dockerfile +++ b/4.0-rc/slim-trixie/Dockerfile @@ -58,8 +58,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -71,7 +71,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -93,6 +93,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/4.0-rc/trixie/Dockerfile b/4.0-rc/trixie/Dockerfile index 686f2bfc66..6ceb1b46dc 100644 --- a/4.0-rc/trixie/Dockerfile +++ b/4.0-rc/trixie/Dockerfile @@ -33,8 +33,8 @@ RUN set -eux; \ rustArch=; \ dpkgArch="$(dpkg --print-architecture)"; \ case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ esac; \ \ if [ -n "$rustArch" ]; then \ @@ -46,7 +46,7 @@ RUN set -eux; \ \ export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.84.0' --default-host "$rustArch"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ \ rustc --version; \ cargo --version; \ @@ -68,6 +68,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/Dockerfile.template b/Dockerfile.template index c402e7366d..27b9d22d9b 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -213,6 +213,9 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ +{{ if env.version | IN("3.2", "3.3", "3.4") then "" else ( -}} + ${rustArch:+--enable-zjit} \ +{{ ) end -}} ; \ make -j "$(nproc)"; \ make install; \ diff --git a/rust.json b/rust.json index 9e22f30435..d2517f8ff9 100644 --- a/rust.json +++ b/rust.json @@ -1,83 +1,83 @@ { "rust": { - "version": "1.84.0" + "version": "1.91.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" } }, "arm32v5": { "glibc": { "arch": "arm-unknown-linux-gnueabi", - "sha256": "3e347090c436066be3d1d170f8c6743b5f9aab89c0a175e2e0dc902abea6b739", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabi/rustup-init" + "sha256": "3ec755aaa801bdca4caba35cfe3d1657c9c117d87e2e4dd355ab98539115ad45", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/arm-unknown-linux-gnueabi/rustup-init" } }, "arm32v6": { "glibc": { "arch": "arm-unknown-linux-gnueabihf", - "sha256": "5568c68b02f2ca1ddc8c448badc4b0b2750bee3e50fe51a28c35f5b7792e36a2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/arm-unknown-linux-gnueabihf/rustup-init" + "sha256": "231a2a004e6e446a1944f957d0eaed858fb9a549264db8dd00a30f491fc67eb8", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/arm-unknown-linux-gnueabihf/rustup-init" } }, "arm32v7": { "glibc": { "arch": "armv7-unknown-linux-gnueabihf", - "sha256": "3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/armv7-unknown-linux-gnueabihf/rustup-init" + "sha256": "3b8daab6cc3135f2cd4b12919559e6adaee73a2fbefb830fadf0405c20231d61", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/armv7-unknown-linux-gnueabihf/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" } }, "i386": { "glibc": { "arch": "i686-unknown-linux-gnu", - "sha256": "0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/i686-unknown-linux-gnu/rustup-init" + "sha256": "a5db2c4b29d23e9b318b955dd0337d6b52e93933608469085c924e0d05b1df1f", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/i686-unknown-linux-gnu/rustup-init" } }, "mips64le": { "glibc": { "arch": "mips64el-unknown-linux-gnuabi64", "sha256": "644cec63e594707a6098585038cf47e28546c2abe0dde7149cde71d79a0be674", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/mips64el-unknown-linux-gnuabi64/rustup-init" + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/mips64el-unknown-linux-gnuabi64/rustup-init" } }, "ppc64le": { "glibc": { "arch": "powerpc64le-unknown-linux-gnu", - "sha256": "079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/powerpc64le-unknown-linux-gnu/rustup-init" + "sha256": "acd89c42b47c93bd4266163a7b05d3f26287d5148413c0d47b2e8a7aa67c9dc0", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/powerpc64le-unknown-linux-gnu/rustup-init" } }, "s390x": { "glibc": { "arch": "s390x-unknown-linux-gnu", - "sha256": "e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/s390x-unknown-linux-gnu/rustup-init" + "sha256": "726b7fd5d8805e73eab4a024a2889f8859d5a44e36041abac0a2436a52d42572", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/s390x-unknown-linux-gnu/rustup-init" } } }, - "version": "1.27.1" + "version": "1.28.2" } } diff --git a/versions.json b/versions.json index ffc2355de2..ed41509ca1 100644 --- a/versions.json +++ b/versions.json @@ -37,36 +37,36 @@ "alpine3.22" ], "rust": { - "version": "1.84.0" + "version": "1.91.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.28.2" } }, "3.3": { @@ -107,36 +107,36 @@ "alpine3.22" ], "rust": { - "version": "1.84.0" + "version": "1.91.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.28.2" } }, "3.4": { @@ -177,36 +177,36 @@ "alpine3.22" ], "rust": { - "version": "1.84.0" + "version": "1.91.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.28.2" } }, "4.0": null, @@ -254,36 +254,36 @@ "alpine3.22" ], "rust": { - "version": "1.84.0" + "version": "1.91.1" }, "rustup": { "arches": { "amd64": { "glibc": { "arch": "x86_64-unknown-linux-gnu", - "sha256": "6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-gnu/rustup-init" + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "x86_64-unknown-linux-musl", - "sha256": "1455d1df3825c5f24ba06d9dd1c7052908272a2cae9aa749ea49d67acbe22b47", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-linux-musl/rustup-init" + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" } }, "arm64v8": { "glibc": { "arch": "aarch64-unknown-linux-gnu", - "sha256": "1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-gnu/rustup-init" + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" }, "musl": { "arch": "aarch64-unknown-linux-musl", - "sha256": "7087ada906cd27a00c8e0323401a46804a03a742bd07811da6dead016617cc64", - "url": "https://static.rust-lang.org/rustup/archive/1.27.1/aarch64-unknown-linux-musl/rustup-init" + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" } } }, - "version": "1.27.1" + "version": "1.28.2" } } } From 962d80d2715eaf7e8436d0fa7c9093fd32e3fb8d Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 11 Dec 2025 11:13:22 -0800 Subject: [PATCH 434/462] Update v4_0_0_preview2 to v4.0.0-preview2 (#522) --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index ed41509ca1..ef206077d2 100644 --- a/versions.json +++ b/versions.json @@ -214,7 +214,7 @@ "version": "4.0.0-preview2", "date": "2025-11-17", "post": "/en/news/2025/11/17/ruby-4-0-0-preview2-released/", - "tag": "v4_0_0_preview2", + "tag": "v4.0.0-preview2", "stats": { "files_changed": 3607, "insertions": 197451, From 0ef1f8966b43e97043ceef717e648d44f37896f7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 16 Dec 2025 22:03:14 -0800 Subject: [PATCH 435/462] Update 3.4 to 3.4.8 --- 3.4/alpine3.22/Dockerfile | 8 ++++---- 3.4/alpine3.23/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index 4abb32d3a7..457bba90c7 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index 2f809650a3..e433478050 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index f7529dff7d..7c62c907a3 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 5fb732f7ab..8bbc9386ae 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index c676c6964b..801d4b3549 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 7fa05b848e..7b97058091 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/07/ruby-3-4-7-released/ -ENV RUBY_VERSION 3.4.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7 +# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ +ENV RUBY_VERSION 3.4.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index ef206077d2..cd65a239ef 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.7", - "date": "2025-10-07", - "post": "/en/news/2025/10/07/ruby-3-4-7-released/", + "version": "3.4.8", + "date": "2025-12-17", + "post": "/en/news/2025/12/17/ruby-3-4-8-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz" }, "size": { - "gz": 23271433, - "zip": 28455721, - "xz": 17312044 + "gz": 23288284, + "zip": 28478666, + "xz": 17320860 }, "sha1": { - "gz": "eabc902f52d1580e63108bf5f5fe3f646d855e74", - "zip": "4cad16704d1031cba7395619111f0291ece50605", - "xz": "a07f568bda581a4b4f23c6fe91e1cef44e71f8f8" + "gz": "4474a53941ca3c8bb38a3e5cf458305660037a70", + "zip": "f18dc16d5b0dc8b46462bfe144ab60100d25e232", + "xz": "4e373f5741550d4ef68c2e5e8efc2ce5b0199179" }, "sha256": { - "gz": "23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36", - "zip": "0b250054d4330198bd98bcc30852e59a66d546d84ef1d347e05419bede537aef", - "xz": "db425a86f6e07546957578f4946cc700a91e7fd51115a86c56e096f30e0530c7" + "gz": "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b", + "zip": "57609d2c40b6595b718d23dae64365d9a822375a6062fe9d5bef2d37679e2f28", + "xz": "53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68" }, "sha512": { - "gz": "7c9b807aa794a19377b0048da0e94869bf57905cf68d4f30b959aefb9f67834a51e06a23c9eee858e7f90938dbc38a5072bc946df502a6bcf86bf198ae061e22", - "zip": "3bf68557df908e51532f0b168c1d4cea335e20d38f7ad3b9fc80d747e0ce35391c78881df69b2f2eb0d4681a773d1c29cea717791a75e524793d6ed1ec7d2f8d", - "xz": "a6b99a2f1d0115d5e7efa710da440b9066c524c335928367c80852630f8db5da36c0a82d6e7ace90e8c40cb20c6097cbdca15a51c343254cadf5f0adf60f8505" + "gz": "ccacb88fd1811c7b9d8012c4ef24b3c3c43a7ec6c37ebfdb0ec4ace68db8b094fac3f001deac7b18d39edd8006822a4713bcf14cfcfc229be188c477e6175692", + "zip": "ef0140054858ff227e550b68034e505f11712d2878f1d2d8415839a00026427dfeac03893fb5272403ce9576bc80ec067093de0a003d9977f9eec23e3cc5169d", + "xz": "b6289654685c2d381d15123cf07a131fd088edf13a5336966af5a2e8fad9adda42d14caa7bb0998331831af71e35c546091db55c82089e89b9508603ff5f92d6" }, "variants": [ "trixie", From 9f867edc28a17f696b183a4e1076339a007bd36d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Dec 2025 22:03:23 -0800 Subject: [PATCH 436/462] Update 4.0-rc to 4.0.0-preview3 --- 4.0-rc/alpine3.22/Dockerfile | 8 +++--- 4.0-rc/alpine3.23/Dockerfile | 8 +++--- 4.0-rc/bookworm/Dockerfile | 8 +++--- 4.0-rc/slim-bookworm/Dockerfile | 8 +++--- 4.0-rc/slim-trixie/Dockerfile | 8 +++--- 4.0-rc/trixie/Dockerfile | 8 +++--- versions.json | 44 ++++++++++++++++----------------- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/4.0-rc/alpine3.22/Dockerfile b/4.0-rc/alpine3.22/Dockerfile index ea9a438508..bea69f5e61 100644 --- a/4.0-rc/alpine3.22/Dockerfile +++ b/4.0-rc/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0-rc/alpine3.23/Dockerfile b/4.0-rc/alpine3.23/Dockerfile index 13ddf5d729..56f18c7e5a 100644 --- a/4.0-rc/alpine3.23/Dockerfile +++ b/4.0-rc/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0-rc/bookworm/Dockerfile b/4.0-rc/bookworm/Dockerfile index 585145c944..117c9fb98a 100644 --- a/4.0-rc/bookworm/Dockerfile +++ b/4.0-rc/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0-rc/slim-bookworm/Dockerfile b/4.0-rc/slim-bookworm/Dockerfile index 4154d08375..835bb9ef2d 100644 --- a/4.0-rc/slim-bookworm/Dockerfile +++ b/4.0-rc/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0-rc/slim-trixie/Dockerfile b/4.0-rc/slim-trixie/Dockerfile index eec896dff5..a895cebc2d 100644 --- a/4.0-rc/slim-trixie/Dockerfile +++ b/4.0-rc/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0-rc/trixie/Dockerfile b/4.0-rc/trixie/Dockerfile index 6ceb1b46dc..6f27ac534e 100644 --- a/4.0-rc/trixie/Dockerfile +++ b/4.0-rc/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/11/17/ruby-4-0-0-preview2-released/ -ENV RUBY_VERSION 4.0.0-preview2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43 +# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ +ENV RUBY_VERSION 4.0.0-preview3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index cd65a239ef..d1ec712b78 100644 --- a/versions.json +++ b/versions.json @@ -211,39 +211,39 @@ }, "4.0": null, "4.0-rc": { - "version": "4.0.0-preview2", - "date": "2025-11-17", - "post": "/en/news/2025/11/17/ruby-4-0-0-preview2-released/", - "tag": "v4.0.0-preview2", + "version": "4.0.0-preview3", + "date": "2025-12-18", + "post": "/en/news/2025/12/18/ruby-4-0-0-preview3-released/", + "tag": "v4.0.0-preview3", "stats": { - "files_changed": 3607, - "insertions": 197451, - "deletions": 285607 + "files_changed": 3776, + "insertions": 222800, + "deletions": 293617 }, "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview2.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz" }, "size": { - "gz": 23444451, - "zip": 28933540, - "xz": 17554228 + "gz": 23865890, + "zip": 29403010, + "xz": 17915004 }, "sha1": { - "gz": "132e450bbee3f61ed0b463ed1e2bd3a3a324339c", - "zip": "48a235cfbfd4252dce81da870c792e32309e62b9", - "xz": "f8e8b98ea85ac82610ab601a21dc9a90c5c56a97" + "gz": "a348f196e0314d8863ae5d5f0a588a37c52aa89c", + "zip": "689cb6c497afb96d26745708e772b63afca52e1a", + "xz": "b7b99831558b9cd6cf8fb148f07cd4e8e59d9e99" }, "sha256": { - "gz": "0a3330dae710302e11f7f0323e83219ab3c6517984691a312c662f329c5120e1", - "zip": "f5c68ee44dfcb76b61c07c437fa945814dfc516570b1c921506ac886960160ca", - "xz": "0b92b15466d77a9d7e59e4a75f050d42cd50fe96c951d2b3b9f8029394cd9a43" + "gz": "43d0926e776fbd5599adcc7bccb4ccc804e109f402a2068607a2a86562c2cdc0", + "zip": "c29147727a8eacf01b942012e3d6fa26010f98f43f6ab249c391f47c744f44cf", + "xz": "8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6" }, "sha512": { - "gz": "b5e681cc84be59148485b9a2212dcf54d61cfee27431ceddb49bedc8baa913ec8b36da43242cb4f1791b25e4bfc1dcf72b5527288a0656f2933da898d0e0b40f", - "zip": "508c685e46a641c74e2968daf650559503ce2bcaac3403654713adb2345c3ede2bace929294a1367afecac5edd6b2c42fa833f5313456f78c79151d310c860cf", - "xz": "7afaa8d8e832ef0ded28f1caf874da69f16105e1b3aad5947c6911364159b4c6ebd3d7ea5d7d86708e9f2f06a047921b8302ca6e75ec429a3da846845f896976" + "gz": "1c7f10405832646eceacb278ea7cc3445dc0e1778e9a9331062f2fb0164d45ba5af0b4244dc6ae46e36730d6cafb4c4196fbd4f4fb74029afde5ecf4fd433a6b", + "zip": "c07d6069b391e38ec99725201d021998ccfb913423636f729eccd0cff17cb9ab7e8565f46d68eea96cf7f546cee647892ca3f37b720a202e8e5496cd10dd168b", + "xz": "b046c015a58daafb1640d8db62a36ebf64c7f83fbfb033fa327458afab6e9c31b1c2b194b347fd63f16e413e732d3e6ac20076282b433ef16923343c9ed84aa1" }, "variants": [ "trixie", From 12f8e3ca39458c5168b8736a47a68fcc7a047a02 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Dec 2025 22:03:17 -0800 Subject: [PATCH 437/462] Update 4.0 to 4.0.0, rust 1.91.1, rustup 1.28.2 --- 4.0/alpine3.22/Dockerfile | 144 +++++++++++++++++++++++++++++++++++ 4.0/alpine3.23/Dockerfile | 144 +++++++++++++++++++++++++++++++++++ 4.0/bookworm/Dockerfile | 111 +++++++++++++++++++++++++++ 4.0/slim-bookworm/Dockerfile | 136 +++++++++++++++++++++++++++++++++ 4.0/slim-trixie/Dockerfile | 136 +++++++++++++++++++++++++++++++++ 4.0/trixie/Dockerfile | 111 +++++++++++++++++++++++++++ versions.json | 77 ++++++++++++++++++- 7 files changed, 858 insertions(+), 1 deletion(-) create mode 100644 4.0/alpine3.22/Dockerfile create mode 100644 4.0/alpine3.23/Dockerfile create mode 100644 4.0/bookworm/Dockerfile create mode 100644 4.0/slim-bookworm/Dockerfile create mode 100644 4.0/slim-trixie/Dockerfile create mode 100644 4.0/trixie/Dockerfile diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile new file mode 100644 index 0000000000..db2db5a8ce --- /dev/null +++ b/4.0/alpine3.22/Dockerfile @@ -0,0 +1,144 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile new file mode 100644 index 0000000000..2156fab0d8 --- /dev/null +++ b/4.0/alpine3.23/Dockerfile @@ -0,0 +1,144 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.23 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile new file mode 100644 index 0000000000..bed7627b7c --- /dev/null +++ b/4.0/bookworm/Dockerfile @@ -0,0 +1,111 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..03f9a62f61 --- /dev/null +++ b/4.0/slim-bookworm/Dockerfile @@ -0,0 +1,136 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile new file mode 100644 index 0000000000..3bb478ada5 --- /dev/null +++ b/4.0/slim-trixie/Dockerfile @@ -0,0 +1,136 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:trixie-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + apt-get dist-clean + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + apt-get dist-clean; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile new file mode 100644 index 0000000000..8419128a53 --- /dev/null +++ b/4.0/trixie/Dockerfile @@ -0,0 +1,111 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:trixie + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ +ENV RUBY_VERSION 4.0.0 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + apt-get dist-clean; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index d1ec712b78..0669747bdf 100644 --- a/versions.json +++ b/versions.json @@ -209,7 +209,82 @@ "version": "1.28.2" } }, - "4.0": null, + "4.0": { + "version": "4.0.0", + "date": "2025-12-25", + "post": "/en/news/2025/12/25/ruby-4-0-0-released/", + "tag": "v4.0.0", + "stats": { + "files_changed": 3889, + "insertions": 230769, + "deletions": 297003 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz" + }, + "size": { + "gz": 23955109, + "zip": 29253204, + "xz": 18008368 + }, + "sha1": { + "gz": "754e39e9ad122e1b6deaed860350bac133a35ed3", + "zip": "0b69f89d1d140157251c0d3a6032f6c45cdf81e8", + "xz": "05ec670e86f84325c5353ef2f2888e53b6adc602" + }, + "sha256": { + "gz": "2e8389c8c072cb658c93a1372732d9eac84082c88b065750db1e52a5ac630271", + "zip": "70cb1bf89279b86ab9a975d504607c051fc05ee03e311d550a5541b65e373455", + "xz": "a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1" + }, + "sha512": { + "gz": "688254e939b197d564e896fb951bc1abf07142f489e91c5ed0b11f68f52d6adb6b1f86616fe03f1f0bb434beeef7e75e158b9c616afb39bb34403b0b78d2ee19", + "zip": "a72e076ef618c0aeb9d20cf22e6fb12fda36809c0064ef0f98153b95a0bac257ef606342444a38f992c4594bf376a4d264686cf597463aa6f111220798784302", + "xz": "2d5b2e566eaf70a5f3ea6ce6afc0611c0415de58a41336ef7a0b855c9a91eda9aa790a5f8b48e40a1eb9d50f8ea0f687216e617f16c8d040a08474f3116518a4" + }, + "variants": [ + "trixie", + "slim-trixie", + "bookworm", + "slim-bookworm", + "alpine3.23", + "alpine3.22" + ], + "rust": { + "version": "1.91.1" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.28.2" + } + }, "4.0-rc": { "version": "4.0.0-preview3", "date": "2025-12-18", From f98f655968a1ee2a1313af0927ead040263b72ee Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Dec 2025 22:52:24 -0800 Subject: [PATCH 438/462] Update 4.0-rc --- 4.0-rc/alpine3.22/Dockerfile | 144 -------------------------------- 4.0-rc/alpine3.23/Dockerfile | 144 -------------------------------- 4.0-rc/bookworm/Dockerfile | 111 ------------------------ 4.0-rc/slim-bookworm/Dockerfile | 136 ------------------------------ 4.0-rc/slim-trixie/Dockerfile | 136 ------------------------------ 4.0-rc/trixie/Dockerfile | 111 ------------------------ versions.json | 76 ----------------- 7 files changed, 858 deletions(-) delete mode 100644 4.0-rc/alpine3.22/Dockerfile delete mode 100644 4.0-rc/alpine3.23/Dockerfile delete mode 100644 4.0-rc/bookworm/Dockerfile delete mode 100644 4.0-rc/slim-bookworm/Dockerfile delete mode 100644 4.0-rc/slim-trixie/Dockerfile delete mode 100644 4.0-rc/trixie/Dockerfile diff --git a/4.0-rc/alpine3.22/Dockerfile b/4.0-rc/alpine3.22/Dockerfile deleted file mode 100644 index bea69f5e61..0000000000 --- a/4.0-rc/alpine3.22/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/4.0-rc/alpine3.23/Dockerfile b/4.0-rc/alpine3.23/Dockerfile deleted file mode 100644 index 56f18c7e5a..0000000000 --- a/4.0-rc/alpine3.23/Dockerfile +++ /dev/null @@ -1,144 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.23 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/4.0-rc/bookworm/Dockerfile b/4.0-rc/bookworm/Dockerfile deleted file mode 100644 index 117c9fb98a..0000000000 --- a/4.0-rc/bookworm/Dockerfile +++ /dev/null @@ -1,111 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bookworm - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/4.0-rc/slim-bookworm/Dockerfile b/4.0-rc/slim-bookworm/Dockerfile deleted file mode 100644 index 835bb9ef2d..0000000000 --- a/4.0-rc/slim-bookworm/Dockerfile +++ /dev/null @@ -1,136 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/4.0-rc/slim-trixie/Dockerfile b/4.0-rc/slim-trixie/Dockerfile deleted file mode 100644 index a895cebc2d..0000000000 --- a/4.0-rc/slim-trixie/Dockerfile +++ /dev/null @@ -1,136 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:trixie-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - apt-get dist-clean - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - apt-get dist-clean; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/4.0-rc/trixie/Dockerfile b/4.0-rc/trixie/Dockerfile deleted file mode 100644 index 6f27ac534e..0000000000 --- a/4.0-rc/trixie/Dockerfile +++ /dev/null @@ -1,111 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:trixie - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2025/12/18/ruby-4-0-0-preview3-released/ -ENV RUBY_VERSION 4.0.0-preview3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ${rustArch:+--enable-zjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - apt-get dist-clean; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/versions.json b/versions.json index 0669747bdf..4ed2ac462a 100644 --- a/versions.json +++ b/versions.json @@ -284,81 +284,5 @@ }, "version": "1.28.2" } - }, - "4.0-rc": { - "version": "4.0.0-preview3", - "date": "2025-12-18", - "post": "/en/news/2025/12/18/ruby-4-0-0-preview3-released/", - "tag": "v4.0.0-preview3", - "stats": { - "files_changed": 3776, - "insertions": 222800, - "deletions": 293617 - }, - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0-preview3.tar.xz" - }, - "size": { - "gz": 23865890, - "zip": 29403010, - "xz": 17915004 - }, - "sha1": { - "gz": "a348f196e0314d8863ae5d5f0a588a37c52aa89c", - "zip": "689cb6c497afb96d26745708e772b63afca52e1a", - "xz": "b7b99831558b9cd6cf8fb148f07cd4e8e59d9e99" - }, - "sha256": { - "gz": "43d0926e776fbd5599adcc7bccb4ccc804e109f402a2068607a2a86562c2cdc0", - "zip": "c29147727a8eacf01b942012e3d6fa26010f98f43f6ab249c391f47c744f44cf", - "xz": "8d7a503b2c4abcfacf0fa54ac56d37f7dd6d643a3a717661729cabbe947610a6" - }, - "sha512": { - "gz": "1c7f10405832646eceacb278ea7cc3445dc0e1778e9a9331062f2fb0164d45ba5af0b4244dc6ae46e36730d6cafb4c4196fbd4f4fb74029afde5ecf4fd433a6b", - "zip": "c07d6069b391e38ec99725201d021998ccfb913423636f729eccd0cff17cb9ab7e8565f46d68eea96cf7f546cee647892ca3f37b720a202e8e5496cd10dd168b", - "xz": "b046c015a58daafb1640d8db62a36ebf64c7f83fbfb033fa327458afab6e9c31b1c2b194b347fd63f16e413e732d3e6ac20076282b433ef16923343c9ed84aa1" - }, - "variants": [ - "trixie", - "slim-trixie", - "bookworm", - "slim-bookworm", - "alpine3.23", - "alpine3.22" - ], - "rust": { - "version": "1.91.1" - }, - "rustup": { - "arches": { - "amd64": { - "glibc": { - "arch": "x86_64-unknown-linux-gnu", - "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "x86_64-unknown-linux-musl", - "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" - } - }, - "arm64v8": { - "glibc": { - "arch": "aarch64-unknown-linux-gnu", - "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "aarch64-unknown-linux-musl", - "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" - } - } - }, - "version": "1.28.2" - } } } From 4f76cece88762c6df20be5dc45cb1de7a9bc3b4d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 12 Jan 2026 22:03:57 -0800 Subject: [PATCH 439/462] Update 4.0 to 4.0.1 --- 4.0/alpine3.22/Dockerfile | 8 +++---- 4.0/alpine3.23/Dockerfile | 8 +++---- 4.0/bookworm/Dockerfile | 8 +++---- 4.0/slim-bookworm/Dockerfile | 8 +++---- 4.0/slim-trixie/Dockerfile | 8 +++---- 4.0/trixie/Dockerfile | 8 +++---- versions.json | 42 ++++++++++++++++-------------------- 7 files changed, 42 insertions(+), 48 deletions(-) diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile index db2db5a8ce..f520beac63 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 2156fab0d8..7d5f7c23a3 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index bed7627b7c..9e38b478c3 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 03f9a62f61..eee564cbb9 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 3bb478ada5..4092864e4c 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 8419128a53..a9e741cd95 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/25/ruby-4-0-0-released/ -ENV RUBY_VERSION 4.0.0 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1 +# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ +ENV RUBY_VERSION 4.0.1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 4ed2ac462a..0a20de0230 100644 --- a/versions.json +++ b/versions.json @@ -210,39 +210,33 @@ } }, "4.0": { - "version": "4.0.0", - "date": "2025-12-25", - "post": "/en/news/2025/12/25/ruby-4-0-0-released/", - "tag": "v4.0.0", - "stats": { - "files_changed": 3889, - "insertions": 230769, - "deletions": 297003 - }, + "version": "4.0.1", + "date": "2026-01-13", + "post": "/en/news/2026/01/13/ruby-4-0-1-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz" }, "size": { - "gz": 23955109, - "zip": 29253204, - "xz": 18008368 + "gz": 23807304, + "zip": 29107093, + "xz": 17892492 }, "sha1": { - "gz": "754e39e9ad122e1b6deaed860350bac133a35ed3", - "zip": "0b69f89d1d140157251c0d3a6032f6c45cdf81e8", - "xz": "05ec670e86f84325c5353ef2f2888e53b6adc602" + "gz": "01db5746bbb29b028bd44d505a147d06866b1ab2", + "zip": "d3a9217c848b22636025c525971578557ba5f7a3", + "xz": "266e6fa80ed2b4f4bb7de2e98973dc084a1f380e" }, "sha256": { - "gz": "2e8389c8c072cb658c93a1372732d9eac84082c88b065750db1e52a5ac630271", - "zip": "70cb1bf89279b86ab9a975d504607c051fc05ee03e311d550a5541b65e373455", - "xz": "a72bacee9de07283ebc19baa4ac243b193129f21aa4e168c7186fb1fe7d07fe1" + "gz": "3924be2d05db30f4e35f859bf028be85f4b7dd01714142fd823e4af5de2faf9d", + "zip": "36cbcea4972e201464ae1c6686a3a785b115aee9b836d9bbbe6d961dcef2358d", + "xz": "0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f" }, "sha512": { - "gz": "688254e939b197d564e896fb951bc1abf07142f489e91c5ed0b11f68f52d6adb6b1f86616fe03f1f0bb434beeef7e75e158b9c616afb39bb34403b0b78d2ee19", - "zip": "a72e076ef618c0aeb9d20cf22e6fb12fda36809c0064ef0f98153b95a0bac257ef606342444a38f992c4594bf376a4d264686cf597463aa6f111220798784302", - "xz": "2d5b2e566eaf70a5f3ea6ce6afc0611c0415de58a41336ef7a0b855c9a91eda9aa790a5f8b48e40a1eb9d50f8ea0f687216e617f16c8d040a08474f3116518a4" + "gz": "f4eead09c7355b878a34343dd8cfb9c4c36f02ad3b9a7fd42981d722444beca0182ddea4fc771e2e01a05d9f14978a979ba0ba3590d366f53b6947f43fd78aff", + "zip": "a8512d3f57254bfacfd4c68ee50bb7cad3168f4d9c3be51658378e5db589032745759c360d8711a060b2ed5b9b78855e498b54fcba869a4e60f03ed4aae68ea8", + "xz": "b67d9d1f97ba30200d103f8454e39dc2d0450819d51d91eb5451d44b0bafc56d2fa48bb1be6c5081babe5828f679984bad02b9bcee7441f6bd34c0a95b8f200b" }, "variants": [ "trixie", From af204e030006b9572c140a3eb353627ae4fcb625 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 13 Jan 2026 22:03:13 -0800 Subject: [PATCH 440/462] Update 3.2 to 3.2.10 --- 3.2/alpine3.22/Dockerfile | 8 ++++---- 3.2/alpine3.23/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-trixie/Dockerfile | 8 ++++---- 3.2/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.22/Dockerfile b/3.2/alpine3.22/Dockerfile index afee446107..f769d00b8e 100644 --- a/3.2/alpine3.22/Dockerfile +++ b/3.2/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.23/Dockerfile b/3.2/alpine3.23/Dockerfile index 21c77bf87d..7af770c635 100644 --- a/3.2/alpine3.23/Dockerfile +++ b/3.2/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index 05045d9b1f..ad1be0afdf 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index c549281b71..e04128ac48 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-trixie/Dockerfile b/3.2/slim-trixie/Dockerfile index 5cd185f4aa..c88a32191f 100644 --- a/3.2/slim-trixie/Dockerfile +++ b/3.2/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/trixie/Dockerfile b/3.2/trixie/Dockerfile index 887297696e..d0ab16a5f2 100644 --- a/3.2/trixie/Dockerfile +++ b/3.2/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/07/24/ruby-3-2-9-released/ -ENV RUBY_VERSION 3.2.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2 +# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ +ENV RUBY_VERSION 3.2.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 0a20de0230..6e6f4b9d61 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.2": { - "version": "3.2.9", - "date": "2025-07-24", - "post": "/en/news/2025/07/24/ruby-3-2-9-released/", + "version": "3.2.10", + "date": "2026-01-14", + "post": "/en/news/2026/01/14/ruby-3-2-10-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.9.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.zip" }, "size": { - "gz": 20560944, - "xz": 15141728, - "zip": 25144424 + "gz": 19983731, + "xz": 14696548, + "zip": 24593429 }, "sha1": { - "gz": "174f37666192a3fdc9cf24e5eddc0cf4d5de0b1e", - "xz": "c1bb7eb3b2254f9513abfc0b9335f4da14bfa093", - "zip": "a853b1413e73a827ca2bee640550f4ae54c9fe18" + "gz": "6d7afca27627fbbcc7b933ac4e1a8a58c7a9be0e", + "xz": "2cc431a4c64c222b2f13574ec034226cd4fa2580", + "zip": "e1123828b4b7a39c19342697d5e0af095237f0e3" }, "sha256": { - "gz": "abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a", - "xz": "cf6699d0084c588e7944d92e1a8edda28b1cc3ee471a1f0aebb4b3d32c9753b2", - "zip": "a3fc780839729c138ac9ef543ac505d67f04e404b65a404419843a2fed2f661b" + "gz": "880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689", + "xz": "a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae", + "zip": "8e98d793347a48cc7ef45cfdcb1bafa5151d114e8b8fc4dc094a9584af00049e" }, "sha512": { - "gz": "d3fc84ee71a85f5a9bc75d7354508adf197238ee6fa0f83d72bb7659aaf9d4294ae577d64f4a937b511abf241d44d190643227577dcd9cd04dc0553375913975", - "xz": "4db0656694c25c971bcf3591516e6feddb7fc60c4474b63dd1d2c1481c3629421edc904666067b2dcbc47357db1a32b7bf412055306fe29cee30fa048f89b6e3", - "zip": "6a313a36d6e630fb795d37f18da1e908d03c05d7200ef86e2260a18b5fc71f8f3201431f255e3cf7a47e0ee25ab5b9158b9477100ad6729e1f7ebf13f9b0a840" + "gz": "0f23dbc9b49b1c7c6256ba961c652a4f3659e6127a4c333624fca4e4f6a873cc06b01992b10aa7970a52e99b654fc655a25348a47de73cc786f3e33e8b702295", + "xz": "a89044db8a55bd990d3756e212f2966b62b903eefc96c7e0af89aa4580ff7253d2f64c6c25fc04f2031b959e614bae84b86db36cfdec3a3e8afb5c3026426687", + "zip": "b01077c71b9d006378620df95e3ffdb271fddc6f966a8cbbdb53f9f07e67b1924a1eadf200f5cc44ed87640c509b106c995386268d7dc10443a73ea39755aa44" }, "variants": [ "trixie", From 5a670110fb6e65afa72ee9da2c65de377f589281 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Mar 2026 09:03:14 -0700 Subject: [PATCH 441/462] Update 3.4 to 3.4.9 --- 3.4/alpine3.22/Dockerfile | 8 ++++---- 3.4/alpine3.23/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.22/Dockerfile index 457bba90c7..55c618cc63 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index e433478050..294d533129 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 7c62c907a3..d0425d111c 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 8bbc9386ae..608409e574 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 801d4b3549..c4c1533785 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 7b97058091..24248534be 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/12/17/ruby-3-4-8-released/ -ENV RUBY_VERSION 3.4.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68 +# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ +ENV RUBY_VERSION 3.4.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 6e6f4b9d61..c37f3d7ae5 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "3.4": { - "version": "3.4.8", - "date": "2025-12-17", - "post": "/en/news/2025/12/17/ruby-3-4-8-released/", + "version": "3.4.9", + "date": "2026-03-11", + "post": "/en/news/2026/03/11/ruby-3-4-9-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.8.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.zip" }, "size": { - "gz": 23288284, - "zip": 28478666, - "xz": 17320860 + "gz": 22456968, + "xz": 16682004, + "zip": 27645906 }, "sha1": { - "gz": "4474a53941ca3c8bb38a3e5cf458305660037a70", - "zip": "f18dc16d5b0dc8b46462bfe144ab60100d25e232", - "xz": "4e373f5741550d4ef68c2e5e8efc2ce5b0199179" + "gz": "6386200753caf4e336dafceeee165fa73fd234ec", + "xz": "1eb1b0b45b9e9191de9d2f360164e60eedf77012", + "zip": "8c4312fe946c7eaa269e5c7cee90f3b7350235b5" }, "sha256": { - "gz": "53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b", - "zip": "57609d2c40b6595b718d23dae64365d9a822375a6062fe9d5bef2d37679e2f28", - "xz": "53a8ec71111449cbbd42224d8d27c493fa6ded228636731051c48604d4255d68" + "gz": "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c", + "xz": "4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a", + "zip": "a4dd555fddefcdd4a58d2169a568f5887b125edbbda2815ea826ca1833dc41ec" }, "sha512": { - "gz": "ccacb88fd1811c7b9d8012c4ef24b3c3c43a7ec6c37ebfdb0ec4ace68db8b094fac3f001deac7b18d39edd8006822a4713bcf14cfcfc229be188c477e6175692", - "zip": "ef0140054858ff227e550b68034e505f11712d2878f1d2d8415839a00026427dfeac03893fb5272403ce9576bc80ec067093de0a003d9977f9eec23e3cc5169d", - "xz": "b6289654685c2d381d15123cf07a131fd088edf13a5336966af5a2e8fad9adda42d14caa7bb0998331831af71e35c546091db55c82089e89b9508603ff5f92d6" + "gz": "ac7147c0e575cf74f669abb991ee8695d4191c919f306f124b3ee85d6b61361e752a4f1afb7bdffb49aee21edace1fcc9bf2b074ada15fa6c1eb611354c1d54b", + "xz": "356fb47cc56f2d25198cb95253fc20ff7d9a6fd1fa53bc475e5c440012aebe27562537c399d271357235114ade263fd625029b66cb0f9b526f9c04f169fb9580", + "zip": "1c6cc4d03edb071f79f9ae41d43defa8393b467d30000e89ee872c6fe99bde015421cb1dd3ecfd5f0359c1c095b60833a95cd5f6c4397358f8ed98eace8720e2" }, "variants": [ "trixie", From dbc0acf4dcb5f24c42dd4246d810c42e56be9163 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Mar 2026 21:03:16 -0700 Subject: [PATCH 442/462] Update 4.0 to 4.0.2 --- 4.0/alpine3.22/Dockerfile | 8 ++++---- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile index f520beac63..6bdcd7ac20 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 7d5f7c23a3..4f1d65e148 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 9e38b478c3..3fb8be538c 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index eee564cbb9..df76b73c0c 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 4092864e4c..5130108874 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index a9e741cd95..f2be8855db 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/13/ruby-4-0-1-released/ -ENV RUBY_VERSION 4.0.1 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz -ENV RUBY_DOWNLOAD_SHA256 0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f +# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ +ENV RUBY_VERSION 4.0.2 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz +ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index c37f3d7ae5..e19863a7e7 100644 --- a/versions.json +++ b/versions.json @@ -210,33 +210,33 @@ } }, "4.0": { - "version": "4.0.1", - "date": "2026-01-13", - "post": "/en/news/2026/01/13/ruby-4-0-1-released/", + "version": "4.0.2", + "date": "2026-03-16", + "post": "/en/news/2026/03/16/ruby-4-0-2-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.1.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz" }, "size": { - "gz": 23807304, - "zip": 29107093, - "xz": 17892492 + "gz": 23824654, + "zip": 29123568, + "xz": 17874724 }, "sha1": { - "gz": "01db5746bbb29b028bd44d505a147d06866b1ab2", - "zip": "d3a9217c848b22636025c525971578557ba5f7a3", - "xz": "266e6fa80ed2b4f4bb7de2e98973dc084a1f380e" + "gz": "47c3627e2bdfe53dda77d3fa1730e44ef1ed7dfe", + "zip": "3cfd813761009f8fbb6001cf14149dc03bcd85d7", + "xz": "d927e26d22b15c6737df24cdf6ae80542a057240" }, "sha256": { - "gz": "3924be2d05db30f4e35f859bf028be85f4b7dd01714142fd823e4af5de2faf9d", - "zip": "36cbcea4972e201464ae1c6686a3a785b115aee9b836d9bbbe6d961dcef2358d", - "xz": "0531fe57dfdb56bf591620d2450642ea0e0964f3512a6ebee7dc9305de69395f" + "gz": "51502b26b50b68df4963336ca41e368cde92c928faf91654de4c4c1791f82aac", + "zip": "7cdbef9028a64f73ca59e21cd46c73c794df9c8294f1cb5c50c4d93c6060b240", + "xz": "4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87" }, "sha512": { - "gz": "f4eead09c7355b878a34343dd8cfb9c4c36f02ad3b9a7fd42981d722444beca0182ddea4fc771e2e01a05d9f14978a979ba0ba3590d366f53b6947f43fd78aff", - "zip": "a8512d3f57254bfacfd4c68ee50bb7cad3168f4d9c3be51658378e5db589032745759c360d8711a060b2ed5b9b78855e498b54fcba869a4e60f03ed4aae68ea8", - "xz": "b67d9d1f97ba30200d103f8454e39dc2d0450819d51d91eb5451d44b0bafc56d2fa48bb1be6c5081babe5828f679984bad02b9bcee7441f6bd34c0a95b8f200b" + "gz": "16a6ca0e9407051f58c8e3c4ec2058c52d62a9863174a3eb6dd5e9e2e893a66427e97a6e7fc8b4c3480163bd19a7a0ec4c00e481f90ff42e8f30bdbc9555f628", + "zip": "ecac80a6861fd666fc024701233f5b5b93bed9ed9047cd7ca9e11799681b0102729cc53203cee4ac33245a41b786a4a4c802633d1031881200378b011ed74580", + "xz": "be71a5452068dfc3c86b8ec07456b3fdf6dc64e8c0cd16c358fc4ed8ac08707a9c28285ea8a79dbef82031d8c93c71032a82a0b45f3c9ac5325bf3b70d06fbf2" }, "variants": [ "trixie", From d7aaaf1227ccf244c72405748a9ca5e026e75c63 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 25 Mar 2026 21:03:12 -0700 Subject: [PATCH 443/462] Update 3.3 to 3.3.11 --- 3.3/alpine3.22/Dockerfile | 8 ++++---- 3.3/alpine3.23/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-trixie/Dockerfile | 8 ++++---- 3.3/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.22/Dockerfile b/3.3/alpine3.22/Dockerfile index 5948c13904..e3032cb5ef 100644 --- a/3.3/alpine3.22/Dockerfile +++ b/3.3/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.23/Dockerfile b/3.3/alpine3.23/Dockerfile index 89b43d286e..8c1232de01 100644 --- a/3.3/alpine3.23/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index c2c08c9b1d..bb99c182f3 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 5fc4a16b56..9940925284 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 082045f501..745eb730f4 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index e10db7d4db..076d2b3d8d 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2025/10/23/ruby-3-3-10-released/ -ENV RUBY_VERSION 3.3.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c +# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ +ENV RUBY_VERSION 3.3.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index e19863a7e7..5721c3eec4 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.3": { - "version": "3.3.10", - "date": "2025-10-23", - "post": "/en/news/2025/10/23/ruby-3-3-10-released/", + "version": "3.3.11", + "date": "2026-03-26", + "post": "/en/news/2026/03/26/ruby-3-3-11-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.10.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.gz", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.zip" }, "size": { - "gz": 22233705, - "xz": 16450140, - "zip": 27696234 + "gz": 21483089, + "xz": 15879844, + "zip": 26947458 }, "sha1": { - "gz": "e4be04af44d536ba3572c2ccedcaeb06078d021b", - "xz": "5db7cd707e7e79cd99f5d1009c754466c9d8d9e3", - "zip": "a86f6f429436f4caf445b335e13cf32a0a902394" + "gz": "7f18e7e74ab64c5b159a8dfe8da3cc019b32bdb6", + "xz": "520afae357283c96610f340c92a6567ff7b2b923", + "zip": "e01bf3ff08d96438decc35b80d4d289b9d012681" }, "sha256": { - "gz": "b555baa467a306cfc8e6c6ed24d0d27b27e9a1bed1d91d95509859eac6b0e928", - "xz": "3a06c3a709672a4ddae4e511d7e82f74799b8b3f550c8cf2d6f32089003cb84c", - "zip": "157fc378c0e6a4a7a3e72669039b828986338188765260b5530957c1b8b57ea6" + "gz": "59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0", + "xz": "9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3", + "zip": "94c9d920aade547bafe392c6a288f996c151cb217ab548be5747867353568243" }, "sha512": { - "gz": "abfe212c189f7fd94ba2bb42efc45f20369ced193bbfdb4a677bd868b71e1d2f3941fed6e0b62c444fc16bc5c2073a5fee2c69037015408e2933308f407ad0a8", - "xz": "8b81cab7b98acb6ff7bdf864da5e97596ee1efa441e2a65991e12a7e3f3ad3d83b1b5c65ae108484252ec8f6d85db60eb381a174c759023beb202b5a0d20818a", - "zip": "70ee931fe6ceca0f105e270c882fc019299450fbe75b3da4cadc14a544270eda876eb8cba47a164cac2ada3116b70e6c24efa7061ceab62c1d4af20a16caaf35" + "gz": "effbcffce1cad4fa7158ce9159b6109a92e88c29f5d33151c2ec609c54fe24b747354b0e722e0fefe8164700acb2d650b8c65aad0e17e3dec2c26969a44fc524", + "xz": "1f8eb206a90121015b294dada7ea61ebd136e7e7dbb1c4bb7df21b85f359a2e733f438153bf07c57815a963e4ef3f766081fd4226caa6547f4c263b33ed7726e", + "zip": "fc4d4299df8414daeb81ae329d67f4d0ea961443e3505407a4faa134d8b9971c49b5c6750d55b4fdc210e15276845ee9b11c4ee25461f99a743f714da7096391" }, "variants": [ "trixie", From b4f30b5c440bdcbbb1fe582732f2eb02cb2e7f36 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 26 Mar 2026 21:03:09 -0700 Subject: [PATCH 444/462] Update 3.2 to 3.2.11 --- 3.2/alpine3.22/Dockerfile | 8 ++++---- 3.2/alpine3.23/Dockerfile | 8 ++++---- 3.2/bookworm/Dockerfile | 8 ++++---- 3.2/slim-bookworm/Dockerfile | 8 ++++---- 3.2/slim-trixie/Dockerfile | 8 ++++---- 3.2/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.2/alpine3.22/Dockerfile b/3.2/alpine3.22/Dockerfile index f769d00b8e..3febc0239a 100644 --- a/3.2/alpine3.22/Dockerfile +++ b/3.2/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/alpine3.23/Dockerfile b/3.2/alpine3.23/Dockerfile index 7af770c635..c72915bf69 100644 --- a/3.2/alpine3.23/Dockerfile +++ b/3.2/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile index ad1be0afdf..edf0baaa9f 100644 --- a/3.2/bookworm/Dockerfile +++ b/3.2/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile index e04128ac48..f5f0204383 100644 --- a/3.2/slim-bookworm/Dockerfile +++ b/3.2/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/slim-trixie/Dockerfile b/3.2/slim-trixie/Dockerfile index c88a32191f..9e1b5ad682 100644 --- a/3.2/slim-trixie/Dockerfile +++ b/3.2/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.2/trixie/Dockerfile b/3.2/trixie/Dockerfile index d0ab16a5f2..f6c2a86be4 100644 --- a/3.2/trixie/Dockerfile +++ b/3.2/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/01/14/ruby-3-2-10-released/ -ENV RUBY_VERSION 3.2.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae +# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ +ENV RUBY_VERSION 3.2.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 5721c3eec4..f3c9eff939 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.2": { - "version": "3.2.10", - "date": "2026-01-14", - "post": "/en/news/2026/01/14/ruby-3-2-10-released/", + "version": "3.2.11", + "date": "2026-03-27", + "post": "/en/news/2026/03/27/ruby-3-2-11-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.10.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz" }, "size": { - "gz": 19983731, - "xz": 14696548, - "zip": 24593429 + "gz": 19984344, + "zip": 24594356, + "xz": 14695828 }, "sha1": { - "gz": "6d7afca27627fbbcc7b933ac4e1a8a58c7a9be0e", - "xz": "2cc431a4c64c222b2f13574ec034226cd4fa2580", - "zip": "e1123828b4b7a39c19342697d5e0af095237f0e3" + "gz": "9534a3aa08d2ccb4d3c50b1301b2da9a9b91c4ab", + "zip": "7e84c9433f32a758da123d3b5532cc632d19d503", + "xz": "501cecc15ba079087967888ae455d62e5886fbc1" }, "sha256": { - "gz": "880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689", - "xz": "a64a8a910ac2f28834b2170dedea688f06cbc6431fcd65eb18cc49ddbf3826ae", - "zip": "8e98d793347a48cc7ef45cfdcb1bafa5151d114e8b8fc4dc094a9584af00049e" + "gz": "b3eeabd6636f334531db3ffdc3229eb05e524740e6c84fdc043720573cf2f8b2", + "zip": "08ab90aa4ada9268e96aa47fb6c3a77fdb3b2f792f2671053e3b55a6141618ce", + "xz": "c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2" }, "sha512": { - "gz": "0f23dbc9b49b1c7c6256ba961c652a4f3659e6127a4c333624fca4e4f6a873cc06b01992b10aa7970a52e99b654fc655a25348a47de73cc786f3e33e8b702295", - "xz": "a89044db8a55bd990d3756e212f2966b62b903eefc96c7e0af89aa4580ff7253d2f64c6c25fc04f2031b959e614bae84b86db36cfdec3a3e8afb5c3026426687", - "zip": "b01077c71b9d006378620df95e3ffdb271fddc6f966a8cbbdb53f9f07e67b1924a1eadf200f5cc44ed87640c509b106c995386268d7dc10443a73ea39755aa44" + "gz": "95896bbf519604da0dc3d82066ac92c3f661b2ee9ffd8e2c9effce4773677445f1dcc43b05539050024b57f4f94f43984a734a03015ac6e29679e79d5a093a67", + "zip": "133d63cd9bb7c9fe38eecd18c996013de0a56fef09c89c42f4fc9c383f09ab4ab3b0b31edbadd1fd1aaa797fbb9c86128ded51c6e5263cd3225754e714b3d195", + "xz": "418739d476d34e2467e7f1ee60ff63a1969a362b49871bdc488676c1ac7d28b198deee85e2bd951a23f5b0e8425bc89ca59d5c8cb8415fa5ed835555e3d3af8d" }, "variants": [ "trixie", From fadc25cc57b2b0fee7f2a5024aad4178f9ca167a Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 16 Apr 2026 12:11:24 +0200 Subject: [PATCH 445/462] Drop Ruby 3.2 It is EOL since end of may --- 3.2/alpine3.22/Dockerfile | 145 ----------------------------------- 3.2/alpine3.23/Dockerfile | 145 ----------------------------------- 3.2/bookworm/Dockerfile | 111 --------------------------- 3.2/slim-bookworm/Dockerfile | 137 --------------------------------- 3.2/slim-trixie/Dockerfile | 137 --------------------------------- 3.2/trixie/Dockerfile | 111 --------------------------- Dockerfile.template | 16 +--- versions.json | 70 ----------------- 8 files changed, 1 insertion(+), 871 deletions(-) delete mode 100644 3.2/alpine3.22/Dockerfile delete mode 100644 3.2/alpine3.23/Dockerfile delete mode 100644 3.2/bookworm/Dockerfile delete mode 100644 3.2/slim-bookworm/Dockerfile delete mode 100644 3.2/slim-trixie/Dockerfile delete mode 100644 3.2/trixie/Dockerfile diff --git a/3.2/alpine3.22/Dockerfile b/3.2/alpine3.22/Dockerfile deleted file mode 100644 index 3febc0239a..0000000000 --- a/3.2/alpine3.22/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/alpine3.23/Dockerfile b/3.2/alpine3.23/Dockerfile deleted file mode 100644 index c72915bf69..0000000000 --- a/3.2/alpine3.23/Dockerfile +++ /dev/null @@ -1,145 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.23 - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - apk add --no-cache --virtual .ruby-builddeps \ - autoconf \ - bison \ - bzip2 \ - bzip2-dev \ - ca-certificates \ - coreutils \ - dpkg-dev dpkg \ - g++ \ - gcc \ - gdbm-dev \ - glib-dev \ - gmp-dev \ - libc-dev \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - ncurses-dev \ - openssl \ - openssl-dev \ - patch \ - procps \ - yaml-dev \ - zlib-dev \ - readline-dev \ - ruby \ - tar \ - xz \ - yaml-dev \ - zlib-dev \ - ; \ - \ - rustArch=; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ - 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ -# https://github.com/docker-library/ruby/issues/196 -# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) -# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) - wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ - echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ - patch -p1 -i thread-stack-fix.patch; \ - rm thread-stack-fix.patch; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - runDeps="$( \ - scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ - | tr ',' '\n' \ - | sort -u \ - | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ - )"; \ - apk add --no-network --virtual .ruby-rundeps $runDeps; \ - apk del --no-network .ruby-builddeps; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if \ - apk --no-network list --installed \ - | grep -v '^[.]ruby-' \ - | grep -i ruby \ - ; then \ - exit 1; \ - fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/bookworm/Dockerfile b/3.2/bookworm/Dockerfile deleted file mode 100644 index edf0baaa9f..0000000000 --- a/3.2/bookworm/Dockerfile +++ /dev/null @@ -1,111 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:bookworm - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/slim-bookworm/Dockerfile b/3.2/slim-bookworm/Dockerfile deleted file mode 100644 index f5f0204383..0000000000 --- a/3.2/slim-bookworm/Dockerfile +++ /dev/null @@ -1,137 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bookworm-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - rm -rf /var/lib/apt/lists/* - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libreadline-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | 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; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/slim-trixie/Dockerfile b/3.2/slim-trixie/Dockerfile deleted file mode 100644 index 9e1b5ad682..0000000000 --- a/3.2/slim-trixie/Dockerfile +++ /dev/null @@ -1,137 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:trixie-slim - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - ; \ - apt-get dist-clean - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - autoconf \ - bzip2 \ - g++ \ - gcc \ - libbz2-dev \ - libffi-dev \ - libgdbm-compat-dev \ - libglib2.0-dev \ - libgmp-dev \ - libncurses-dev \ - libreadline-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - wget \ - xz-utils \ - zlib1g-dev \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - apt-get dist-clean; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/3.2/trixie/Dockerfile b/3.2/trixie/Dockerfile deleted file mode 100644 index f6c2a86be4..0000000000 --- a/3.2/trixie/Dockerfile +++ /dev/null @@ -1,111 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:trixie - -# skip installing gem documentation with `gem install`/`gem update` -RUN set -eux; \ - mkdir -p /usr/local/etc; \ - echo 'gem: --no-document' >> /usr/local/etc/gemrc - -ENV LANG C.UTF-8 - -# https://www.ruby-lang.org/en/news/2026/03/27/ruby-3-2-11-released/ -ENV RUBY_VERSION 3.2.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2 - -# some of ruby's build scripts are written in ruby -# we purge system ruby later to make sure our final image uses what we just built -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - bison \ - dpkg-dev \ - libgdbm-dev \ - ruby \ - ; \ - \ - rustArch=; \ - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ - 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ - esac; \ - \ - if [ -n "$rustArch" ]; then \ - mkdir -p /tmp/rust; \ - \ - wget -O /tmp/rust/rustup-init "$rustupUrl"; \ - echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ - chmod +x /tmp/rust/rustup-init; \ - \ - export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ - export PATH="$CARGO_HOME/bin:$PATH"; \ - /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ - \ - rustc --version; \ - cargo --version; \ - fi; \ - \ - wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ - echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ - \ - mkdir -p /usr/src/ruby; \ - tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ - rm ruby.tar.xz; \ - \ - cd /usr/src/ruby; \ - \ - autoconf; \ - gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ - ./configure \ - --build="$gnuArch" \ - --disable-install-doc \ - --enable-shared \ - ${rustArch:+--enable-yjit} \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - rm -rf /tmp/rust; \ - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ -# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) - | awk 'sub(":$", "", $1) { print $1 }' \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - apt-get dist-clean; \ - \ - cd /; \ - rm -r /usr/src/ruby; \ -# verify we have no "ruby" packages installed - if dpkg -l | grep -i ruby; then exit 1; fi; \ - [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ -# rough smoke test - ruby --version; \ - gem --version; \ - bundle --version - -# don't create ".bundle" in all our apps -ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ - BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $GEM_HOME/bin:$PATH -RUN set -eux; \ - mkdir "$GEM_HOME"; \ -# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user - chmod 1777 "$GEM_HOME" - -CMD [ "irb" ] diff --git a/Dockerfile.template b/Dockerfile.template index 27b9d22d9b..5fdb9cce7b 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -47,10 +47,6 @@ RUN set -eux; \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .ruby-builddeps \ autoconf \ -{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} -{{ # https://github.com/docker-library/ruby/pull/438 -}} - bison \ -{{ ) else "" end -}} bzip2 \ bzip2-dev \ ca-certificates \ @@ -74,9 +70,6 @@ RUN set -eux; \ procps \ yaml-dev \ zlib-dev \ -{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} - readline-dev \ -{{ ) else "" end -}} ruby \ tar \ xz \ @@ -87,10 +80,6 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ -{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} -{{ # https://github.com/docker-library/ruby/pull/438 -}} - bison \ -{{ ) else "" end -}} dpkg-dev \ libgdbm-dev \ ruby \ @@ -105,9 +94,6 @@ RUN set -eux; \ libglib2.0-dev \ libgmp-dev \ libncurses-dev \ -{{ if env.version | rtrimstr("-rc") | IN("3.2") then ( -}} - libreadline-dev \ -{{ ) else "" end -}} libssl-dev \ libxml2-dev \ libxslt-dev \ @@ -213,7 +199,7 @@ RUN set -eux; \ --disable-install-doc \ --enable-shared \ ${rustArch:+--enable-yjit} \ -{{ if env.version | IN("3.2", "3.3", "3.4") then "" else ( -}} +{{ if env.version | IN("3.3", "3.4") then "" else ( -}} ${rustArch:+--enable-zjit} \ {{ ) end -}} ; \ diff --git a/versions.json b/versions.json index f3c9eff939..2ba643f1b0 100644 --- a/versions.json +++ b/versions.json @@ -1,74 +1,4 @@ { - "3.2": { - "version": "3.2.11", - "date": "2026-03-27", - "post": "/en/news/2026/03/27/ruby-3-2-11-released/", - "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.11.tar.xz" - }, - "size": { - "gz": 19984344, - "zip": 24594356, - "xz": 14695828 - }, - "sha1": { - "gz": "9534a3aa08d2ccb4d3c50b1301b2da9a9b91c4ab", - "zip": "7e84c9433f32a758da123d3b5532cc632d19d503", - "xz": "501cecc15ba079087967888ae455d62e5886fbc1" - }, - "sha256": { - "gz": "b3eeabd6636f334531db3ffdc3229eb05e524740e6c84fdc043720573cf2f8b2", - "zip": "08ab90aa4ada9268e96aa47fb6c3a77fdb3b2f792f2671053e3b55a6141618ce", - "xz": "c13aec0c206725d5d356acbae6e5fd8bffd92dc325aec14fd5dd7795d4b763d2" - }, - "sha512": { - "gz": "95896bbf519604da0dc3d82066ac92c3f661b2ee9ffd8e2c9effce4773677445f1dcc43b05539050024b57f4f94f43984a734a03015ac6e29679e79d5a093a67", - "zip": "133d63cd9bb7c9fe38eecd18c996013de0a56fef09c89c42f4fc9c383f09ab4ab3b0b31edbadd1fd1aaa797fbb9c86128ded51c6e5263cd3225754e714b3d195", - "xz": "418739d476d34e2467e7f1ee60ff63a1969a362b49871bdc488676c1ac7d28b198deee85e2bd951a23f5b0e8425bc89ca59d5c8cb8415fa5ed835555e3d3af8d" - }, - "variants": [ - "trixie", - "slim-trixie", - "bookworm", - "slim-bookworm", - "alpine3.23", - "alpine3.22" - ], - "rust": { - "version": "1.91.1" - }, - "rustup": { - "arches": { - "amd64": { - "glibc": { - "arch": "x86_64-unknown-linux-gnu", - "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "x86_64-unknown-linux-musl", - "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" - } - }, - "arm64v8": { - "glibc": { - "arch": "aarch64-unknown-linux-gnu", - "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" - }, - "musl": { - "arch": "aarch64-unknown-linux-musl", - "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", - "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" - } - } - }, - "version": "1.28.2" - } - }, "3.3": { "version": "3.3.11", "date": "2026-03-26", From cf0d6d77140efd35d8fb7707138300a18bd3f295 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 16 Apr 2026 11:52:25 -0700 Subject: [PATCH 446/462] Update YJIT comment URLs --- versions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.sh b/versions.sh index e7750774ff..1266346b3f 100755 --- a/versions.sh +++ b/versions.sh @@ -98,8 +98,8 @@ for version in "${versions[@]}"; do # YJIT doc="$(jq <<<"$doc" -sc ' .[1][].arches? |= if . then with_entries(select(.key | IN( - # https://github.com/ruby/ruby/blob/v3_2_0/doc/yjit/yjit.md ("currently supported for macOS and Linux on x86-64 and arm64/aarch64 CPUs") - # https://github.com/ruby/ruby/blob/v3_2_0/configure.ac#L3757-L3761 + # https://github.com/ruby/ruby/blob/ruby_4_0/doc/jit/yjit.md ("currently only supports ... x86-64 and arm64/aarch64 CPUs") + # https://github.com/ruby/ruby/blob/ruby_4_0/configure.ac#L3903-L3906 "amd64", "arm64v8", empty # trailing comma From d55e25ae709885250a4e9718c27a09f1e963ca79 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 21 Apr 2026 03:03:15 -0700 Subject: [PATCH 447/462] Update 4.0 to 4.0.3 --- 4.0/alpine3.22/Dockerfile | 8 ++++---- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile index 6bdcd7ac20..8679a1dae0 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 4f1d65e148..cc4dc43d75 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 3fb8be538c..9c0a124463 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index df76b73c0c..a7dec9643e 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 5130108874..47837e7a79 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index f2be8855db..0aed573f96 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/16/ruby-4-0-2-released/ -ENV RUBY_VERSION 4.0.2 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87 +# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ +ENV RUBY_VERSION 4.0.3 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz +ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 2ba643f1b0..6194fa286e 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.2", - "date": "2026-03-16", - "post": "/en/news/2026/03/16/ruby-4-0-2-released/", + "version": "4.0.3", + "date": "2026-04-21", + "post": "/en/news/2026/04/21/ruby-4-0-3-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.2.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz" }, "size": { - "gz": 23824654, - "zip": 29123568, - "xz": 17874724 + "gz": 23806898, + "zip": 29109899, + "xz": 17878572 }, "sha1": { - "gz": "47c3627e2bdfe53dda77d3fa1730e44ef1ed7dfe", - "zip": "3cfd813761009f8fbb6001cf14149dc03bcd85d7", - "xz": "d927e26d22b15c6737df24cdf6ae80542a057240" + "gz": "619db0f25713a8f007d5889ae6e66ba0d31118e8", + "zip": "d19d91723d7a19a34b860eee8544093f64c9d92f", + "xz": "faf1f3df171d2160116d190ca32b6b00e0338bfa" }, "sha256": { - "gz": "51502b26b50b68df4963336ca41e368cde92c928faf91654de4c4c1791f82aac", - "zip": "7cdbef9028a64f73ca59e21cd46c73c794df9c8294f1cb5c50c4d93c6060b240", - "xz": "4618db85bb9ec04d8152d0099db488694a3d3c4f52106625e4ad547f1318db87" + "gz": "77964acc370d5c8375b9502e5ba6c13c03ef91ab9eb9f521c84fb42b9c9a6b0f", + "zip": "a80f1a3162950cfc1ef70f066132005efbb817f7ab6f16dcc244e5f015aabbc2", + "xz": "22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29" }, "sha512": { - "gz": "16a6ca0e9407051f58c8e3c4ec2058c52d62a9863174a3eb6dd5e9e2e893a66427e97a6e7fc8b4c3480163bd19a7a0ec4c00e481f90ff42e8f30bdbc9555f628", - "zip": "ecac80a6861fd666fc024701233f5b5b93bed9ed9047cd7ca9e11799681b0102729cc53203cee4ac33245a41b786a4a4c802633d1031881200378b011ed74580", - "xz": "be71a5452068dfc3c86b8ec07456b3fdf6dc64e8c0cd16c358fc4ed8ac08707a9c28285ea8a79dbef82031d8c93c71032a82a0b45f3c9ac5325bf3b70d06fbf2" + "gz": "6fd12620869a9a36fa2e1cce302de42f429ab9e9fae1fe3b0901ca1a1b3a606a83feed87f4b76935beb715e8a750cf718f88afef2de4e866ad574b33abb12dbe", + "zip": "48b18fc578b5d7cd362a549ff5091c749d0460122f5dc3701fd6dada8016253fe0e85c498e20943e1a7f360b1e9fd073939da00df4b0c8a1afdddc16c43e43bc", + "xz": "5816fb264ce76df59f4bfe0cadceb45025fada2e61f2c14024d6b03f63d304820cddf94afcf82a4951fd12f3b0d9148683f856f3f2245d56042fc8407b6cbff5" }, "variants": [ "trixie", From ae901cab1375afc7c400d6dfb7330be93b10454d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 11 May 2026 15:03:15 -0700 Subject: [PATCH 448/462] Update 4.0 to 4.0.4 --- 4.0/alpine3.22/Dockerfile | 8 ++++---- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile index 8679a1dae0..8beac4c8ee 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index cc4dc43d75..e19ef68372 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 9c0a124463..2809967229 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index a7dec9643e..81a38f3063 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 47837e7a79..10f6f94fa3 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 0aed573f96..52c568f73e 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/04/21/ruby-4-0-3-released/ -ENV RUBY_VERSION 4.0.3 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz -ENV RUBY_DOWNLOAD_SHA256 22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29 +# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ +ENV RUBY_VERSION 4.0.4 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 6194fa286e..ca0180e523 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.3", - "date": "2026-04-21", - "post": "/en/news/2026/04/21/ruby-4-0-3-released/", + "version": "4.0.4", + "date": "2026-05-11", + "post": "/en/news/2026/05/11/ruby-4-0-4-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.3.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz" }, "size": { - "gz": 23806898, - "zip": 29109899, - "xz": 17878572 + "gz": 23816838, + "zip": 29122429, + "xz": 17899740 }, "sha1": { - "gz": "619db0f25713a8f007d5889ae6e66ba0d31118e8", - "zip": "d19d91723d7a19a34b860eee8544093f64c9d92f", - "xz": "faf1f3df171d2160116d190ca32b6b00e0338bfa" + "gz": "3633db75e6b4848b509ecccc64704d8f4467f068", + "zip": "5edc7ce0adc2851a355673a5bb42b75efd4cf2b2", + "xz": "9e070a8a78e6faa35382360b47526042657b236d" }, "sha256": { - "gz": "77964acc370d5c8375b9502e5ba6c13c03ef91ab9eb9f521c84fb42b9c9a6b0f", - "zip": "a80f1a3162950cfc1ef70f066132005efbb817f7ab6f16dcc244e5f015aabbc2", - "xz": "22cf6005d25bbe496b5ebe9224d63a1aaabfbfe02591bb5d612517c5a7836f29" + "gz": "f35f6edfa3dabb3f723f9d0cf1906c6512ae77f4e412ab1e68cc6e91d230fa80", + "zip": "508bc83baed022c20671d69dd264e6783d61b89767b5d387c0f8efea00b62219", + "xz": "6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7" }, "sha512": { - "gz": "6fd12620869a9a36fa2e1cce302de42f429ab9e9fae1fe3b0901ca1a1b3a606a83feed87f4b76935beb715e8a750cf718f88afef2de4e866ad574b33abb12dbe", - "zip": "48b18fc578b5d7cd362a549ff5091c749d0460122f5dc3701fd6dada8016253fe0e85c498e20943e1a7f360b1e9fd073939da00df4b0c8a1afdddc16c43e43bc", - "xz": "5816fb264ce76df59f4bfe0cadceb45025fada2e61f2c14024d6b03f63d304820cddf94afcf82a4951fd12f3b0d9148683f856f3f2245d56042fc8407b6cbff5" + "gz": "b0cc9af75ee25628483a32ecd5ea6477d637ee3c75795f411bc4ebde7d86ab754fddf96385cfc5955b9dbd016418cbd7178c82dad7876b2b7119238f5159ed3a", + "zip": "b5db7ba616c56bdac9a61362d88d6350c8a8b59b5d812c1395476db73cb60fb403994e0bc3285aa2f57acbef3e30bcfce4bee4c5c8433b39d8f0a7c6dbb9bd29", + "xz": "cccc041379fd4e46a736a5c10ccf81627766a7175113c34754797b915bebcd0ce821d9cd7b42cc616b0a1f9ee38eee5ab7560c1840fa6672819c293e498a3f6f" }, "variants": [ "trixie", From 19dae249e27c036dbbe941aa61c031ef1d4c3d8d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 May 2026 21:03:15 -0700 Subject: [PATCH 449/462] Update 4.0 to 4.0.5 --- 4.0/alpine3.22/Dockerfile | 8 ++++---- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.22/Dockerfile index 8beac4c8ee..f2b0406ed5 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.22/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index e19ef68372..99681de680 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 2809967229..b33a451db0 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 81a38f3063..94dc5ebc31 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 10f6f94fa3..0458de41dc 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 52c568f73e..ed89a304f5 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/11/ruby-4-0-4-released/ -ENV RUBY_VERSION 4.0.4 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7 +# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ +ENV RUBY_VERSION 4.0.5 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz +ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index ca0180e523..c585af81d5 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.4", - "date": "2026-05-11", - "post": "/en/news/2026/05/11/ruby-4-0-4-released/", + "version": "4.0.5", + "date": "2026-05-20", + "post": "/en/news/2026/05/20/ruby-4-0-5-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.4.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz" }, "size": { - "gz": 23816838, - "zip": 29122429, - "xz": 17899740 + "gz": 23818557, + "zip": 29122529, + "xz": 17893756 }, "sha1": { - "gz": "3633db75e6b4848b509ecccc64704d8f4467f068", - "zip": "5edc7ce0adc2851a355673a5bb42b75efd4cf2b2", - "xz": "9e070a8a78e6faa35382360b47526042657b236d" + "gz": "efa77332e323c15a86e1a25a3ae53bd21972672c", + "zip": "cda48124428ae33497f191bb676c8022615ab91e", + "xz": "58216f1858feed4e2dbd2719a0a7ae807563b428" }, "sha256": { - "gz": "f35f6edfa3dabb3f723f9d0cf1906c6512ae77f4e412ab1e68cc6e91d230fa80", - "zip": "508bc83baed022c20671d69dd264e6783d61b89767b5d387c0f8efea00b62219", - "xz": "6ff9d2d6e75f5a6f997222ecc45f79209d663737eceb3689d1f42ab952673fb7" + "gz": "7d6149079a63f8ae1d326c9fa65c6019ba2dc3155eae7b39159817911c88958e", + "zip": "605f8b22e12f5cfc3f4a48850a7fe7dc9b010002d2c994d7508f38c63d2c0ff8", + "xz": "5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5" }, "sha512": { - "gz": "b0cc9af75ee25628483a32ecd5ea6477d637ee3c75795f411bc4ebde7d86ab754fddf96385cfc5955b9dbd016418cbd7178c82dad7876b2b7119238f5159ed3a", - "zip": "b5db7ba616c56bdac9a61362d88d6350c8a8b59b5d812c1395476db73cb60fb403994e0bc3285aa2f57acbef3e30bcfce4bee4c5c8433b39d8f0a7c6dbb9bd29", - "xz": "cccc041379fd4e46a736a5c10ccf81627766a7175113c34754797b915bebcd0ce821d9cd7b42cc616b0a1f9ee38eee5ab7560c1840fa6672819c293e498a3f6f" + "gz": "ce50c8dda1479f5a84771df37cdb23f0183bba900494e7492bb90d4b0a3e60ff28b799f3c469977f5f7c1335a6c1f3400a9ca52cd4acfcbed08f016d352943f4", + "zip": "c4faaefa386bb33dc4cb3994d740b0c8b4756726351df6cc0850dbd2598f3ba51dcfb38bd61d91f63adf3612bb5f6dbd727446caf9af78f5df36e7d31ecf113a", + "xz": "379d78a6d1af0455df60da46551f43438ad3ee81f83787554fc34cb1c8febb1bd363e3dc1a057b34a69f96526efc308d3dccc4b87d368897c2d1ccf179096463" }, "variants": [ "trixie", From 722133125d0cacfafa3dc09e7f57087df2c76b0b Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 9 Jun 2026 15:13:47 -0700 Subject: [PATCH 450/462] Update to Alpine 3.24 --- 3.3/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.4/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 4.0/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- versions.json | 12 ++++++------ versions.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename 3.3/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.4/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 4.0/{alpine3.22 => alpine3.24}/Dockerfile (99%) diff --git a/3.3/alpine3.22/Dockerfile b/3.3/alpine3.24/Dockerfile similarity index 99% rename from 3.3/alpine3.22/Dockerfile rename to 3.3/alpine3.24/Dockerfile index e3032cb5ef..800a431d4a 100644 --- a/3.3/alpine3.22/Dockerfile +++ b/3.3/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.4/alpine3.22/Dockerfile b/3.4/alpine3.24/Dockerfile similarity index 99% rename from 3.4/alpine3.22/Dockerfile rename to 3.4/alpine3.24/Dockerfile index 55c618cc63..229874cb57 100644 --- a/3.4/alpine3.22/Dockerfile +++ b/3.4/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/4.0/alpine3.22/Dockerfile b/4.0/alpine3.24/Dockerfile similarity index 99% rename from 4.0/alpine3.22/Dockerfile rename to 4.0/alpine3.24/Dockerfile index f2b0406ed5..fc94ec9282 100644 --- a/4.0/alpine3.22/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/versions.json b/versions.json index c585af81d5..1fdb22dd29 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "rust": { "version": "1.91.1" @@ -103,8 +103,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "rust": { "version": "1.91.1" @@ -173,8 +173,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "rust": { "version": "1.91.1" diff --git a/versions.sh b/versions.sh index 1266346b3f..8cd12f4b88 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.24", "3.23", - "3.22", empty # trailing comma hack | "alpine" + .) ] From 4ea2e7e222ba458994a266920e8815140bc2c901 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Jun 2026 09:03:13 -0700 Subject: [PATCH 451/462] Update 3.4 to 3.4.10 --- 3.4/alpine3.23/Dockerfile | 8 ++++---- 3.4/alpine3.24/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index 294d533129..df92bcf0af 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.24/Dockerfile b/3.4/alpine3.24/Dockerfile index 229874cb57..6d0c21465d 100644 --- a/3.4/alpine3.24/Dockerfile +++ b/3.4/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index d0425d111c..9472c0e271 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 608409e574..b1eccc9544 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index c4c1533785..076061f05f 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 24248534be..093b89ad4b 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/11/ruby-3-4-9-released/ -ENV RUBY_VERSION 3.4.9 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz -ENV RUBY_DOWNLOAD_SHA256 4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a +# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ +ENV RUBY_VERSION 3.4.10 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 1fdb22dd29..fddaaedba3 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.4": { - "version": "3.4.9", - "date": "2026-03-11", - "post": "/en/news/2026/03/11/ruby-3-4-9-released/", + "version": "3.4.10", + "date": "2026-06-30", + "post": "/en/news/2026/06/30/ruby-3-4-10-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.9.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz" }, "size": { - "gz": 22456968, - "xz": 16682004, - "zip": 27645906 + "gz": 22476870, + "zip": 27697773, + "xz": 16709188 }, "sha1": { - "gz": "6386200753caf4e336dafceeee165fa73fd234ec", - "xz": "1eb1b0b45b9e9191de9d2f360164e60eedf77012", - "zip": "8c4312fe946c7eaa269e5c7cee90f3b7350235b5" + "gz": "5eac73bce00e770e19b50b69032578df9b2bb41c", + "zip": "09dd69e25c393071bd0550da5f4983ee4d9550a3", + "xz": "8655291cc2e7547d10db5e81f9baac8cdbbbf702" }, "sha256": { - "gz": "7bb4d4f5e807cc27251d14d9d6086d182c5b25875191e44ab15b709cd7a7dd9c", - "xz": "4231c54072601a171faed1699f105985e9971c94cd382b78feb4eb44eec2dd1a", - "zip": "a4dd555fddefcdd4a58d2169a568f5887b125edbbda2815ea826ca1833dc41ec" + "gz": "ecee2d072a14f2d14347dd56dfd8fe5c3130abf5117bfaacbda0f4ef9cc429ec", + "zip": "3b18a22a2ea1bed8df645b1568ba13eb659baeed3a2a1a7f67a21ca604e68a13", + "xz": "6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68" }, "sha512": { - "gz": "ac7147c0e575cf74f669abb991ee8695d4191c919f306f124b3ee85d6b61361e752a4f1afb7bdffb49aee21edace1fcc9bf2b074ada15fa6c1eb611354c1d54b", - "xz": "356fb47cc56f2d25198cb95253fc20ff7d9a6fd1fa53bc475e5c440012aebe27562537c399d271357235114ade263fd625029b66cb0f9b526f9c04f169fb9580", - "zip": "1c6cc4d03edb071f79f9ae41d43defa8393b467d30000e89ee872c6fe99bde015421cb1dd3ecfd5f0359c1c095b60833a95cd5f6c4397358f8ed98eace8720e2" + "gz": "493c9be80a78a4ddf983620295c79ae9f1c8e4c60da8237e12965fa6f95dda6548b3ff3cd311fe774cc8237e18ad2b2514dd029c46c8f4eabea6613a39d7745b", + "zip": "1516ee66d878480b8d7164a002d3087268a79c380ba4807172b26260644f39bac4b7f781b62a815e46bc1107edf578f6cf4eae9aebc8fe86416978e737865278", + "xz": "c28d59946c0a1b8e4385a772e0651c6f4154c18ab8a2a62289c3213eb4fe937cec0942e0076cda429576e58ad277b18f4b5611e644d15b122c1cd96baf10f284" }, "variants": [ "trixie", From 887da016bf8e524ac6f1a96f079d1ba9628189f2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Jul 2026 21:03:14 -0700 Subject: [PATCH 452/462] Update 4.0 to 4.0.6 --- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/alpine3.24/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 99681de680..715da445c6 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.24/Dockerfile b/4.0/alpine3.24/Dockerfile index fc94ec9282..be49267ec0 100644 --- a/4.0/alpine3.24/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index b33a451db0..e93a59fc82 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 94dc5ebc31..020711eb71 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 0458de41dc..035a026679 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index ed89a304f5..8f3244b7cf 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/05/20/ruby-4-0-5-released/ -ENV RUBY_VERSION 4.0.5 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz -ENV RUBY_DOWNLOAD_SHA256 5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5 +# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ +ENV RUBY_VERSION 4.0.6 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz +ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index fddaaedba3..74623f2a8a 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.5", - "date": "2026-05-20", - "post": "/en/news/2026/05/20/ruby-4-0-5-released/", + "version": "4.0.6", + "date": "2026-07-14", + "post": "/en/news/2026/07/14/ruby-4-0-6-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.5.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz" }, "size": { - "gz": 23818557, - "zip": 29122529, - "xz": 17893756 + "gz": 23904779, + "zip": 29211551, + "xz": 17968092 }, "sha1": { - "gz": "efa77332e323c15a86e1a25a3ae53bd21972672c", - "zip": "cda48124428ae33497f191bb676c8022615ab91e", - "xz": "58216f1858feed4e2dbd2719a0a7ae807563b428" + "gz": "bd2b5a5bdf0ac9947eab242f418bef10c8851712", + "zip": "27609f5815902a5b4dd54d5c8ee798acd90e4efe", + "xz": "1b55f5159fec2bfa08147fc91d23643ab176c009" }, "sha256": { - "gz": "7d6149079a63f8ae1d326c9fa65c6019ba2dc3155eae7b39159817911c88958e", - "zip": "605f8b22e12f5cfc3f4a48850a7fe7dc9b010002d2c994d7508f38c63d2c0ff8", - "xz": "5dc5521ea54c726e6cc10b1b5a0f4004b27b482e61c04c99aed79315e30895e5" + "gz": "837d299e8f7ddf2be31a229a7a7e019d354979825117989acb3b32b1a9be262a", + "zip": "f0f7b0ee34882ab797fc6a88262d19f5783e87f7b984dbc133cfd09c24eefcb6", + "xz": "9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a" }, "sha512": { - "gz": "ce50c8dda1479f5a84771df37cdb23f0183bba900494e7492bb90d4b0a3e60ff28b799f3c469977f5f7c1335a6c1f3400a9ca52cd4acfcbed08f016d352943f4", - "zip": "c4faaefa386bb33dc4cb3994d740b0c8b4756726351df6cc0850dbd2598f3ba51dcfb38bd61d91f63adf3612bb5f6dbd727446caf9af78f5df36e7d31ecf113a", - "xz": "379d78a6d1af0455df60da46551f43438ad3ee81f83787554fc34cb1c8febb1bd363e3dc1a057b34a69f96526efc308d3dccc4b87d368897c2d1ccf179096463" + "gz": "0c050ac9b806facb1e1ec1f6a8def7fc33cf1ccfb57a502b1fc467e76e534e7eaf60297fb08e35e89c8727510903f48c73ccc8f9888a017cd6032379e84ed83e", + "zip": "3a0b87cf6934ec02d84bd5cf9e299904daf3de4625c0fc58781273abb7e0ae1497fc208c82d48fa6203643612c195c5267baa470e517cee179dca82e67104742", + "xz": "c9c391675a098b5a27dd687571ab0a164c788cbb8ddcbab6d17a3e8b3c4ba389346b2e6d7807d38db3e74d225c70e378a296d60d0f465cb0fcec9702242c83c6" }, "variants": [ "trixie", From 31475ec8e3682c1b3d3d78e222f264f564657b25 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Jul 2026 03:03:10 -0700 Subject: [PATCH 453/462] Update 3.3 to 3.3.12 --- 3.3/alpine3.23/Dockerfile | 8 ++++---- 3.3/alpine3.24/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-trixie/Dockerfile | 8 ++++---- 3.3/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.23/Dockerfile b/3.3/alpine3.23/Dockerfile index 8c1232de01..63b92bd40e 100644 --- a/3.3/alpine3.23/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.24/Dockerfile b/3.3/alpine3.24/Dockerfile index 800a431d4a..118ae595d1 100644 --- a/3.3/alpine3.24/Dockerfile +++ b/3.3/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index bb99c182f3..3180158ff9 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 9940925284..340f84d366 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 745eb730f4..1953135104 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index 076d2b3d8d..f9fe3390cb 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/03/26/ruby-3-3-11-released/ -ENV RUBY_VERSION 3.3.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3 +# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ +ENV RUBY_VERSION 3.3.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 74623f2a8a..1a60249efd 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.3": { - "version": "3.3.11", - "date": "2026-03-26", - "post": "/en/news/2026/03/26/ruby-3-3-11-released/", + "version": "3.3.12", + "date": "2026-07-16", + "post": "/en/news/2026/07/16/ruby-3-3-12-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.gz", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.tar.xz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.11.zip" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz" }, "size": { - "gz": 21483089, - "xz": 15879844, - "zip": 26947458 + "gz": 21489887, + "zip": 26954647, + "xz": 15891224 }, "sha1": { - "gz": "7f18e7e74ab64c5b159a8dfe8da3cc019b32bdb6", - "xz": "520afae357283c96610f340c92a6567ff7b2b923", - "zip": "e01bf3ff08d96438decc35b80d4d289b9d012681" + "gz": "1ecad817a7d3727db65cf898a51d9956888cee5b", + "zip": "8be5a3c6f4a8821ce5326a9e09d4230c9fa06faa", + "xz": "7df70ae8a9feb880e2ad5054dfebd712ba03d0eb" }, "sha256": { - "gz": "59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0", - "xz": "9116bb2e313203bd78cd3e8dc09284d34b2645f725877623a7185bf3807c8ca3", - "zip": "94c9d920aade547bafe392c6a288f996c151cb217ab548be5747867353568243" + "gz": "b06d63beae271933033e27f0a389bc582a009e7845357d44365c39de525a051b", + "zip": "fc1aecfb45adeb7bebbf9549d45ce6e57f0c9dac8b83cdeb80680de02a83ce41", + "xz": "873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3" }, "sha512": { - "gz": "effbcffce1cad4fa7158ce9159b6109a92e88c29f5d33151c2ec609c54fe24b747354b0e722e0fefe8164700acb2d650b8c65aad0e17e3dec2c26969a44fc524", - "xz": "1f8eb206a90121015b294dada7ea61ebd136e7e7dbb1c4bb7df21b85f359a2e733f438153bf07c57815a963e4ef3f766081fd4226caa6547f4c263b33ed7726e", - "zip": "fc4d4299df8414daeb81ae329d67f4d0ea961443e3505407a4faa134d8b9971c49b5c6750d55b4fdc210e15276845ee9b11c4ee25461f99a743f714da7096391" + "gz": "7c620438e85beb6744acc7d1e917af554238739883d592aa9839fca78514c11e91dfd8c4b5ce611d1ea507a4412ed81f3a8b5fc6eb07ba3e392a77b518de6829", + "zip": "ff5a0339310c464b88a444871f901f41fc735f77668b29dfc70389aae5d44fd90b55cff6c02d47a23596663525b526a86f9906c08c371d37e3fb105ea9c6b1a9", + "xz": "1755901f5d1e66250e4f9f4e3a0bf31ec25055f1cb86fafc68281f6d108e9cf5329a6c74c221b1a31aa7de78e9c2d8aa7b76faf39acfce44c5ed94cf7e766f3f" }, "variants": [ "trixie", From 11b46206a6d5d4755df64cdd0bb433b3dfe87e2d Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 4 Sep 2026 09:47:39 -0400 Subject: [PATCH 454/462] Link Ruby with `-z now` for full RELRO Debian's linker defaults leave `ruby` and `libruby.so` with lazy binding, so their GOTs stay writable for the life of the process and an attacker with an arbitrary write can overwrite them. Export `LDFLAGS` before `configure`. Ruby's `configure` appends to `LDFLAGS` and seeds `DLDFLAGS` from it, so the interpreter, `libruby.so`, and native extensions built downstream all pick it up. The spelling `-Wl,-z,relro -Wl,-z,now` matches what Debian's `hardening=+bindnow` emits for its own `libruby` package. Alpine already links this way, so the change is a no-op there. The image codecs reachable through `libvips` have had many memory safety bugs. A read-only GOT does not fix them, but it removes one of the easier ways to turn a memory write into code execution. --- 3.3/alpine3.23/Dockerfile | 4 ++++ 3.3/alpine3.24/Dockerfile | 4 ++++ 3.3/bookworm/Dockerfile | 4 ++++ 3.3/slim-bookworm/Dockerfile | 4 ++++ 3.3/slim-trixie/Dockerfile | 4 ++++ 3.3/trixie/Dockerfile | 4 ++++ 3.4/alpine3.23/Dockerfile | 4 ++++ 3.4/alpine3.24/Dockerfile | 4 ++++ 3.4/bookworm/Dockerfile | 4 ++++ 3.4/slim-bookworm/Dockerfile | 4 ++++ 3.4/slim-trixie/Dockerfile | 4 ++++ 3.4/trixie/Dockerfile | 4 ++++ 4.0/alpine3.23/Dockerfile | 4 ++++ 4.0/alpine3.24/Dockerfile | 4 ++++ 4.0/bookworm/Dockerfile | 4 ++++ 4.0/slim-bookworm/Dockerfile | 4 ++++ 4.0/slim-trixie/Dockerfile | 4 ++++ 4.0/trixie/Dockerfile | 4 ++++ Dockerfile.template | 4 ++++ 19 files changed, 76 insertions(+) diff --git a/3.3/alpine3.23/Dockerfile b/3.3/alpine3.23/Dockerfile index 63b92bd40e..2722a3be92 100644 --- a/3.3/alpine3.23/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.3/alpine3.24/Dockerfile b/3.3/alpine3.24/Dockerfile index 118ae595d1..8f45fa68b7 100644 --- a/3.3/alpine3.24/Dockerfile +++ b/3.3/alpine3.24/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 3180158ff9..1929fd1b2b 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 340f84d366..39f73a23a6 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 1953135104..6e8503ff16 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index f9fe3390cb..202c467465 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index df92bcf0af..2d338eaf50 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/alpine3.24/Dockerfile b/3.4/alpine3.24/Dockerfile index 6d0c21465d..7d8956b6d2 100644 --- a/3.4/alpine3.24/Dockerfile +++ b/3.4/alpine3.24/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 9472c0e271..0ba0464a36 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index b1eccc9544..f3e85b602d 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 076061f05f..88f3912051 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 093b89ad4b..df28804f6d 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 715da445c6..7a060eeef4 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/alpine3.24/Dockerfile b/4.0/alpine3.24/Dockerfile index be49267ec0..24d63d0923 100644 --- a/4.0/alpine3.24/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -95,6 +95,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index e93a59fc82..4cd16ea88c 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 020711eb71..6dcab2bb9d 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 035a026679..67880db0f4 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -88,6 +88,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 8f3244b7cf..036858b340 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -63,6 +63,10 @@ RUN set -eux; \ \ autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ diff --git a/Dockerfile.template b/Dockerfile.template index 5fdb9cce7b..3f1eeebdf0 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -194,6 +194,10 @@ RUN set -eux; \ {{ ) else "" end -}} autoconf; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ ./configure \ --build="$gnuArch" \ --disable-install-doc \ From d99f2b881184595750e2e9420fe77a577bf24b4d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 14 Sep 2026 21:03:16 -0700 Subject: [PATCH 455/462] Update 4.0 to 4.0.7 --- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/alpine3.24/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 715da445c6..333f1b37df 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.24/Dockerfile b/4.0/alpine3.24/Dockerfile index be49267ec0..53bb79a989 100644 --- a/4.0/alpine3.24/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index e93a59fc82..bf73224c8a 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 020711eb71..21aaaac291 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 035a026679..bdb9626230 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 8f3244b7cf..a78e9b6ebd 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/14/ruby-4-0-6-released/ -ENV RUBY_VERSION 4.0.6 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz -ENV RUBY_DOWNLOAD_SHA256 9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a +# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ +ENV RUBY_VERSION 4.0.7 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz +ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 1a60249efd..31761ccf4e 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.6", - "date": "2026-07-14", - "post": "/en/news/2026/07/14/ruby-4-0-6-released/", + "version": "4.0.7", + "date": "2026-09-15", + "post": "/en/news/2026/09/15/ruby-4-0-7-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.6.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz" }, "size": { - "gz": 23904779, - "zip": 29211551, - "xz": 17968092 + "gz": 23937964, + "zip": 29248954, + "xz": 17995980 }, "sha1": { - "gz": "bd2b5a5bdf0ac9947eab242f418bef10c8851712", - "zip": "27609f5815902a5b4dd54d5c8ee798acd90e4efe", - "xz": "1b55f5159fec2bfa08147fc91d23643ab176c009" + "gz": "730d4f8cebb60a1f5b556e7b58d86d0301772558", + "zip": "82b1bce8abb650e3080b96a0beff810b690dafa4", + "xz": "7d2307f975b1fef4e0ffe5cfe13067f993b5a4c2" }, "sha256": { - "gz": "837d299e8f7ddf2be31a229a7a7e019d354979825117989acb3b32b1a9be262a", - "zip": "f0f7b0ee34882ab797fc6a88262d19f5783e87f7b984dbc133cfd09c24eefcb6", - "xz": "9c9d121fe3314ea7c801e690b9de981d2b9d12d7849db99c27482468a541ba0a" + "gz": "911ace20f90d068ca0e4dda6d0e4f0f81e52e52f2dd4f4004c721e253412e82d", + "zip": "c6f889c6dccd2625ae8d595bdee8e92afb3ddae3a1669bad67bb9f24d6af30ab", + "xz": "47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375" }, "sha512": { - "gz": "0c050ac9b806facb1e1ec1f6a8def7fc33cf1ccfb57a502b1fc467e76e534e7eaf60297fb08e35e89c8727510903f48c73ccc8f9888a017cd6032379e84ed83e", - "zip": "3a0b87cf6934ec02d84bd5cf9e299904daf3de4625c0fc58781273abb7e0ae1497fc208c82d48fa6203643612c195c5267baa470e517cee179dca82e67104742", - "xz": "c9c391675a098b5a27dd687571ab0a164c788cbb8ddcbab6d17a3e8b3c4ba389346b2e6d7807d38db3e74d225c70e378a296d60d0f465cb0fcec9702242c83c6" + "gz": "ca6fb2df4b39967f1a92399ab70579216f2a87e600d127a616d4a81a3c92b25ebf35849502a2c12e2251d69e67eade3888af4a41b8844054d5c774f07c237c6d", + "zip": "5456ee1260921589cad5f0c57e84715e9c26b1f438a4c141157093c8e37e7e5d499a96c0ed35641f3cea1b741ecda2d72bfa3ce79fdbd5491784d9e6d181ac09", + "xz": "d1d345c25bff43aa86f536b22cd04746a7d3372077bf47ec75ef1820c0b43d0dbe3573dd5e5c55ee517796f46f0cdbd22c7506aebd06581241eefb5ffd9d2e5f" }, "variants": [ "trixie", From 3f45e4c352eff67a95e61c8aa0bec55deee5a8fc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 23 Sep 2026 03:03:12 -0700 Subject: [PATCH 456/462] Update 3.4 to 3.4.11 --- 3.4/alpine3.23/Dockerfile | 8 ++++---- 3.4/alpine3.24/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index 2d338eaf50..59763af8e8 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.24/Dockerfile b/3.4/alpine3.24/Dockerfile index 7d8956b6d2..9b08d7a7ad 100644 --- a/3.4/alpine3.24/Dockerfile +++ b/3.4/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 0ba0464a36..005eec0df4 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index f3e85b602d..67d3ece8de 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 88f3912051..4366988221 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index df28804f6d..018dc0706f 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/06/30/ruby-3-4-10-released/ -ENV RUBY_VERSION 3.4.10 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz -ENV RUBY_DOWNLOAD_SHA256 6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68 +# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ +ENV RUBY_VERSION 3.4.11 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz +ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 31761ccf4e..6d870dc03c 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.4": { - "version": "3.4.10", - "date": "2026-06-30", - "post": "/en/news/2026/06/30/ruby-3-4-10-released/", + "version": "3.4.11", + "date": "2026-09-23", + "post": "/en/news/2026/09/23/ruby-3-4-11-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.10.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz" }, "size": { - "gz": 22476870, - "zip": 27697773, - "xz": 16709188 + "gz": 22492449, + "zip": 27713229, + "xz": 16712500 }, "sha1": { - "gz": "5eac73bce00e770e19b50b69032578df9b2bb41c", - "zip": "09dd69e25c393071bd0550da5f4983ee4d9550a3", - "xz": "8655291cc2e7547d10db5e81f9baac8cdbbbf702" + "gz": "ed687c91e79b20a755666adbc290695accd49d79", + "zip": "240731e7c06ed6dd3d6050a5daddfd88128b3987", + "xz": "c36b1142f3d45441edbe0bb9146ddda39b018065" }, "sha256": { - "gz": "ecee2d072a14f2d14347dd56dfd8fe5c3130abf5117bfaacbda0f4ef9cc429ec", - "zip": "3b18a22a2ea1bed8df645b1568ba13eb659baeed3a2a1a7f67a21ca604e68a13", - "xz": "6f32ad662baafc228d12030dbcd284f83b034dd4337b300dc84ac74d11a1eb68" + "gz": "5c22be44524312b3d433d68739bcc530633b1da5ef8ba0afa0a37680da17d3de", + "zip": "22cb310601079c3afd18c01f1395f5ce8ddd21a5ed62b1cdf265d7cfe9524a84", + "xz": "f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4" }, "sha512": { - "gz": "493c9be80a78a4ddf983620295c79ae9f1c8e4c60da8237e12965fa6f95dda6548b3ff3cd311fe774cc8237e18ad2b2514dd029c46c8f4eabea6613a39d7745b", - "zip": "1516ee66d878480b8d7164a002d3087268a79c380ba4807172b26260644f39bac4b7f781b62a815e46bc1107edf578f6cf4eae9aebc8fe86416978e737865278", - "xz": "c28d59946c0a1b8e4385a772e0651c6f4154c18ab8a2a62289c3213eb4fe937cec0942e0076cda429576e58ad277b18f4b5611e644d15b122c1cd96baf10f284" + "gz": "cb951af61fb237ddf3213f5efec893a50524216800359514baded26189a5aa1640cc83e344aedd001cc57c4479cfabcf20033be77c28401333f57f2ac13c6640", + "zip": "2ff161d2b68918e619ff9e3083ce62db21c23b20ebc376bc2eb8af37d53e597ac878fcf2ad0a598a5eece1e5a48827655fda4a15895bcf8bb4668678dd0b76f3", + "xz": "466952978880190ca8eae2709a42f4cb8983aa2fa329219ef1cbe309de549928d4f94078cd70b168b313833ed9b7f8bbbe3c21ef2e772a3d3bf0c68cab669d2a" }, "variants": [ "trixie", From cb7ae85544be1bfc8c349790d260cee36743320f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 14 Oct 2026 11:00:16 -0700 Subject: [PATCH 457/462] Add 4.1.0-preview1 (#530) --- 4.1-rc/alpine3.23/Dockerfile | 148 ++++++++++++++++++++++++++++++++ 4.1-rc/alpine3.24/Dockerfile | 148 ++++++++++++++++++++++++++++++++ 4.1-rc/bookworm/Dockerfile | 115 +++++++++++++++++++++++++ 4.1-rc/slim-bookworm/Dockerfile | 140 ++++++++++++++++++++++++++++++ 4.1-rc/slim-trixie/Dockerfile | 140 ++++++++++++++++++++++++++++++ 4.1-rc/trixie/Dockerfile | 115 +++++++++++++++++++++++++ versions.json | 77 +++++++++++++++++ 7 files changed, 883 insertions(+) create mode 100644 4.1-rc/alpine3.23/Dockerfile create mode 100644 4.1-rc/alpine3.24/Dockerfile create mode 100644 4.1-rc/bookworm/Dockerfile create mode 100644 4.1-rc/slim-bookworm/Dockerfile create mode 100644 4.1-rc/slim-trixie/Dockerfile create mode 100644 4.1-rc/trixie/Dockerfile diff --git a/4.1-rc/alpine3.23/Dockerfile b/4.1-rc/alpine3.23/Dockerfile new file mode 100644 index 0000000000..dedf2a0100 --- /dev/null +++ b/4.1-rc/alpine3.23/Dockerfile @@ -0,0 +1,148 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.23 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.1-rc/alpine3.24/Dockerfile b/4.1-rc/alpine3.24/Dockerfile new file mode 100644 index 0000000000..90768f2282 --- /dev/null +++ b/4.1-rc/alpine3.24/Dockerfile @@ -0,0 +1,148 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + apk add --no-cache --virtual .ruby-builddeps \ + autoconf \ + bzip2 \ + bzip2-dev \ + ca-certificates \ + coreutils \ + dpkg-dev dpkg \ + g++ \ + gcc \ + gdbm-dev \ + glib-dev \ + gmp-dev \ + libc-dev \ + libffi-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + ncurses-dev \ + openssl \ + openssl-dev \ + patch \ + procps \ + yaml-dev \ + zlib-dev \ + ruby \ + tar \ + xz \ + yaml-dev \ + zlib-dev \ + ; \ + \ + rustArch=; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') rustArch='x86_64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init'; rustupSha256='e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2' ;; \ + 'aarch64') rustArch='aarch64-unknown-linux-musl'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init'; rustupSha256='a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ +# https://github.com/docker-library/ruby/issues/196 +# https://bugs.ruby-lang.org/issues/14387#note-13 (patch source) +# https://bugs.ruby-lang.org/issues/14387#note-16 ("Therefore ncopa's patch looks good for me in general." -- only breaks glibc which doesn't matter here) + wget -O 'thread-stack-fix.patch' 'https://bugs.ruby-lang.org/attachments/download/7081/0001-thread_pthread.c-make-get_main_stack-portable-on-lin.patch'; \ + echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ + patch -p1 -i thread-stack-fix.patch; \ + rm thread-stack-fix.patch; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + runDeps="$( \ + scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ + | tr ',' '\n' \ + | sort -u \ + | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ + )"; \ + apk add --no-network --virtual .ruby-rundeps $runDeps; \ + apk del --no-network .ruby-builddeps; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if \ + apk --no-network list --installed \ + | grep -v '^[.]ruby-' \ + | grep -i ruby \ + ; then \ + exit 1; \ + fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.1-rc/bookworm/Dockerfile b/4.1-rc/bookworm/Dockerfile new file mode 100644 index 0000000000..942b4017b4 --- /dev/null +++ b/4.1-rc/bookworm/Dockerfile @@ -0,0 +1,115 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:bookworm + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.1-rc/slim-bookworm/Dockerfile b/4.1-rc/slim-bookworm/Dockerfile new file mode 100644 index 0000000000..1e4c6091b6 --- /dev/null +++ b/4.1-rc/slim-bookworm/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bookworm-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | 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; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.1-rc/slim-trixie/Dockerfile b/4.1-rc/slim-trixie/Dockerfile new file mode 100644 index 0000000000..14ee84d9e8 --- /dev/null +++ b/4.1-rc/slim-trixie/Dockerfile @@ -0,0 +1,140 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:trixie-slim + +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + ; \ + apt-get dist-clean + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + autoconf \ + bzip2 \ + g++ \ + gcc \ + libbz2-dev \ + libffi-dev \ + libgdbm-compat-dev \ + libglib2.0-dev \ + libgmp-dev \ + libncurses-dev \ + libssl-dev \ + libxml2-dev \ + libxslt-dev \ + libyaml-dev \ + make \ + wget \ + xz-utils \ + zlib1g-dev \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + apt-get dist-clean; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/4.1-rc/trixie/Dockerfile b/4.1-rc/trixie/Dockerfile new file mode 100644 index 0000000000..6bad32da89 --- /dev/null +++ b/4.1-rc/trixie/Dockerfile @@ -0,0 +1,115 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM buildpack-deps:trixie + +# skip installing gem documentation with `gem install`/`gem update` +RUN set -eux; \ + mkdir -p /usr/local/etc; \ + echo 'gem: --no-document' >> /usr/local/etc/gemrc + +ENV LANG C.UTF-8 + +# https://www.ruby-lang.org/en/news/2026/10/12/ruby-4-1-0-preview1-released/ +ENV RUBY_VERSION 4.1.0-preview1 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz +ENV RUBY_DOWNLOAD_SHA256 b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8 + +# some of ruby's build scripts are written in ruby +# we purge system ruby later to make sure our final image uses what we just built +RUN set -eux; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + dpkg-dev \ + libgdbm-dev \ + ruby \ + ; \ + \ + rustArch=; \ + dpkgArch="$(dpkg --print-architecture)"; \ + case "$dpkgArch" in \ + 'amd64') rustArch='x86_64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init'; rustupSha256='20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c' ;; \ + 'arm64') rustArch='aarch64-unknown-linux-gnu'; rustupUrl='https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init'; rustupSha256='e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c' ;; \ + esac; \ + \ + if [ -n "$rustArch" ]; then \ + mkdir -p /tmp/rust; \ + \ + wget -O /tmp/rust/rustup-init "$rustupUrl"; \ + echo "$rustupSha256 */tmp/rust/rustup-init" | sha256sum --check --strict; \ + chmod +x /tmp/rust/rustup-init; \ + \ + export RUSTUP_HOME='/tmp/rust/rustup' CARGO_HOME='/tmp/rust/cargo'; \ + export PATH="$CARGO_HOME/bin:$PATH"; \ + /tmp/rust/rustup-init -y --no-modify-path --profile minimal --default-toolchain '1.91.1' --default-host "$rustArch"; \ + \ + rustc --version; \ + cargo --version; \ + fi; \ + \ + wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ + echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ + \ + mkdir -p /usr/src/ruby; \ + tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1; \ + rm ruby.tar.xz; \ + \ + cd /usr/src/ruby; \ + \ + autoconf; \ + gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ +# full RELRO: "-z now" disables lazy binding so the loader can map the GOT read-only at startup +# https://github.com/docker-library/ruby/pull/529 +# https://salsa.debian.org/ruby-team/ruby/-/blob/8a55ab83e2c1783d80d0117fecbda533ac75f3e3/debian/rules#L63-67 (Debian's "hardening=+bindnow" produces the same flags) + export LDFLAGS='-Wl,-z,relro -Wl,-z,now'; \ + ./configure \ + --build="$gnuArch" \ + --disable-install-doc \ + --enable-shared \ + ${rustArch:+--enable-yjit} \ + ${rustArch:+--enable-zjit} \ + ; \ + make -j "$(nproc)"; \ + make install; \ + \ + rm -rf /tmp/rust; \ + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark > /dev/null; \ + find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ +# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file) + | awk 'sub(":$", "", $1) { print $1 }' \ + | sort -u \ + | xargs -r apt-mark manual \ + ; \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + apt-get dist-clean; \ + \ + cd /; \ + rm -r /usr/src/ruby; \ +# verify we have no "ruby" packages installed + if dpkg -l | grep -i ruby; then exit 1; fi; \ + [ "$(command -v ruby)" = '/usr/local/bin/ruby' ]; \ +# rough smoke test + ruby --version; \ + gem --version; \ + bundle --version + +# don't create ".bundle" in all our apps +ENV GEM_HOME /usr/local/bundle +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ + BUNDLE_APP_CONFIG="$GEM_HOME" +ENV PATH $GEM_HOME/bin:$PATH +RUN set -eux; \ + mkdir "$GEM_HOME"; \ +# adjust permissions of GEM_HOME for running "gem install" as an arbitrary user + chmod 1777 "$GEM_HOME" + +CMD [ "irb" ] diff --git a/versions.json b/versions.json index 6d870dc03c..e54b2d910e 100644 --- a/versions.json +++ b/versions.json @@ -208,5 +208,82 @@ }, "version": "1.28.2" } + }, + "4.1": null, + "4.1-rc": { + "version": "4.1.0-preview1", + "date": "2026-10-12", + "post": "/en/news/2026/10/12/ruby-4-1-0-preview1-released/", + "tag": "v4.1.0-preview1", + "stats": { + "files_changed": 6116, + "insertions": 311387, + "deletions": 219997 + }, + "url": { + "gz": "https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.1/ruby-4.1.0-preview1.tar.xz" + }, + "size": { + "gz": 26550186, + "zip": 32429495, + "xz": 20218640 + }, + "sha1": { + "gz": "4f04a63c2e65945a4f4f7a6d1372783b60e68c5a", + "zip": "199cf5247f7fc55ff225b3fe6928a39a522000d0", + "xz": "3e6c6919bbdb178fd7d6210e3e960889094fac3c" + }, + "sha256": { + "gz": "fb530bb88e90de3ae91c1310a27ae090e6bd989b8726de50ef12a890a85b88ef", + "zip": "2f1ea85203801c24e64ddf02fc2600f582a2544ef8c84d198111e56b0873b125", + "xz": "b81f20bf2bc72aa360785eb77ffa0c9f15343ac7316637fbf347500fc3e2e3a8" + }, + "sha512": { + "gz": "f5628830685d0ce4ffb26294089c31c452e2e5a0bdcc6a5e0c670f335e52fb33eaaea7df3b834778db1fdde89cd2656d94743f6efa672c3bff6e89d64d5b7539", + "zip": "fd32a7b544ec73f0e642202531170bf8fa4454b2c7ff069748b2bf8e530fc8ae4124572e570c4c56606cc90aeeb723d35cab152978b28ee36b4bb06c798529df", + "xz": "b58bc71a8734ceb38c9c301e0201ecd28559c97a3b93caa1d49e07ff34d51565b0b6ed98f05be41868cc09513784bd3e8b5340574fec37116a4ffcb218d396e4" + }, + "variants": [ + "trixie", + "slim-trixie", + "bookworm", + "slim-bookworm", + "alpine3.24", + "alpine3.23" + ], + "rust": { + "version": "1.91.1" + }, + "rustup": { + "arches": { + "amd64": { + "glibc": { + "arch": "x86_64-unknown-linux-gnu", + "sha256": "20a06e644b0d9bd2fbdbfd52d42540bdde820ea7df86e92e533c073da0cdd43c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "x86_64-unknown-linux-musl", + "sha256": "e6599a1c7be58a2d8eaca66a80e0dc006d87bbcf780a58b7343d6e14c1605cb2", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/x86_64-unknown-linux-musl/rustup-init" + } + }, + "arm64v8": { + "glibc": { + "arch": "aarch64-unknown-linux-gnu", + "sha256": "e3853c5a252fca15252d07cb23a1bdd9377a8c6f3efa01531109281ae47f841c", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-gnu/rustup-init" + }, + "musl": { + "arch": "aarch64-unknown-linux-musl", + "sha256": "a97c8f56d7462908695348dd8c71ea6740c138ce303715793a690503a94fc9a9", + "url": "https://static.rust-lang.org/rustup/archive/1.28.2/aarch64-unknown-linux-musl/rustup-init" + } + } + }, + "version": "1.28.2" + } } } From 20d2e9b089de3b302e99b3aa8a661751c31cdcdf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 22 Oct 2026 03:03:14 -0700 Subject: [PATCH 458/462] Update 4.0 to 4.0.8 --- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/alpine3.24/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index 9c7e862111..fb3c2bef35 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.24/Dockerfile b/4.0/alpine3.24/Dockerfile index 37be05cb86..cccd77699b 100644 --- a/4.0/alpine3.24/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 0eebca7c6b..159099a3eb 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 46be9698f2..9cf928728a 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index 46478c11ca..e3bf86b436 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index d3de80b688..18472d68cd 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/15/ruby-4-0-7-released/ -ENV RUBY_VERSION 4.0.7 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz -ENV RUBY_DOWNLOAD_SHA256 47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375 +# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ +ENV RUBY_VERSION 4.0.8 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz +ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index e54b2d910e..d07203214f 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.7", - "date": "2026-09-15", - "post": "/en/news/2026/09/15/ruby-4-0-7-released/", + "version": "4.0.8", + "date": "2026-10-22", + "post": "/en/news/2026/10/22/ruby-4-0-8-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.7.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz" }, "size": { - "gz": 23937964, - "zip": 29248954, - "xz": 17995980 + "gz": 23947459, + "zip": 29263079, + "xz": 18019152 }, "sha1": { - "gz": "730d4f8cebb60a1f5b556e7b58d86d0301772558", - "zip": "82b1bce8abb650e3080b96a0beff810b690dafa4", - "xz": "7d2307f975b1fef4e0ffe5cfe13067f993b5a4c2" + "gz": "f79bc8217dd0edd7ecc0c1c0cb57e64a906258a5", + "zip": "40c0e4f791563bc8a24d683547cb3fe08c01da4b", + "xz": "24404aa1371a1f5a28bfcc8ac4331bd744810954" }, "sha256": { - "gz": "911ace20f90d068ca0e4dda6d0e4f0f81e52e52f2dd4f4004c721e253412e82d", - "zip": "c6f889c6dccd2625ae8d595bdee8e92afb3ddae3a1669bad67bb9f24d6af30ab", - "xz": "47ef59413f7a4587ba6a6b78b14036eb5e36eec2ec0b90964801e88d56a3d375" + "gz": "0968e2ac4cbd6f1fd85d3092aed66cd3c2d8ba4a5e2493d6e6c6cb0c431897d2", + "zip": "68e12bb40c9175c2a97f371ff6a76dd93649bb09dc76d757394b7086c881ade4", + "xz": "3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4" }, "sha512": { - "gz": "ca6fb2df4b39967f1a92399ab70579216f2a87e600d127a616d4a81a3c92b25ebf35849502a2c12e2251d69e67eade3888af4a41b8844054d5c774f07c237c6d", - "zip": "5456ee1260921589cad5f0c57e84715e9c26b1f438a4c141157093c8e37e7e5d499a96c0ed35641f3cea1b741ecda2d72bfa3ce79fdbd5491784d9e6d181ac09", - "xz": "d1d345c25bff43aa86f536b22cd04746a7d3372077bf47ec75ef1820c0b43d0dbe3573dd5e5c55ee517796f46f0cdbd22c7506aebd06581241eefb5ffd9d2e5f" + "gz": "011b741c8fe3160643739f8fd88f3a69b198260dabcd3cb791c1ffacdfae7b48f6b2ca365ea97198d5dcb13fc839533ec1e83bab76f38c25203a7a3b6e665e8b", + "zip": "bee8b619c287530d10779d6527d5e7397b75b74d0abe57d9a12b8d8d0b303064ea6da3fe9a47d1fb9835abfe11701e64a767841658e209cb866ca44aa951ef33", + "xz": "79eb57f30a853d6e856ce2df35b8ff20c393d5cacad43420c5caba9ebba53445d1b7b40f0a65a1cd4eee6bfc86abc3eb722e1fa5bef10b41bf56779b566e894a" }, "variants": [ "trixie", From 9d3b660038954e83a8f5d4db7b5d862d9966f214 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 Oct 2026 03:03:09 -0700 Subject: [PATCH 459/462] Update 3.3 to 3.3.13 --- 3.3/alpine3.23/Dockerfile | 8 ++++---- 3.3/alpine3.24/Dockerfile | 8 ++++---- 3.3/bookworm/Dockerfile | 8 ++++---- 3.3/slim-bookworm/Dockerfile | 8 ++++---- 3.3/slim-trixie/Dockerfile | 8 ++++---- 3.3/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.3/alpine3.23/Dockerfile b/3.3/alpine3.23/Dockerfile index 2722a3be92..2b3e8dfac0 100644 --- a/3.3/alpine3.23/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/alpine3.24/Dockerfile b/3.3/alpine3.24/Dockerfile index 8f45fa68b7..2b3060c46c 100644 --- a/3.3/alpine3.24/Dockerfile +++ b/3.3/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/bookworm/Dockerfile b/3.3/bookworm/Dockerfile index 1929fd1b2b..4376360f2d 100644 --- a/3.3/bookworm/Dockerfile +++ b/3.3/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-bookworm/Dockerfile b/3.3/slim-bookworm/Dockerfile index 39f73a23a6..e8e3b7e481 100644 --- a/3.3/slim-bookworm/Dockerfile +++ b/3.3/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/slim-trixie/Dockerfile b/3.3/slim-trixie/Dockerfile index 6e8503ff16..15c5e18898 100644 --- a/3.3/slim-trixie/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.3/trixie/Dockerfile b/3.3/trixie/Dockerfile index 202c467465..522377e059 100644 --- a/3.3/trixie/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/07/16/ruby-3-3-12-released/ -ENV RUBY_VERSION 3.3.12 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz -ENV RUBY_DOWNLOAD_SHA256 873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-3-13-released/ +ENV RUBY_VERSION 3.3.13 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz +ENV RUBY_DOWNLOAD_SHA256 6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index d07203214f..2ead6b8cb0 100644 --- a/versions.json +++ b/versions.json @@ -1,32 +1,32 @@ { "3.3": { - "version": "3.3.12", - "date": "2026-07-16", - "post": "/en/news/2026/07/16/ruby-3-3-12-released/", + "version": "3.3.13", + "date": "2026-10-23", + "post": "/en/news/2026/10/23/ruby-3-3-13-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.12.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.xz" }, "size": { - "gz": 21489887, - "zip": 26954647, - "xz": 15891224 + "gz": 21497008, + "zip": 26961541, + "xz": 15878972 }, "sha1": { - "gz": "1ecad817a7d3727db65cf898a51d9956888cee5b", - "zip": "8be5a3c6f4a8821ce5326a9e09d4230c9fa06faa", - "xz": "7df70ae8a9feb880e2ad5054dfebd712ba03d0eb" + "gz": "e89379c35cd61b23c7fef6cff9c5bbece4e2c391", + "zip": "4536403d0c1feaa6290fc7d94e65db4bc2b7f0ed", + "xz": "61e8a88d601ca7a4e9f9c30428fa46be0fdf690d" }, "sha256": { - "gz": "b06d63beae271933033e27f0a389bc582a009e7845357d44365c39de525a051b", - "zip": "fc1aecfb45adeb7bebbf9549d45ce6e57f0c9dac8b83cdeb80680de02a83ce41", - "xz": "873e3297990b8cff7a5436f6e510a3a7a18c74e5f2c794e4162e605fe0a743b3" + "gz": "4cae72e971bd1cdb20ca87d299111182417c5276c162de8ead0ab0531426cd61", + "zip": "8cf1c468af6dbcaa2c48270cc4c951325dabe5fd84b609641d4bd7b89c9d5766", + "xz": "6bd764359992373a96556b45fb7dfe6b6170da34a0a2fd0b7e1be7932fea982b" }, "sha512": { - "gz": "7c620438e85beb6744acc7d1e917af554238739883d592aa9839fca78514c11e91dfd8c4b5ce611d1ea507a4412ed81f3a8b5fc6eb07ba3e392a77b518de6829", - "zip": "ff5a0339310c464b88a444871f901f41fc735f77668b29dfc70389aae5d44fd90b55cff6c02d47a23596663525b526a86f9906c08c371d37e3fb105ea9c6b1a9", - "xz": "1755901f5d1e66250e4f9f4e3a0bf31ec25055f1cb86fafc68281f6d108e9cf5329a6c74c221b1a31aa7de78e9c2d8aa7b76faf39acfce44c5ed94cf7e766f3f" + "gz": "0536341f6f612a1eb0128f7d18eed081b09264c695e6a159a5456ba3050464849791ae26e33a7ea384406fa9e19b98bf194c89638dfe2940d3dbeed5b3126c92", + "zip": "622c8b60b2202aea1aa4caed00cee5984109926793ee57c86a9cc39b1628855f51a26d07258aa85aacc679c6186efc4ebf20b5a51f199de7cdd6fcc98a212d10", + "xz": "906e270e2629b44e469265e08d693f996b467a3fc165fbdb9b8f6f7b37effe4fdae9d4968e72a809d1381e35279cb10b6630d40fac31a634981deb4c30ff325c" }, "variants": [ "trixie", From 080b870893c645fcca82bbc0d2c2dd5e181f3b38 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 Oct 2026 03:37:24 -0700 Subject: [PATCH 460/462] Update 3.4 to 3.4.12 --- 3.4/alpine3.23/Dockerfile | 8 ++++---- 3.4/alpine3.24/Dockerfile | 8 ++++---- 3.4/bookworm/Dockerfile | 8 ++++---- 3.4/slim-bookworm/Dockerfile | 8 ++++---- 3.4/slim-trixie/Dockerfile | 8 ++++---- 3.4/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/3.4/alpine3.23/Dockerfile b/3.4/alpine3.23/Dockerfile index 59763af8e8..e27c47a3c8 100644 --- a/3.4/alpine3.23/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/alpine3.24/Dockerfile b/3.4/alpine3.24/Dockerfile index 9b08d7a7ad..2ec9abb992 100644 --- a/3.4/alpine3.24/Dockerfile +++ b/3.4/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/bookworm/Dockerfile b/3.4/bookworm/Dockerfile index 005eec0df4..42e3e725e3 100644 --- a/3.4/bookworm/Dockerfile +++ b/3.4/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-bookworm/Dockerfile b/3.4/slim-bookworm/Dockerfile index 67d3ece8de..e2892bd9df 100644 --- a/3.4/slim-bookworm/Dockerfile +++ b/3.4/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/slim-trixie/Dockerfile b/3.4/slim-trixie/Dockerfile index 4366988221..ca241516a0 100644 --- a/3.4/slim-trixie/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/3.4/trixie/Dockerfile b/3.4/trixie/Dockerfile index 018dc0706f..3f4442fc71 100644 --- a/3.4/trixie/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/09/23/ruby-3-4-11-released/ -ENV RUBY_VERSION 3.4.11 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz -ENV RUBY_DOWNLOAD_SHA256 f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-3-4-12-released/ +ENV RUBY_VERSION 3.4.12 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz +ENV RUBY_DOWNLOAD_SHA256 db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 2ead6b8cb0..3312306e76 100644 --- a/versions.json +++ b/versions.json @@ -70,33 +70,33 @@ } }, "3.4": { - "version": "3.4.11", - "date": "2026-09-23", - "post": "/en/news/2026/09/23/ruby-3-4-11-released/", + "version": "3.4.12", + "date": "2026-10-23", + "post": "/en/news/2026/10/23/ruby-3-4-12-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.11.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.xz" }, "size": { - "gz": 22492449, - "zip": 27713229, - "xz": 16712500 + "gz": 22498017, + "zip": 27719665, + "xz": 16732860 }, "sha1": { - "gz": "ed687c91e79b20a755666adbc290695accd49d79", - "zip": "240731e7c06ed6dd3d6050a5daddfd88128b3987", - "xz": "c36b1142f3d45441edbe0bb9146ddda39b018065" + "gz": "8ead0b008d7cdeb543282489e7574324ab62939f", + "zip": "c4381ce52fba1af02944cedb35eac569976bfdb8", + "xz": "bf42a4909e1517a2fee26eebbd840bbef3181c61" }, "sha256": { - "gz": "5c22be44524312b3d433d68739bcc530633b1da5ef8ba0afa0a37680da17d3de", - "zip": "22cb310601079c3afd18c01f1395f5ce8ddd21a5ed62b1cdf265d7cfe9524a84", - "xz": "f79c6e789ce4f30f77c88a40b23b93e2547c512a843dc17db27ab1f5cc66f4e4" + "gz": "5e5d85ad93b0adcccbad47733680f4892bd0078e3342437f7babce01c1872479", + "zip": "b1bec4f3a2b0c47f349a102b013f1c8f345b9991388e75368d1178ac4f9cfc0e", + "xz": "db6c147940d7ad0b706823d42c8e6713c36dec70a1f83f635f1d3a7f0599ec90" }, "sha512": { - "gz": "cb951af61fb237ddf3213f5efec893a50524216800359514baded26189a5aa1640cc83e344aedd001cc57c4479cfabcf20033be77c28401333f57f2ac13c6640", - "zip": "2ff161d2b68918e619ff9e3083ce62db21c23b20ebc376bc2eb8af37d53e597ac878fcf2ad0a598a5eece1e5a48827655fda4a15895bcf8bb4668678dd0b76f3", - "xz": "466952978880190ca8eae2709a42f4cb8983aa2fa329219ef1cbe309de549928d4f94078cd70b168b313833ed9b7f8bbbe3c21ef2e772a3d3bf0c68cab669d2a" + "gz": "7d4fcf4b57f94974091df406e159ccfd8460e75bd7593993d9d4172a8ad673388bb8505ddb41377014dce4df6d358e019d4fa4098b535aa705e790f65962f1cd", + "zip": "21573c2ba656984c006c8f499f3498c5208eba17d862d93269221c1e7295ace4e5034a53b23931d6b9585c4fc98ecd9b1196b81c2b58543d83550ea60fdc014e", + "xz": "7866ed652921f9f0d601e1e323d29fddee3506cfd89e258cab7601786bffec8a17245468d517d246ecfa7fa9a982b73cfff0aaf6534444753e8b6add297bfbd3" }, "variants": [ "trixie", From 566c0b5ecc3c1c5ce82ab5a94962cb02ceaba14b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 Oct 2026 04:15:03 -0700 Subject: [PATCH 461/462] Update 4.0 to 4.0.9 --- 4.0/alpine3.23/Dockerfile | 8 ++++---- 4.0/alpine3.24/Dockerfile | 8 ++++---- 4.0/bookworm/Dockerfile | 8 ++++---- 4.0/slim-bookworm/Dockerfile | 8 ++++---- 4.0/slim-trixie/Dockerfile | 8 ++++---- 4.0/trixie/Dockerfile | 8 ++++---- versions.json | 36 ++++++++++++++++++------------------ 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/4.0/alpine3.23/Dockerfile b/4.0/alpine3.23/Dockerfile index fb3c2bef35..1649222d04 100644 --- a/4.0/alpine3.23/Dockerfile +++ b/4.0/alpine3.23/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/alpine3.24/Dockerfile b/4.0/alpine3.24/Dockerfile index cccd77699b..de4dca0fc1 100644 --- a/4.0/alpine3.24/Dockerfile +++ b/4.0/alpine3.24/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/bookworm/Dockerfile b/4.0/bookworm/Dockerfile index 159099a3eb..eb5dfa1dab 100644 --- a/4.0/bookworm/Dockerfile +++ b/4.0/bookworm/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-bookworm/Dockerfile b/4.0/slim-bookworm/Dockerfile index 9cf928728a..9541069ef8 100644 --- a/4.0/slim-bookworm/Dockerfile +++ b/4.0/slim-bookworm/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/slim-trixie/Dockerfile b/4.0/slim-trixie/Dockerfile index e3bf86b436..e7ac0a4f66 100644 --- a/4.0/slim-trixie/Dockerfile +++ b/4.0/slim-trixie/Dockerfile @@ -20,10 +20,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/4.0/trixie/Dockerfile b/4.0/trixie/Dockerfile index 18472d68cd..ce2c7e431e 100644 --- a/4.0/trixie/Dockerfile +++ b/4.0/trixie/Dockerfile @@ -13,10 +13,10 @@ RUN set -eux; \ ENV LANG C.UTF-8 -# https://www.ruby-lang.org/en/news/2026/10/22/ruby-4-0-8-released/ -ENV RUBY_VERSION 4.0.8 -ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz -ENV RUBY_DOWNLOAD_SHA256 3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4 +# https://www.ruby-lang.org/en/news/2026/10/23/ruby-4-0-9-released/ +ENV RUBY_VERSION 4.0.9 +ENV RUBY_DOWNLOAD_URL https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz +ENV RUBY_DOWNLOAD_SHA256 a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4 # some of ruby's build scripts are written in ruby # we purge system ruby later to make sure our final image uses what we just built diff --git a/versions.json b/versions.json index 3312306e76..48c47b7d04 100644 --- a/versions.json +++ b/versions.json @@ -140,33 +140,33 @@ } }, "4.0": { - "version": "4.0.8", - "date": "2026-10-22", - "post": "/en/news/2026/10/22/ruby-4-0-8-released/", + "version": "4.0.9", + "date": "2026-10-23", + "post": "/en/news/2026/10/23/ruby-4-0-9-released/", "url": { - "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.gz", - "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.zip", - "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.8.tar.xz" + "gz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.gz", + "zip": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.zip", + "xz": "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.9.tar.xz" }, "size": { - "gz": 23947459, - "zip": 29263079, - "xz": 18019152 + "gz": 23946524, + "zip": 29263242, + "xz": 17996144 }, "sha1": { - "gz": "f79bc8217dd0edd7ecc0c1c0cb57e64a906258a5", - "zip": "40c0e4f791563bc8a24d683547cb3fe08c01da4b", - "xz": "24404aa1371a1f5a28bfcc8ac4331bd744810954" + "gz": "39f31360bc0c03bde9eec4177e443f6298481e2e", + "zip": "9e2d496d0f3663918c3183b8671c7f4b78aa185e", + "xz": "630cf1e7a4c522f49a2fec383805627691500b54" }, "sha256": { - "gz": "0968e2ac4cbd6f1fd85d3092aed66cd3c2d8ba4a5e2493d6e6c6cb0c431897d2", - "zip": "68e12bb40c9175c2a97f371ff6a76dd93649bb09dc76d757394b7086c881ade4", - "xz": "3bd35abc39dce9c682d62cf333fbd8b8f34816dd651f8228b3b59353157b84a4" + "gz": "c35350682ff050b79702d57ade4516e7336063f510155d19fb2fb5b3f3909511", + "zip": "8242fbb2354cb71811cb2ff4d5e149b7a0ecb700e6c61a897710204ac36f866b", + "xz": "a8057adb39f51ad6dc3106237504c93dd792bb515837b4fe7817ae21ed7e51f4" }, "sha512": { - "gz": "011b741c8fe3160643739f8fd88f3a69b198260dabcd3cb791c1ffacdfae7b48f6b2ca365ea97198d5dcb13fc839533ec1e83bab76f38c25203a7a3b6e665e8b", - "zip": "bee8b619c287530d10779d6527d5e7397b75b74d0abe57d9a12b8d8d0b303064ea6da3fe9a47d1fb9835abfe11701e64a767841658e209cb866ca44aa951ef33", - "xz": "79eb57f30a853d6e856ce2df35b8ff20c393d5cacad43420c5caba9ebba53445d1b7b40f0a65a1cd4eee6bfc86abc3eb722e1fa5bef10b41bf56779b566e894a" + "gz": "9adb0069a07ee1348a04b627d8af1c9f2b6537bdea5dce0b57423659626d9ae3cc04955eae7167014c56bd0f4c7c9d1aa0e4fcfc666eda738b1b0c35a3674114", + "zip": "29422739ea9b5189c24354f6c689f40485c4dc8945e735c38240094195a637dbc6807f4fe295a1579b27ca930e1eb6b2ad7fe1970dad38d0800e049863e8288b", + "xz": "7160b1c6fb61b0e369cddccb29eadae85390d86777c875efc18a56de390b1fe1ff47d6e37ccaf39d2ed477c9811f1224cbb3d2f54a0cbd5d5daf418b1cf2557e" }, "variants": [ "trixie", From 52052d14fd1f401dfa19af0df7985a997c369028 Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Tue, 3 Nov 2026 09:42:30 -0800 Subject: [PATCH 462/462] Add a workflow to update to a new Ruby release on dispatch (#532) Lets ruby/ruby's release workflow (publish.yml) trigger the same "update.sh" + build/test + push that the Jenkins update.sh job does, right after a release instead of up to 6 hours later: POST /repos/docker-library/ruby/actions/workflows/update.yml/dispatches {"ref": "master", "inputs": {"version": "4.0.9"}} The "update" job waits for the version to appear in www.ruby-lang.org's releases.yml (which "versions.sh" reads), runs "./update.sh" for the affected versions.json keys and commits with the same message format as the Jenkins job. The "test" job builds and tests only the changed variants with the same matrix generator as ci.yml. The "push" job then fast-forwards master with the workflow's own GITHUB_TOKEN. Ruby usually releases several versions at once, so each version runs as its own workflow run (concurrency group per version). If master moved in the meantime (another version's run, or the Jenkins job), the push job exits successfully when master already has the version, and otherwise replays the tested commit on top of master, verifying that the result is byte-identical to what was tested for the affected versions and that "./update.sh" is a no-op on it. Anything else fails without pushing. --- .github/workflows/update.yml | 275 +++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) create mode 100644 .github/workflows/update.yml diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 0000000000..6a874b7bfa --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,275 @@ +name: Update + +# Bump an image to a freshly released Ruby version as soon as upstream releases it. +# +# This is triggered by Ruby's own release workflow (ruby/ruby's .github/workflows/publish.yml) via +# POST /repos/docker-library/ruby/actions/workflows/update.yml/dispatches +# {"ref": "master", "inputs": {"version": "4.0.9"}} +# and does the same thing as the "update.sh" Jenkins job (https://doi-janky.infosiftr.net/job/update.sh/job/ruby/), +# just sooner: run "./update.sh", commit, build + test the result on amd64, then push it to master. +# If the Jenkins job gets there first, this finds nothing to do (and vice versa). +# +# Ruby usually releases several versions at once (e.g. 3.3.x, 3.4.x and 4.0.x on the same day), so each +# version runs as its own workflow run; whichever one pushes first wins, and the others replay their +# (already tested) commit on top of it. + +on: + workflow_dispatch: + inputs: + version: + description: 'Released Ruby version (e.g. "4.0.9" or "4.1.0-preview1")' + required: true + type: string + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +concurrency: + group: update-${{ inputs.version }} + cancel-in-progress: false + +permissions: + contents: read + +jobs: + + update: + name: Update ${{ inputs.version }} + runs-on: ubuntu-latest + timeout-minutes: 150 + outputs: + key: ${{ steps.targets.outputs.key }} + targets: ${{ steps.targets.outputs.targets }} + base: ${{ steps.commit.outputs.base }} + commit: ${{ steps.commit.outputs.commit }} + strategy: ${{ steps.generate-jobs.outputs.strategy }} + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Resolve versions.json keys + id: targets + env: + RUBY_VERSION: ${{ inputs.version }} + run: | + if [[ ! "$RUBY_VERSION" =~ ^([1-9][0-9]*)\.([0-9]+)\.([0-9]+)(-(preview|rc)[1-9][0-9]*)?$ ]]; then + echo "::error::Invalid Ruby version: $RUBY_VERSION" + exit 1 + fi + majorMinor="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}" + if [ -n "${BASH_REMATCH[4]}" ]; then + key="$majorMinor-rc" + targets=( "$key" ) + else + key="$majorMinor" + targets=( "$key" ) + # a GA release replaces its pre-release ("update.sh" removes "X.Y-rc" once "X.Y" exists upstream) + if jq -e --arg rc "$majorMinor-rc" 'has($rc)' versions.json > /dev/null; then + targets+=( "$majorMinor-rc" ) + fi + fi + if ! jq -e --arg key "$key" 'has($key)' versions.json > /dev/null; then + echo "::error::'$key' is not in versions.json; new release series are added by hand" + exit 1 + fi + echo "key=$key" >> "$GITHUB_OUTPUT" + echo "targets=${targets[*]}" >> "$GITHUB_OUTPUT" + + - name: Wait for ${{ inputs.version }} in www.ruby-lang.org releases.yml + env: + RUBY_VERSION: ${{ inputs.version }} + KEY: ${{ steps.targets.outputs.key }} + run: | + # "versions.sh" reads https://github.com/ruby/www.ruby-lang.org/raw/master/_data/releases.yml, which can land a while after the release itself + for (( i = 0; i < 240; i++ )); do + # (transient network errors shouldn't end the wait early) + ./versions.sh "$KEY" || : + found="$(jq -r --arg key "$KEY" '.[$key].version // empty' versions.json || :)" + git checkout -- versions.json + if [ "$found" = "$RUBY_VERSION" ]; then + exit 0 + fi + sleep 30 + done + echo "::error::$RUBY_VERSION did not show up in releases.yml (latest for $KEY: ${found:-none})" + exit 1 + + - name: Update and commit + id: commit + env: + TARGETS: ${{ steps.targets.outputs.targets }} + run: | + git config user.name 'github-actions[bot]' + git config user.email '41898282+github-actions[bot]@users.noreply.github.com' + + base="$(git rev-parse HEAD)" + echo "base=$base" >> "$GITHUB_OUTPUT" + + # same commit messages as the Jenkins job ("Update 4.0 to 4.0.9", "Update 3.4 to 3.4.12, rustup 1.28.2", etc) + # https://github.com/docker-library/oi-janky-groovy/blob/master/update.sh/versions-pipeline.groovy + version_components() { + jq -r ' + .[env.version] // {} | [ + .version // empty, + ( + to_entries[] + | select(.value | type == "object" and has("version")) + | .key + " " + .value.version + ) + ] | join("\n") + ' versions.json + } + for version in $TARGETS; do + export version + componentsBefore="$(version_components)" + ./update.sh "$version" + componentsAfter="$(version_components)" + componentsChanged="$(comm -13 --nocheck-order <(echo "$componentsBefore") <(echo "$componentsAfter"))" + commitMessage="Update $version" + if [ -n "$componentsChanged" ]; then + components="$(jq <<<"$componentsChanged" -rRs 'rtrimstr("\n") | split("\n") | join(", ")')" + commitMessage+=" to $components" + fi + git add -A . + git commit -m "$commitMessage" || : + done + + commit="$(git rev-parse HEAD)" + if [ "$commit" = "$base" ]; then + echo 'Nothing to update (already up to date)' + exit 0 + fi + git log --stat -p "$base..HEAD" + git bundle create "$RUNNER_TEMP/update.bundle" "$base..HEAD" + echo "commit=$commit" >> "$GITHUB_OUTPUT" + + - uses: actions/upload-artifact@v4 + if: steps.commit.outputs.commit + with: + name: update-bundle + path: ${{ runner.temp }}/update.bundle + retention-days: 7 + + - uses: docker-library/bashbrew@HEAD + if: steps.commit.outputs.commit + - name: Generate Jobs + id: generate-jobs + if: steps.commit.outputs.commit + env: + TARGETS: ${{ steps.targets.outputs.targets }} + run: | + # only test the versions that changed (and still exist; "X.Y-rc" goes away on GA) + versions=() + for version in $TARGETS; do + if jq -e --arg v "$version" '.[$v].version' versions.json > /dev/null; then + versions+=( "$version" ) + fi + done + export GENERATE_STACKBREW_LIBRARY="./generate-stackbrew-library.sh ${versions[*]}" + strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")" + + EOF="EOF-$RANDOM-$RANDOM-$RANDOM" + echo "strategy<<$EOF" >> "$GITHUB_OUTPUT" + jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT" + echo "$EOF" >> "$GITHUB_OUTPUT" + + test: + needs: update + if: needs.update.outputs.commit + strategy: ${{ fromJson(needs.update.outputs.strategy) }} + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ needs.update.outputs.base }} + persist-credentials: false + - uses: actions/download-artifact@v4 + with: + name: update-bundle + path: ${{ runner.temp }} + - name: Check out ${{ needs.update.outputs.commit }} + env: + COMMIT: ${{ needs.update.outputs.commit }} + run: | + git fetch "$RUNNER_TEMP/update.bundle" HEAD + git checkout --detach "$COMMIT" + - name: Prepare Environment + run: ${{ matrix.runs.prepare }} + - name: Pull Dependencies + run: ${{ matrix.runs.pull }} + - name: Build ${{ matrix.name }} + run: ${{ matrix.runs.build }} + - name: History ${{ matrix.name }} + run: ${{ matrix.runs.history }} + - name: Test ${{ matrix.name }} + run: ${{ matrix.runs.test }} + - name: '"docker images"' + run: ${{ matrix.runs.images }} + + push: + needs: [ update, test ] + if: needs.update.outputs.commit && github.ref == 'refs/heads/master' + name: Push to master + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ needs.update.outputs.base }} + fetch-depth: 0 + - uses: actions/download-artifact@v4 + with: + name: update-bundle + path: ${{ runner.temp }} + - name: Push + env: + RUBY_VERSION: ${{ inputs.version }} + KEY: ${{ needs.update.outputs.key }} + TARGETS: ${{ needs.update.outputs.targets }} + BASE: ${{ needs.update.outputs.base }} + COMMIT: ${{ needs.update.outputs.commit }} + run: | + git config user.name 'github-actions[bot]' + git config user.email '41898282+github-actions[bot]@users.noreply.github.com' + git fetch "$RUNNER_TEMP/update.bundle" HEAD + + for (( attempt = 1; attempt <= 5; attempt++ )); do + git fetch origin master + master="$(git rev-parse FETCH_HEAD)" + + if [ "$master" = "$BASE" ]; then + push="$COMMIT" + else + # master moved while we were building (another version's run of this workflow, or the Jenkins job) + + # if it already has this release, there's nothing left to do + if [ "$(git show "$master:versions.json" | jq -r --arg key "$KEY" '.[$key].version // empty')" = "$RUBY_VERSION" ]; then + echo "master already has $RUBY_VERSION" + exit 0 + fi + + # otherwise, replay our commits on top of it, and make sure that what we're about to push is + # still exactly what we tested (for our versions) and exactly what "update.sh" would generate + git checkout --quiet --detach "$master" + git cherry-pick "$BASE..$COMMIT" + for target in $TARGETS; do + git diff --exit-code "$COMMIT" HEAD -- "$target/" + diff <(git show "$COMMIT:versions.json" | jq --arg key "$target" '.[$key]') <(jq --arg key "$target" '.[$key]' versions.json) + done + ./update.sh $TARGETS + git diff --exit-code + push="$(git rev-parse HEAD)" + fi + + # not a force push: if master moved again in the meantime, this fails and we start over + if git push origin "$push:refs/heads/master"; then + exit 0 + fi + sleep "$(( attempt * 10 ))" + done + echo "::error::Gave up pushing $RUBY_VERSION to master" + exit 1