Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump base gem versions #122

Closed
wants to merge 6 commits into from
Closed

bump base gem versions #122

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe49339
adding rails5deps
Sep 26, 2018
e33491a
bumping gem versions for bundler and rubygems
Jan 10, 2019
6e3dd6d
fixing flag syntax use
Jan 10, 2019
dd9c689
updating rubygems and installing 2.x bundler
May 24, 2019
5f287bd
updating per comments ... mostly
May 24, 2019
63ecec8
additional fix
May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions py3_ruby/Dockerfile
View file
Open in desktop
Expand Up @@ -18,12 +18,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
# Ruby installation
##################################################

# update the rubygems system version to latest
# RUN gem update --system 3.0.2

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler -v 1.17
gem update --system && \
gem install bundler --no-document -v 1.17.3 && \
gem install bundler --no-document
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably be explicit about this version as well. This is the version 2.x of bundler, right?


##################################################
# Python installation
Expand Down
2 changes: 1 addition & 1 deletion ruby/2.1/Dockerfile
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler -v 1.17 --no-document
gem install bundler --no-document -v 1.17.3

# LABEL must be last for proper base image discoverability
LABEL repository.socrata/ruby:2.1=""
2 changes: 1 addition & 1 deletion ruby/2.2/Dockerfile
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler -v 1.17 --no-document
gem install bundler --no-document -v 1.17.3

# LABEL must be last for proper base image discoverability
LABEL repository.socrata/ruby:2.2=""
5 changes: 3 additions & 2 deletions ruby/2.3.5/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.5
ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend explicitly specifying the version of the newer bundler in these installs.

&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
5 changes: 3 additions & 2 deletions ruby/2.3.6/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.6
ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This should probably be indented the same as the neighboring lines.

&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
6 changes: 3 additions & 3 deletions ruby/2.3/Dockerfile
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove software-properties-common && \
rm -rf /var/lib/apt/lists/*

# RUN gem update --system 3.0.2

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler -v 1.17 --no-document
gem update --system && \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: We're use two different styles in these different Dockerfiles:

# This one
gem update --system && \
gem install bundler && \

# And this one
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler

It's not a huge deal, but it would be nice to be consistent.

gem install bundler && \
gem install bundler --no-document -v 1.17.3

# LABEL must be last for proper base image discoverability
LABEL repository.socrata/ruby2.3=""
5 changes: 3 additions & 2 deletions ruby/2.5.0/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.5
ENV RUBY_VERSION 2.5.0
ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Indentation

&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
5 changes: 3 additions & 2 deletions ruby/2.5.3/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.5
ENV RUBY_VERSION 2.5.3
ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Indentation. Sorry 😬 This is true in several files in this PR.

&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
2 changes: 1 addition & 1 deletion runit-ruby/2.2/Dockerfile
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler -v 1.17 --no-document
gem install bundler --no-document -v 1.17.3

# LABEL must be last for proper base image discoverability
LABEL repository.socrata/runit-ruby2.2=""
5 changes: 3 additions & 2 deletions runit-ruby/2.3.5/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.5
ENV RUBY_DOWNLOAD_SHA256 7d3a7dabb190c2da06c963063342ca9a214bcd26f2158e904f0ec059b065ffda
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
5 changes: 3 additions & 2 deletions runit-ruby/2.3.6/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.3
ENV RUBY_VERSION 2.3.6
ENV RUBY_DOWNLOAD_SHA256 e0d969ac22d4a403c1204868bb9c0d068aa35045bb3934cf50b17b7f66059f56
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.16.1
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler
&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
6 changes: 3 additions & 3 deletions runit-ruby/2.3/Dockerfile
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove software-properties-common && \
rm -rf /var/lib/apt/lists/*

# RUN gem update --system 3.0.2

# skip installing gem documentation
RUN echo 'gem: --no-rdoc --no-ri --no-document' >> "/etc/gemrc" && \
gem install bundler --no-document -v 1.17
gem update --system && \
gem install bundler && \
gem install bundler --no-document -v 1.17.3

# LABEL must be last for proper base image discoverability
LABEL repository.socrata/runit-ruby2.3=""
5 changes: 3 additions & 2 deletions runit-ruby/2.5.0/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.5
ENV RUBY_VERSION 2.5.0
ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b
ENV RUBYGEMS_VERSION 2.7.4
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down
5 changes: 3 additions & 2 deletions runit-ruby/2.5.3/Dockerfile
View file
Open in desktop
Expand Up @@ -11,8 +11,8 @@ RUN mkdir -p /usr/local/etc \
ENV RUBY_MAJOR 2.5
ENV RUBY_VERSION 2.5.3
ENV RUBY_DOWNLOAD_SHA256 1cc9d0359a8ea35fc6111ec830d12e60168f3b9b305a3c2578357d360fcf306f
ENV RUBYGEMS_VERSION 2.7.6
ENV BUNDLER_VERSION 1.17
ENV RUBYGEMS_VERSION 3.0.3
ENV BUNDLER_VERSION 1.17.3

# some of ruby's build scripts are written in ruby
# we purge system ruby later to make sure our final image uses what we just built
Expand Down Expand Up @@ -97,6 +97,7 @@ RUN set -ex \
\
&& gem update --system "$RUBYGEMS_VERSION" \
&& gem install bundler --version "$BUNDLER_VERSION" --force \
&& gem install bundler \
&& rm -r /root/.gem/

# LABEL must be last for proper base image discoverability
Expand Down