From 1ca0392b9eaac909fe8b4b15eddf44747b252df4 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Mon, 5 Feb 2024 15:24:34 +0900 Subject: [PATCH] yum: use the last supported version on each distribution There are some distribution which can't support the latest version of bundler because the version of ruby is 2.6. Signed-off-by: Kentaro Hayashi --- fluent-package/yum/amazonlinux-2/Dockerfile | 4 ++-- fluent-package/yum/centos-7/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fluent-package/yum/amazonlinux-2/Dockerfile b/fluent-package/yum/amazonlinux-2/Dockerfile index 0998ef848..a99114d1a 100644 --- a/fluent-package/yum/amazonlinux-2/Dockerfile +++ b/fluent-package/yum/amazonlinux-2/Dockerfile @@ -50,7 +50,7 @@ RUN \ amazon-linux-extras install ruby2.6 && \ # raise IPv4 priority echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \ - # enable multiplatform feature - gem install --no-document bundler builder && \ + # enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6) + gem install --no-document bundler:2.4.22 builder && \ yum clean ${quiet} all && \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y diff --git a/fluent-package/yum/centos-7/Dockerfile b/fluent-package/yum/centos-7/Dockerfile index 16eef1436..01f7e4fd7 100644 --- a/fluent-package/yum/centos-7/Dockerfile +++ b/fluent-package/yum/centos-7/Dockerfile @@ -52,8 +52,8 @@ RUN \ cmake3 && \ # raise IPv4 priority echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \ - # enable multiplatform feature - source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler builder && \ + # enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6) + source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler:2.4.22 builder && \ scl enable devtoolset-11 bash && \ yum clean ${quiet} all && \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y