From 182abcdaca2526dd4d20067553d20d56e644b69b Mon Sep 17 00:00:00 2001 From: iain Date: Fri, 23 Feb 2018 14:58:17 -0500 Subject: [PATCH] Replace BUNDLE_BIN with BUNDLE_BIN_DIR By specifying BUNDLE_BIN, bundler will generate binstubs for every gem, which results in it generating a binstub for itself. The binstub always points to the same Gemfile, so it is no longer possible to use the bundler on other Gemfiles. This rename is just to prevent this conflict from occurring. More info: [BUNDLE_BIN](https://bundler.io/v1.16/bundle_config.html#LIST-OF-AVAILABLE-KEYS), --- 2.2/alpine3.4/Dockerfile | 8 ++++---- 2.2/jessie/Dockerfile | 8 ++++---- 2.2/jessie/slim/Dockerfile | 8 ++++---- 2.3/alpine3.4/Dockerfile | 8 ++++---- 2.3/jessie/Dockerfile | 8 ++++---- 2.3/jessie/slim/Dockerfile | 8 ++++---- 2.3/stretch/Dockerfile | 8 ++++---- 2.3/stretch/slim/Dockerfile | 8 ++++---- 2.4/alpine3.4/Dockerfile | 8 ++++---- 2.4/alpine3.6/Dockerfile | 8 ++++---- 2.4/alpine3.7/Dockerfile | 8 ++++---- 2.4/jessie/Dockerfile | 8 ++++---- 2.4/jessie/slim/Dockerfile | 8 ++++---- 2.4/stretch/Dockerfile | 8 ++++---- 2.4/stretch/slim/Dockerfile | 8 ++++---- 2.5/alpine3.7/Dockerfile | 8 ++++---- 2.5/stretch/Dockerfile | 8 ++++---- 2.5/stretch/slim/Dockerfile | 8 ++++---- Dockerfile-alpine.template | 8 ++++---- Dockerfile-debian.template | 8 ++++---- Dockerfile-slim.template | 8 ++++---- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile index bfd5e87158..b7f4b5b62b 100644 --- a/2.2/alpine3.4/Dockerfile +++ b/2.2/alpine3.4/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile index 9c22d395c8..341dc3d496 100644 --- a/2.2/jessie/Dockerfile +++ b/2.2/jessie/Dockerfile @@ -66,11 +66,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile index 9de0e93f6d..d194079ef5 100644 --- a/2.2/jessie/slim/Dockerfile +++ b/2.2/jessie/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile index c7384d0535..1ef299dc74 100644 --- a/2.3/alpine3.4/Dockerfile +++ b/2.3/alpine3.4/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile index 92acbbb893..f5935681d0 100644 --- a/2.3/jessie/Dockerfile +++ b/2.3/jessie/Dockerfile @@ -66,11 +66,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile index 566a1e8a23..81cbf1153b 100644 --- a/2.3/jessie/slim/Dockerfile +++ b/2.3/jessie/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile index 112cff8658..544bb25548 100644 --- a/2.3/stretch/Dockerfile +++ b/2.3/stretch/Dockerfile @@ -68,11 +68,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile index 9ae32e1d5f..b6539c5052 100644 --- a/2.3/stretch/slim/Dockerfile +++ b/2.3/stretch/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile index e8acd9b821..711fcd95ac 100644 --- a/2.4/alpine3.4/Dockerfile +++ b/2.4/alpine3.4/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile index 0c79537362..44bbea6410 100644 --- a/2.4/alpine3.6/Dockerfile +++ b/2.4/alpine3.6/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile index fdc456a826..4eb5a7090d 100644 --- a/2.4/alpine3.7/Dockerfile +++ b/2.4/alpine3.7/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile index 04b703128c..af0b2d7001 100644 --- a/2.4/jessie/Dockerfile +++ b/2.4/jessie/Dockerfile @@ -66,11 +66,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile index ac376bf6d3..ea6d9f486c 100644 --- a/2.4/jessie/slim/Dockerfile +++ b/2.4/jessie/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index b3a527b837..367d9b57e6 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -66,11 +66,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 536e67a2d3..3cf38d833b 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile index c9cd615971..556d1452c7 100644 --- a/2.5/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f44b2814ad..10f8f57167 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -66,11 +66,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index b01b3e0234..3db95cc27d 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9f2342308f..d5c252546e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -101,11 +101,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index fe02a2953a..c6509c1b5b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -68,11 +68,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 80834f1a7a..a75debbcda 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -92,11 +92,11 @@ RUN set -ex \ # and 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_BIN_DIR="$GEM_HOME/bin" \ 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 $BUNDLE_BIN_DIR:$PATH +RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN_DIR" \ + && chmod 777 "$GEM_HOME" "$BUNDLE_BIN_DIR" CMD [ "irb" ]