Pin version across rubies

DataDog · Oct 31, 2024 · 6b70805 · 6b70805
1 parent b4f293f
commit 6b70805
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 36 deletions.
diff --git a/.circleci/images/primary/Dockerfile-2.5.9 b/.circleci/images/primary/Dockerfile-2.5.9
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Install RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-2.6.10 b/.circleci/images/primary/Dockerfile-2.6.10
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Install RubyGems
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-2.7.8 b/.circleci/images/primary/Dockerfile-2.7.8
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 

diff --git a/.circleci/images/primary/Dockerfile-3.0.7 b/.circleci/images/primary/Dockerfile-3.0.7
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.1.6 b/.circleci/images/primary/Dockerfile-3.1.6
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.2.4 b/.circleci/images/primary/Dockerfile-3.2.4
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.3.2 b/.circleci/images/primary/Dockerfile-3.3.2
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-3.4.0 b/.circleci/images/primary/Dockerfile-3.4.0
@@ -22,8 +22,8 @@ RUN set -ex; \
 # Set timezone to UTC by default
 RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
 
-# Set language
-RUN locale-gen en_US.UTF-8
+# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
@@ -56,9 +56,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 RUN mkdir /app

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.2.21.0 b/.circleci/images/primary/Dockerfile-jruby-9.2.21.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.3.9.0 b/.circleci/images/primary/Dockerfile-jruby-9.3.9.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"

diff --git a/.circleci/images/primary/Dockerfile-jruby-9.4.7.0 b/.circleci/images/primary/Dockerfile-jruby-9.4.7.0
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
 # Install RubyGems
 RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
 
-# Upgrade RubyGems and Bundler
+# Install a pinned RubyGems and Bundler
 RUN gem update --system 3.3.26
-RUN gem install bundler -v '~> 2.3.26'
+RUN gem install bundler:2.3.26
 ENV BUNDLE_SILENCE_ROOT_WARNING 1
 
 # Ensure JRuby is available when running "bash --login"