Skip to content

Commit b3658bf

Browse files
jorihardmanjorihardman
committed
Merge remote-tracking branch 'upstream/master' into merge_upstream
2 parents b742c85 + e30082f commit b3658bf

31 files changed

+274
-243
lines changed

‎.travis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,28 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=2.7-rc VARIANT=buster
6-
- VERSION=2.7-rc VARIANT=buster/slim
7-
- VERSION=2.7-rc VARIANT=alpine3.10
5+
- VERSION=2.7 VARIANT=buster
6+
- VERSION=2.7 VARIANT=buster/slim
7+
- VERSION=2.7 VARIANT=alpine3.11
8+
- VERSION=2.7 VARIANT=alpine3.10
89
- VERSION=2.6 VARIANT=buster
910
- VERSION=2.6 VARIANT=buster/slim
1011
- VERSION=2.6 VARIANT=stretch
1112
- VERSION=2.6 VARIANT=stretch/slim
13+
- VERSION=2.6 VARIANT=alpine3.11
1214
- VERSION=2.6 VARIANT=alpine3.10
13-
- VERSION=2.6 VARIANT=alpine3.9
1415
- VERSION=2.5 VARIANT=buster
1516
- VERSION=2.5 VARIANT=buster/slim
1617
- VERSION=2.5 VARIANT=stretch
1718
- VERSION=2.5 VARIANT=stretch/slim
19+
- VERSION=2.5 VARIANT=alpine3.11
1820
- VERSION=2.5 VARIANT=alpine3.10
19-
- VERSION=2.5 VARIANT=alpine3.9
2021
- VERSION=2.4 VARIANT=buster
2122
- VERSION=2.4 VARIANT=buster/slim
2223
- VERSION=2.4 VARIANT=stretch
2324
- VERSION=2.4 VARIANT=stretch/slim
25+
- VERSION=2.4 VARIANT=alpine3.11
2426
- VERSION=2.4 VARIANT=alpine3.10
25-
- VERSION=2.4 VARIANT=alpine3.9
2627
- VERSION=2.3 VARIANT=stretch
2728
- VERSION=2.3 VARIANT=stretch/slim
2829

‎2.3/stretch/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,12 @@ RUN set -eux; \
8585
# Sanity check for jemalloc
8686
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
8787

88-
# install things globally, for great justice
89-
# and don't create ".bundle" in all our apps
88+
# don't create ".bundle" in all our apps
9089
ENV GEM_HOME /usr/local/bundle
91-
ENV BUNDLE_PATH="$GEM_HOME" \
92-
BUNDLE_SILENCE_ROOT_WARNING=1 \
90+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
9391
BUNDLE_APP_CONFIG="$GEM_HOME"
94-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
95-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
92+
ENV PATH $GEM_HOME/bin:$PATH
9693
# adjust permissions of a few directories for running "gem install" as an arbitrary user
9794
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
98-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
9995

10096
CMD [ "irb" ]

‎2.3/stretch/slim/Dockerfile

+3-7
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,12 @@ RUN set -eux; \
110110
# Sanity check for jemalloc
111111
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
112112

113-
# install things globally, for great justice
114-
# and don't create ".bundle" in all our apps
113+
# don't create ".bundle" in all our apps
115114
ENV GEM_HOME /usr/local/bundle
116-
ENV BUNDLE_PATH="$GEM_HOME" \
117-
BUNDLE_SILENCE_ROOT_WARNING=1 \
115+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
118116
BUNDLE_APP_CONFIG="$GEM_HOME"
119-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
120-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
117+
ENV PATH $GEM_HOME/bin:$PATH
121118
# adjust permissions of a few directories for running "gem install" as an arbitrary user
122119
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
123-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
124120

125121
CMD [ "irb" ]

‎2.4/alpine3.10/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ RUN set -eux; \
1212
} >> /usr/local/etc/gemrc
1313

1414
ENV RUBY_MAJOR 2.4
15-
ENV RUBY_VERSION 2.4.6
16-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
15+
ENV RUBY_VERSION 2.4.9
16+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
1717
ENV RUBYGEMS_VERSION 3.0.3
1818

1919
# some of ruby's build scripts are written in ruby
@@ -126,16 +126,12 @@ RUN set -eux; \
126126
# Sanity check for jemalloc
127127
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
128128

