From d4d5786d3c891105d89aaa4f44d2917143519b1d Mon Sep 17 00:00:00 2001 From: Ian Ker-Seymer Date: Wed, 29 Jan 2025 23:49:35 -0500 Subject: [PATCH] Use default RUBY_CC_VERSION from rcd (#509) --- docker/Dockerfile.aarch64-linux | 3 +-- docker/Dockerfile.aarch64-linux-musl | 3 +-- docker/Dockerfile.arm-linux | 3 +-- docker/Dockerfile.arm64-darwin | 3 +-- docker/Dockerfile.x64-mingw-ucrt | 3 +-- docker/Dockerfile.x64-mingw32 | 3 +-- docker/Dockerfile.x86-linux | 3 +-- docker/Dockerfile.x86-mingw32 | 3 +-- docker/Dockerfile.x86_64-darwin | 3 +-- docker/Dockerfile.x86_64-linux | 3 +-- docker/Dockerfile.x86_64-linux-musl | 3 +-- 11 files changed, 11 insertions(+), 22 deletions(-) diff --git a/docker/Dockerfile.aarch64-linux b/docker/Dockerfile.aarch64-linux index d04b2d53..71951e0d 100644 --- a/docker/Dockerfile.aarch64-linux +++ b/docker/Dockerfile.aarch64-linux @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-aarch64-linux -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="aarch64-linux" \ +ENV RUBY_TARGET="aarch64-linux" \ RUST_TARGET="aarch64-unknown-linux-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.aarch64-linux-musl b/docker/Dockerfile.aarch64-linux-musl index 90f240a3..4b452e06 100644 --- a/docker/Dockerfile.aarch64-linux-musl +++ b/docker/Dockerfile.aarch64-linux-musl @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-aarch64-linux-musl -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="aarch64-linux-musl" \ +ENV RUBY_TARGET="aarch64-linux-musl" \ RUST_TARGET="aarch64-unknown-linux-musl" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ RUSTUP_HOME="/usr/local/rustup" \ diff --git a/docker/Dockerfile.arm-linux b/docker/Dockerfile.arm-linux index 1633a572..75f64325 100644 --- a/docker/Dockerfile.arm-linux +++ b/docker/Dockerfile.arm-linux @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-arm-linux -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="arm-linux" \ +ENV RUBY_TARGET="arm-linux" \ RUST_TARGET="arm-unknown-linux-gnueabihf" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.arm64-darwin b/docker/Dockerfile.arm64-darwin index e96c33a5..d4bbdb33 100644 --- a/docker/Dockerfile.arm64-darwin +++ b/docker/Dockerfile.arm64-darwin @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-arm64-darwin -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="arm64-darwin" \ +ENV RUBY_TARGET="arm64-darwin" \ RUST_TARGET="aarch64-apple-darwin" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x64-mingw-ucrt b/docker/Dockerfile.x64-mingw-ucrt index cdc4cf98..b4db3c96 100644 --- a/docker/Dockerfile.x64-mingw-ucrt +++ b/docker/Dockerfile.x64-mingw-ucrt @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x64-mingw-ucrt -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x64-mingw-ucrt" \ +ENV RUBY_TARGET="x64-mingw-ucrt" \ RUST_TARGET="x86_64-pc-windows-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x64-mingw32 b/docker/Dockerfile.x64-mingw32 index b9f2e465..9ed9980f 100644 --- a/docker/Dockerfile.x64-mingw32 +++ b/docker/Dockerfile.x64-mingw32 @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x64-mingw32 -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x64-mingw32" \ +ENV RUBY_TARGET="x64-mingw32" \ RUST_TARGET="x86_64-pc-windows-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x86-linux b/docker/Dockerfile.x86-linux index 466244b5..03bfdc32 100644 --- a/docker/Dockerfile.x86-linux +++ b/docker/Dockerfile.x86-linux @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86-linux -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x86-linux" \ +ENV RUBY_TARGET="x86-linux" \ RUST_TARGET="i686-unknown-linux-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x86-mingw32 b/docker/Dockerfile.x86-mingw32 index 562e7504..40185f7f 100644 --- a/docker/Dockerfile.x86-mingw32 +++ b/docker/Dockerfile.x86-mingw32 @@ -5,8 +5,7 @@ ARG LLVM_MINGW_VERSION=20231128 \ LLVM_MINGW_SHA256=2d532648bfd202bfe5edfa8b7f6c55970f65639779f34115a9a8bfa6f7d87f0b \ LLVM_MINGW_LIBCLANG_VERSION=14.0.0 -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x86-mingw32" \ +ENV RUBY_TARGET="x86-mingw32" \ RUST_TARGET="i686-pc-windows-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x86_64-darwin b/docker/Dockerfile.x86_64-darwin index 0c967f10..95ba944c 100644 --- a/docker/Dockerfile.x86_64-darwin +++ b/docker/Dockerfile.x86_64-darwin @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-darwin -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x86_64-darwin" \ +ENV RUBY_TARGET="x86_64-darwin" \ RUST_TARGET="x86_64-apple-darwin" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x86_64-linux b/docker/Dockerfile.x86_64-linux index ca75038a..1037bf4d 100644 --- a/docker/Dockerfile.x86_64-linux +++ b/docker/Dockerfile.x86_64-linux @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-linux -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x86_64-linux" \ +ENV RUBY_TARGET="x86_64-linux" \ RUST_TARGET="x86_64-unknown-linux-gnu" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ PKG_CONFIG_ALLOW_CROSS="1" \ diff --git a/docker/Dockerfile.x86_64-linux-musl b/docker/Dockerfile.x86_64-linux-musl index d16066e5..c0616f3a 100644 --- a/docker/Dockerfile.x86_64-linux-musl +++ b/docker/Dockerfile.x86_64-linux-musl @@ -1,8 +1,7 @@ # Ensure this version matches the rack-compiler-version in Gemfile FROM ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-linux-musl -ENV RUBY_CC_VERSION="3.4:3.3:3.2:3.1:3.0:2.7:2.6" \ - RUBY_TARGET="x86_64-linux-musl" \ +ENV RUBY_TARGET="x86_64-linux-musl" \ RUST_TARGET="x86_64-unknown-linux-musl" \ RUSTUP_DEFAULT_TOOLCHAIN="stable" \ RUSTUP_HOME="/usr/local/rustup" \