Actually change default Ruby version to 3.1.2. (#411)

* Also add missing package for the psych gem native extension.
GoogleCloudPlatform · Apr 14, 2023 · 8a9b2e9 · 8a9b2e9
1 parent a133909
commit 8a9b2e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/build/x86_64_centos7/Dockerfile b/build/x86_64_centos7/Dockerfile
@@ -17,6 +17,9 @@ RUN yum -y install \
         which \
         zlib-devel \
         xz \
+ && yum -y install \
+        # Needed for the psych gem native extension.
+        libyaml-devel \
  # RVM GPG keys.
  && mkdir -p ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
  && gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \

diff --git a/build/x86_64_centos8/Dockerfile b/build/x86_64_centos8/Dockerfile
@@ -24,6 +24,9 @@ RUN yum -y install \
         which \
         zlib-devel \
         xz \
+ && yum --enablerepo=powertools -y install \
+        # Needed for the psych gem native extension.
+        libyaml-devel \
  # RVM GPG keys.
  && mkdir -p ~/.gnupg && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
  && gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB \

diff --git a/config/projects/google-fluentd.rb b/config/projects/google-fluentd.rb
@@ -14,7 +14,7 @@
 # creates required build directories
 dependency "preparation"
 
-override :ruby, :version => '3.1.3'
+override :ruby, :version => '3.1.2'
 override :zlib, :version => '1.2.8'
 override :rubygems, :version => '3.0.0'
 override :postgresql, :version => '9.6.24'