129-
# install things globally, for great justice
130-
# and don't create ".bundle" in all our apps
129+
# don't create ".bundle" in all our apps
131130
ENV GEM_HOME /usr/local/bundle
132-
ENV BUNDLE_PATH="$GEM_HOME" \
133-
BUNDLE_SILENCE_ROOT_WARNING=1 \
131+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
134132
BUNDLE_APP_CONFIG="$GEM_HOME"
135-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
136-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
133+
ENV PATH $GEM_HOME/bin:$PATH
137134
# adjust permissions of a few directories for running "gem install" as an arbitrary user
138135
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
139-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
140136

141137
CMD [ "irb" ]

‎2.4/alpine3.9/Dockerfile ‎2.4/alpine3.11/Dockerfile

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.9
1+
FROM alpine:3.11
22

33
RUN apk add --no-cache \
44
gmp-dev
@@ -12,8 +12,8 @@ RUN set -eux; \
1212
} >> /usr/local/etc/gemrc
1313

1414
ENV RUBY_MAJOR 2.4
15-
ENV RUBY_VERSION 2.4.6
16-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
15+
ENV RUBY_VERSION 2.4.9
16+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
1717
ENV RUBYGEMS_VERSION 3.0.3
1818

1919
# some of ruby's build scripts are written in ruby
@@ -126,16 +126,12 @@ RUN set -eux; \
126126
# Sanity check for jemalloc
127127
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
128128

129-
# install things globally, for great justice
130-
# and don't create ".bundle" in all our apps
129+
# don't create ".bundle" in all our apps
131130
ENV GEM_HOME /usr/local/bundle
132-
ENV BUNDLE_PATH="$GEM_HOME" \
133-
BUNDLE_SILENCE_ROOT_WARNING=1 \
131+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
134132
BUNDLE_APP_CONFIG="$GEM_HOME"
135-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
136-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
133+
ENV PATH $GEM_HOME/bin:$PATH
137134
# adjust permissions of a few directories for running "gem install" as an arbitrary user
138135
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
139-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
140136

141137
CMD [ "irb" ]

‎2.4/buster/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RUN set -eux; \
99
} >> /usr/local/etc/gemrc
1010

1111
ENV RUBY_MAJOR 2.4
12-
ENV RUBY_VERSION 2.4.6
13-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
12+
ENV RUBY_VERSION 2.4.9
13+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
1414
ENV RUBYGEMS_VERSION 3.0.3
1515

1616
# some of ruby's build scripts are written in ruby
@@ -85,16 +85,12 @@ RUN set -eux; \
8585
# Sanity check for jemalloc
8686
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
8787

88-
# install things globally, for great justice
89-
# and don't create ".bundle" in all our apps
88+
# don't create ".bundle" in all our apps
9089
ENV GEM_HOME /usr/local/bundle
91-
ENV BUNDLE_PATH="$GEM_HOME" \
92-
BUNDLE_SILENCE_ROOT_WARNING=1 \
90+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
9391
BUNDLE_APP_CONFIG="$GEM_HOME"
94-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
95-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
92+
ENV PATH $GEM_HOME/bin:$PATH
9693
# adjust permissions of a few directories for running "gem install" as an arbitrary user
9794
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
98-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
9995

10096
CMD [ "irb" ]

‎2.4/buster/slim/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ RUN set -eux; \
2424
} >> /usr/local/etc/gemrc
2525

2626
ENV RUBY_MAJOR 2.4
27-
ENV RUBY_VERSION 2.4.6
28-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
27+
ENV RUBY_VERSION 2.4.9
28+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
2929
ENV RUBYGEMS_VERSION 3.0.3
3030

3131
# some of ruby's build scripts are written in ruby
@@ -111,16 +111,12 @@ RUN set -eux; \
111111
# Sanity check for jemalloc
112112
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
113113

114-
# install things globally, for great justice
115-
# and don't create ".bundle" in all our apps
114+
# don't create ".bundle" in all our apps
116115
ENV GEM_HOME /usr/local/bundle
117-
ENV BUNDLE_PATH="$GEM_HOME" \
118-
BUNDLE_SILENCE_ROOT_WARNING=1 \
116+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
119117
BUNDLE_APP_CONFIG="$GEM_HOME"
120-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
121-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
118+
ENV PATH $GEM_HOME/bin:$PATH
122119
# adjust permissions of a few directories for running "gem install" as an arbitrary user
123120
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
124-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
125121

