From b394e5695001d67edceb562cbe9f901908bed713 Mon Sep 17 00:00:00 2001 From: Alberto Grespan Date: Mon, 13 Jul 2020 16:03:36 -0400 Subject: [PATCH] Resync bundle config --- 9000/jdk11/Dockerfile | 13 +++++-------- 9000/jdk14/Dockerfile | 13 +++++-------- 9000/jdk15/Dockerfile | 13 +++++-------- 9000/jdk8/Dockerfile | 13 +++++-------- 9000/jre11/Dockerfile | 13 +++++-------- 9000/jre8/Dockerfile | 13 +++++-------- 6 files changed, 30 insertions(+), 48 deletions(-) diff --git a/9000/jdk11/Dockerfile b/9000/jdk11/Dockerfile index badc4c4..07f3639 100644 --- a/9000/jdk11/Dockerfile +++ b/9000/jdk11/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ] diff --git a/9000/jdk14/Dockerfile b/9000/jdk14/Dockerfile index f23dd8e..7fe7a89 100644 --- a/9000/jdk14/Dockerfile +++ b/9000/jdk14/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ] diff --git a/9000/jdk15/Dockerfile b/9000/jdk15/Dockerfile index 03292f6..45d76d3 100644 --- a/9000/jdk15/Dockerfile +++ b/9000/jdk15/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ] diff --git a/9000/jdk8/Dockerfile b/9000/jdk8/Dockerfile index dc4330e..0744749 100644 --- a/9000/jdk8/Dockerfile +++ b/9000/jdk8/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ] diff --git a/9000/jre11/Dockerfile b/9000/jre11/Dockerfile index 14ebb9c..67666cb 100644 --- a/9000/jre11/Dockerfile +++ b/9000/jre11/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ] diff --git a/9000/jre8/Dockerfile b/9000/jre8/Dockerfile index 6aa0631..45cab54 100644 --- a/9000/jre8/Dockerfile +++ b/9000/jre8/Dockerfile @@ -21,15 +21,12 @@ RUN mkdir -p /opt/jruby/etc \ RUN gem install bundler rake net-telnet xmlrpc -# install things globally, for great justice -# and don't create ".bundle" in all our apps +# don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH="$GEM_HOME" \ - BUNDLE_BIN="$GEM_HOME/bin" \ - BUNDLE_SILENCE_ROOT_WARNING=1 \ +ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -ENV PATH $BUNDLE_BIN:$PATH -RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ - && chmod 777 "$GEM_HOME" "$BUNDLE_BIN" +ENV PATH $GEM_HOME/bin:$PATH +# adjust permissions of a few directories for running "gem install" as an arbitrary user +RUN mkdir -p "$GEM_HOME" && chmod 777 "$GEM_HOME" CMD [ "irb" ]