Skip to content

Commit b394e56

Browse files
committed
Resync bundle config
1 parent 669ad8f commit b394e56

6 files changed

Lines changed: 30 additions & 48 deletions

File tree

9000/jdk11/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

9000/jdk14/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

9000/jdk15/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

9000/jdk8/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

9000/jre11/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

9000/jre8/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \
2121

2222
RUN gem install bundler rake net-telnet xmlrpc
2323

24-
# install things globally, for great justice
25-
# and don't create ".bundle" in all our apps
24+
# don't create ".bundle" in all our apps
2625
ENV GEM_HOME /usr/local/bundle
27-
ENV BUNDLE_PATH="$GEM_HOME" \
28-
BUNDLE_BIN="$GEM_HOME/bin" \
29-
BUNDLE_SILENCE_ROOT_WARNING=1 \
26+
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
3027
BUNDLE_APP_CONFIG="$GEM_HOME"
31-
ENV PATH $BUNDLE_BIN:$PATH
32-
RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
33-
&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
28+
ENV PATH $GEM_HOME/bin:$PATH
29+
# adjust permissions of a few directories for running "gem install" as an arbitrary user
30+
RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME"
3431

3532
CMD [ "irb" ]

0 commit comments

Comments
 (0)