Skip to content

Commit

Permalink
apt yum: use the last supported version on each distribution
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kenhys committed Feb 5, 2024
1 parent c75754e commit 0c156f3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fluent-package/apt/ubuntu-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN \
apt clean && \
# raise IPv4 priority
sed -i'' -e 's,#precedence ::ffff:0:0/96 100,precedence ::ffff:0:0/96 100,' /etc/gai.conf && \
# enable multiplatform feature
gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \
# enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler:2.4.22 builder && \
rm -rf /var/lib/apt/lists/* && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
4 changes: 2 additions & 2 deletions fluent-package/yum/amazonlinux-2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions fluent-package/yum/centos-7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0c156f3

Please sign in to comment.