Skip to content

Commit 17007f7

Browse files
TonyCTHsuTonyCTHsu
authored
Merge pull request #4054 from DataDog/tonycthsu/fix-bundler-version-in-dockerfile-3.4
Pin bundler versions and fix encoding
2 parents 421a1cb + 6b70805 commit 17007f7

File tree

11 files changed

+37
-35
lines changed

11 files changed

+37
-35
lines changed

‎.circleci/images/primary/Dockerfile-2.5.9‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Install RubyGems and Bundler
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-2.6.10‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Install RubyGems
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-2.7.8‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

‎.circleci/images/primary/Dockerfile-3.0.7‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Upgrade RubyGems and Bundler
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-3.1.6‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Upgrade RubyGems and Bundler
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-3.2.4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Upgrade RubyGems and Bundler
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-3.3.2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -57,9 +57,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
5959

60-
# Upgrade RubyGems and Bundler
60+
# Install a pinned RubyGems and Bundler
6161
RUN gem update --system 3.3.26
62-
RUN gem install bundler -v '~> 2.3.26'
62+
RUN gem install bundler:2.3.26
6363
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6464

6565
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-3.4.0‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ RUN set -ex; \
2222
# Set timezone to UTC by default
2323
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
2424

25-
# Set language
26-
RUN locale-gen en_US.UTF-8
25+
# Ensure sane locale (Uncomment `en_US.UTF-8` from `/etc/locale.gen` before running `locale-gen`)
26+
RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
2727
ENV LANG en_US.UTF-8
2828
ENV LANGUAGE en_US:en
2929

@@ -56,7 +56,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
5656

5757
# Install RubyGems
5858
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
59-
59+
# Install a pinned RubyGems and Bundler
60+
RUN gem update --system 3.3.26
61+
RUN gem install bundler:2.3.26
6062
ENV BUNDLE_SILENCE_ROOT_WARNING 1
6163

6264
RUN mkdir /app

‎.circleci/images/primary/Dockerfile-jruby-9.2.21.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
9494
# Install RubyGems
9595
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
9696

97-
# Upgrade RubyGems and Bundler
97+
# Install a pinned RubyGems and Bundler
9898
RUN gem update --system 3.3.26
99-
RUN gem install bundler -v '~> 2.3.26'
99+
RUN gem install bundler:2.3.26
100100
ENV BUNDLE_SILENCE_ROOT_WARNING 1
101101

102102
# Ensure JRuby is available when running "bash --login"

‎.circleci/images/primary/Dockerfile-jruby-9.3.9.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ RUN DOCKERIZE_URL="https://github.com/powerman/dockerize/releases/download/v0.17
9494
# Install RubyGems
9595
RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
9696

97-
# Upgrade RubyGems and Bundler
97+
# Install a pinned RubyGems and Bundler
9898
RUN gem update --system 3.3.26
99-
RUN gem install bundler -v '~> 2.3.26'
99+
RUN gem install bundler:2.3.26
100100
ENV BUNDLE_SILENCE_ROOT_WARNING 1
101101

102102
# Ensure JRuby is available when running "bash --login"

0 commit comments

Comments
 (0)