diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 87185058f..20fdd4703 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20 +ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -20,17 +20,18 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ + xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 32821f8ee..a788f8041 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20 +ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,13 +42,14 @@ RUN set -ex \ tar \ yaml-dev \ zlib-dev \ + xz \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index df5870f62..6565a44ba 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.1 ENV RUBY_VERSION 2.1.10 -ENV RUBY_DOWNLOAD_SHA256 fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20 +ENV RUBY_DOWNLOAD_SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,17 +42,18 @@ RUN set -ex \ 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.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 4d6724608..39977ef16 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 de8e192791cb157d610c48a9a9ff6e7f19d67ce86052feae62b82e3682cc675f +ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -20,17 +20,18 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ + xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index 6c57a8f76..965b2b0ff 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 de8e192791cb157d610c48a9a9ff6e7f19d67ce86052feae62b82e3682cc675f +ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,13 +42,14 @@ RUN set -ex \ tar \ yaml-dev \ zlib-dev \ + xz \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index 953be6398..93925021d 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.2 ENV RUBY_VERSION 2.2.6 -ENV RUBY_DOWNLOAD_SHA256 de8e192791cb157d610c48a9a9ff6e7f19d67ce86052feae62b82e3682cc675f +ENV RUBY_DOWNLOAD_SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359fb08db2791d6c32bfd157339 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,17 +42,18 @@ RUN set -ex \ 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.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 0cd4499dd..8355b81c7 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a73058115b7 +ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -20,17 +20,18 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ + xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.3/alpine/Dockerfile b/2.3/alpine/Dockerfile index 057336be1..a8e6c0e40 100644 --- a/2.3/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a73058115b7 +ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,13 +42,14 @@ RUN set -ex \ tar \ yaml-dev \ zlib-dev \ + xz \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 6caedb747..512a61952 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.3 ENV RUBY_VERSION 2.3.3 -ENV RUBY_DOWNLOAD_SHA256 241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a73058115b7 +ENV RUBY_DOWNLOAD_SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,17 +42,18 @@ RUN set -ex \ 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.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 2fbf81571..0d8ac04e4 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 152fd0bd15a90b4a18213448f485d4b53e9f7662e1508190aa5b702446b29e3d +ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -20,17 +20,18 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ + xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 73ecaf2b1..d9c0ba278 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 152fd0bd15a90b4a18213448f485d4b53e9f7662e1508190aa5b702446b29e3d +ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,13 +42,14 @@ RUN set -ex \ tar \ yaml-dev \ zlib-dev \ + xz \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/2.4/slim/Dockerfile b/2.4/slim/Dockerfile index 8efedbbc6..bb74aa30e 100644 --- a/2.4/slim/Dockerfile +++ b/2.4/slim/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir -p /usr/local/etc \ ENV RUBY_MAJOR 2.4 ENV RUBY_VERSION 2.4.0 -ENV RUBY_DOWNLOAD_SHA256 152fd0bd15a90b4a18213448f485d4b53e9f7662e1508190aa5b702446b29e3d +ENV RUBY_DOWNLOAD_SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 ENV RUBYGEMS_VERSION 2.6.8 # some of ruby's build scripts are written in ruby @@ -42,17 +42,18 @@ RUN set -ex \ 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.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 5e659654f..8880bad53 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -42,13 +42,14 @@ RUN set -ex \ tar \ yaml-dev \ zlib-dev \ + xz \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 72515f246..d0b68f2a6 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -42,17 +42,18 @@ RUN set -ex \ 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.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/Dockerfile.template b/Dockerfile.template index a73e72ebc..6188aab0b 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -20,17 +20,18 @@ RUN set -ex \ bison \ libgdbm-dev \ ruby \ + xz-utils \ ' \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ && rm -rf /var/lib/apt/lists/* \ \ - && wget -O ruby.tar.gz "https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.gz" \ - && echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.gz" | 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 -c - \ \ && mkdir -p /usr/src/ruby \ - && tar -xzf ruby.tar.gz -C /usr/src/ruby --strip-components=1 \ - && rm ruby.tar.gz \ + && tar -xJf ruby.tar.xz -C /usr/src/ruby --strip-components=1 \ + && rm ruby.tar.xz \ \ && cd /usr/src/ruby \ \ diff --git a/update.sh b/update.sh index e6a8b7898..b5869ec4c 100755 --- a/update.sh +++ b/update.sh @@ -8,7 +8,7 @@ if [ ${#versions[@]} -eq 0 ]; then versions=( */ ) fi versions=( "${versions[@]%/}" ) -shaPage=$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/' | tr '\r\n' ' ') +releasePage=$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/' | tr '\r\n' ' ') latest_gem_version() { curl -sSL "https://rubygems.org/api/v1/gems/$1.json" | sed -r 's/^.*"version":"([^"]+)".*$/\1/' @@ -35,7 +35,7 @@ for version in "${versions[@]}"; do fullVersion= for tryVersion in "${allVersions[@]}"; do - if echo "$shaPage" | grep -q "Ruby ${tryVersion}<"; then + if echo "$releasePage" | grep -q "Ruby ${tryVersion}<"; then fullVersion="$tryVersion" break fi @@ -45,7 +45,8 @@ for version in "${versions[@]}"; do echo >&2 "warning: cannot determine sha for $version (tried all of ${allVersions[*]}); skipping" continue fi - shaVal="$(echo "$shaPage" | sed -r "s/.*Ruby ${fullVersion}<\/a>
\s*sha256: ([^<]+).*/\1/")" + versionReleasePage="$(curl -fsSL 'https://www.ruby-lang.org/en/downloads/releases/' | grep "Ruby $fullVersion" -A 2 | awk -F'"' '{print $2}' | xargs)" + shaVal="$(curl -fsSL "https://www.ruby-lang.org/$versionReleasePage" | grep "ruby-$fullVersion.tar.xz" -A 5 | grep SHA256 | awk '{print $2}')" sedStr=" s!%%VERSION%%!$version!g;