126122
CMD [ "irb" ]

‎2.4/stretch/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RUN set -eux; \
99
} >> /usr/local/etc/gemrc
1010

1111
ENV RUBY_MAJOR 2.4
12-
ENV RUBY_VERSION 2.4.6
13-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
12+
ENV RUBY_VERSION 2.4.9
13+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
1414
ENV RUBYGEMS_VERSION 3.0.3
1515

1616
# some of ruby's build scripts are written in ruby
@@ -85,16 +85,12 @@ RUN set -eux; \
8585
# Sanity check for jemalloc
8686
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
8787

88-
# install things globally, for great justice
89-
# and don't create ".bundle" in all our apps
88+
# don't create ".bundle" in all our apps
9089
ENV GEM_HOME /usr/local/bundle
91-
ENV BUNDLE_PATH="$GEM_HOME" \
92-
BUNDLE_SILENCE_ROOT_WARNING=1 \
90+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
9391
BUNDLE_APP_CONFIG="$GEM_HOME"
94-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
95-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
92+
ENV PATH $GEM_HOME/bin:$PATH
9693
# adjust permissions of a few directories for running "gem install" as an arbitrary user
9794
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
98-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
9995

10096
CMD [ "irb" ]

‎2.4/stretch/slim/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ RUN set -eux; \
2424
} >> /usr/local/etc/gemrc
2525

2626
ENV RUBY_MAJOR 2.4
27-
ENV RUBY_VERSION 2.4.6
28-
ENV RUBY_DOWNLOAD_SHA256 25da31b9815bfa9bba9f9b793c055a40a35c43c6adfb1fdbd81a09099f9b529c
27+
ENV RUBY_VERSION 2.4.9
28+
ENV RUBY_DOWNLOAD_SHA256 0c4e000253ef7187feeb940a01a1c7594f28d63aa16f978e892a0e2864f58614
2929
ENV RUBYGEMS_VERSION 3.0.3
3030

3131
# some of ruby's build scripts are written in ruby
@@ -110,16 +110,12 @@ RUN set -eux; \
110110
# Sanity check for jemalloc
111111
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
112112

113-
# install things globally, for great justice
114-
# and don't create ".bundle" in all our apps
113+
# don't create ".bundle" in all our apps
115114
ENV GEM_HOME /usr/local/bundle
116-
ENV BUNDLE_PATH="$GEM_HOME" \
117-
BUNDLE_SILENCE_ROOT_WARNING=1 \
115+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
118116
BUNDLE_APP_CONFIG="$GEM_HOME"
119-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
120-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
117+
ENV PATH $GEM_HOME/bin:$PATH
121118
# adjust permissions of a few directories for running "gem install" as an arbitrary user
122119
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
123-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
124120

125121
CMD [ "irb" ]

‎2.5/alpine3.10/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ RUN set -eux; \
1212
} >> /usr/local/etc/gemrc
1313

1414
ENV RUBY_MAJOR 2.5
15-
ENV RUBY_VERSION 2.5.5
16-
ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d
15+
ENV RUBY_VERSION 2.5.7
16+
ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95
1717
ENV RUBYGEMS_VERSION 3.0.3
1818

1919
# some of ruby's build scripts are written in ruby
@@ -126,16 +126,12 @@ RUN set -eux; \
126126
# Sanity check for jemalloc
127127
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
128128

129-
# install things globally, for great justice
130-
# and don't create ".bundle" in all our apps
129+
# don't create ".bundle" in all our apps
131130
ENV GEM_HOME /usr/local/bundle
132-
ENV BUNDLE_PATH="$GEM_HOME" \
133-
BUNDLE_SILENCE_ROOT_WARNING=1 \
131+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
134132
BUNDLE_APP_CONFIG="$GEM_HOME"
135-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
136-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
133+
ENV PATH $GEM_HOME/bin:$PATH
137134
# adjust permissions of a few directories for running "gem install" as an arbitrary user
138135
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
139-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
140136

141137
CMD [ "irb" ]

‎2.5/alpine3.9/Dockerfile ‎2.5/alpine3.11/Dockerfile

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.9
1+
FROM alpine:3.11
22

33
RUN apk add --no-cache \
44
gmp-dev
@@ -12,8 +12,8 @@ RUN set -eux; \
1212
} >> /usr/local/etc/gemrc
1313

1414
ENV RUBY_MAJOR 2.5
15-
ENV RUBY_VERSION 2.5.5
16-
ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d
15+
ENV RUBY_VERSION 2.5.7
16+
ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95
1717
ENV RUBYGEMS_VERSION 3.0.3
1818

1919
# some of ruby's build scripts are written in ruby
@@ -126,16 +126,12 @@ RUN set -eux; \
126126
# Sanity check for jemalloc
127127
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
128128

129-
# install things globally, for great justice
130-
# and don't create ".bundle" in all our apps
129+
# don't create ".bundle" in all our apps
131130
ENV GEM_HOME /usr/local/bundle
132-
ENV BUNDLE_PATH="$GEM_HOME" \
133-
BUNDLE_SILENCE_ROOT_WARNING=1 \
131+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
134132
BUNDLE_APP_CONFIG="$GEM_HOME"
135-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
136-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
133+
ENV PATH $GEM_HOME/bin:$PATH
137134
# adjust permissions of a few directories for running "gem install" as an arbitrary user
138135
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
139-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
140136

141137
CMD [ "irb" ]

‎2.5/buster/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ RUN set -eux; \
99
} >> /usr/local/etc/gemrc
1010

1111
ENV RUBY_MAJOR 2.5
12-
ENV RUBY_VERSION 2.5.5
13-
ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d
12+
ENV RUBY_VERSION 2.5.7
13+
ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95
1414
ENV RUBYGEMS_VERSION 3.0.3
1515

1616
# some of ruby's build scripts are written in ruby
@@ -85,16 +85,12 @@ RUN set -eux; \
8585
# Sanity check for jemalloc
8686
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
8787

88-
# install things globally, for great justice
89-
# and don't create ".bundle" in all our apps
88+
# don't create ".bundle" in all our apps
9089
ENV GEM_HOME /usr/local/bundle
91-
ENV BUNDLE_PATH="$GEM_HOME" \
92-
BUNDLE_SILENCE_ROOT_WARNING=1 \
90+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
9391
BUNDLE_APP_CONFIG="$GEM_HOME"
94-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
95-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
92+
ENV PATH $GEM_HOME/bin:$PATH
9693
# adjust permissions of a few directories for running "gem install" as an arbitrary user
9794
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
98-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
9995

10096
CMD [ "irb" ]

‎2.5/buster/slim/Dockerfile

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ RUN set -eux; \
2424
} >> /usr/local/etc/gemrc
2525

2626
ENV RUBY_MAJOR 2.5
27-
ENV RUBY_VERSION 2.5.5
28-
ENV RUBY_DOWNLOAD_SHA256 9bf6370aaa82c284f193264cc7ca56f202171c32367deceb3599a4f354175d7d
27+
ENV RUBY_VERSION 2.5.7
28+
ENV RUBY_DOWNLOAD_SHA256 201870e8f58957d542233fef588b1d76f7bf962fea44dcbd2237f4a5899a3f95
2929
ENV RUBYGEMS_VERSION 3.0.3
3030

3131
# some of ruby's build scripts are written in ruby
@@ -111,16 +111,12 @@ RUN set -eux; \
111111
# Sanity check for jemalloc
112112
RUN ruby -r rbconfig -e "abort 'jemalloc not enabled' unless RbConfig::CONFIG['LIBS'].include?('jemalloc') || RbConfig::CONFIG['MAINLIBS'].include?('jemalloc')"
113113

114-
# install things globally, for great justice
115-
# and don't create ".bundle" in all our apps
114+
# don't create ".bundle" in all our apps
116115
ENV GEM_HOME /usr/local/bundle
117-
ENV BUNDLE_PATH="$GEM_HOME" \
118-
BUNDLE_SILENCE_ROOT_WARNING=1 \
116+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
119117
BUNDLE_APP_CONFIG="$GEM_HOME"
120-
# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
121-
ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH
118+
ENV PATH $GEM_HOME/bin:$PATH
122119
# adjust permissions of a few directories for running "gem install" as an arbitrary user
123120
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
124-
# (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)
125121

126122
CMD [ "irb" ]

0 commit comments

Comments
 (0)