From 2c2c36c051a3df2828f8a5dceea7e7e5bf9968d5 Mon Sep 17 00:00:00 2001
From: Good725 <firly.larly0430@gmail.com>
Date: Tue, 15 May 2018 14:12:56 -0700
Subject: [PATCH] Fix PATH to use the fully generic binstubs

bundler binstubs are not necessarily generic; they were until bundler 1.16 and should be fixed back, but will likely be non-generic again by default in 2.0

See https://github.com/bundler/bundler/pull/6469#issuecomment-383235438
---
 2.2/alpine3.4/Dockerfile       | 2 +-
 2.2/jessie/Dockerfile          | 2 +-
 2.2/jessie/slim/Dockerfile     | 2 +-
 2.3/alpine3.4/Dockerfile       | 2 +-
 2.3/jessie/Dockerfile          | 2 +-
 2.3/jessie/slim/Dockerfile     | 2 +-
 2.3/stretch/Dockerfile         | 2 +-
 2.3/stretch/slim/Dockerfile    | 2 +-
 2.4/alpine3.4/Dockerfile       | 2 +-
 2.4/alpine3.6/Dockerfile       | 2 +-
 2.4/alpine3.7/Dockerfile       | 2 +-
 2.4/jessie/Dockerfile          | 2 +-
 2.4/jessie/slim/Dockerfile     | 2 +-
 2.4/stretch/Dockerfile         | 2 +-
 2.4/stretch/slim/Dockerfile    | 2 +-
 2.5/alpine3.7/Dockerfile       | 2 +-
 2.5/stretch/Dockerfile         | 2 +-
 2.5/stretch/slim/Dockerfile    | 2 +-
 2.6-rc/alpine3.7/Dockerfile    | 2 +-
 2.6-rc/stretch/Dockerfile      | 2 +-
 2.6-rc/stretch/slim/Dockerfile | 2 +-
 Dockerfile-alpine.template     | 2 +-
 Dockerfile-debian.template     | 2 +-
 Dockerfile-slim.template       | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/2.2/alpine3.4/Dockerfile b/2.2/alpine3.4/Dockerfile
index 56d8bdb..55b73d1 100644
--- a/2.2/alpine3.4/Dockerfile
+++ b/2.2/alpine3.4/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.2/jessie/Dockerfile b/2.2/jessie/Dockerfile
index 2b60268..b6294dc 100644
--- a/2.2/jessie/Dockerfile
+++ b/2.2/jessie/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.2/jessie/slim/Dockerfile b/2.2/jessie/slim/Dockerfile
index ba5cc4a..ff1ac73 100644
--- a/2.2/jessie/slim/Dockerfile
+++ b/2.2/jessie/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.3/alpine3.4/Dockerfile b/2.3/alpine3.4/Dockerfile
index b1c6d49..581cf31 100644
--- a/2.3/alpine3.4/Dockerfile
+++ b/2.3/alpine3.4/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.3/jessie/Dockerfile b/2.3/jessie/Dockerfile
index 78da403..541fdfb 100644
--- a/2.3/jessie/Dockerfile
+++ b/2.3/jessie/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.3/jessie/slim/Dockerfile b/2.3/jessie/slim/Dockerfile
index be03b28..b222d78 100644
--- a/2.3/jessie/slim/Dockerfile
+++ b/2.3/jessie/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.3/stretch/Dockerfile b/2.3/stretch/Dockerfile
index 7735d30..27de37f 100644
--- a/2.3/stretch/Dockerfile
+++ b/2.3/stretch/Dockerfile
@@ -71,7 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.3/stretch/slim/Dockerfile b/2.3/stretch/slim/Dockerfile
index ce7a481..36374ab 100644
--- a/2.3/stretch/slim/Dockerfile
+++ b/2.3/stretch/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/alpine3.4/Dockerfile b/2.4/alpine3.4/Dockerfile
index c4303dc..b5fa704 100644
--- a/2.4/alpine3.4/Dockerfile
+++ b/2.4/alpine3.4/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/alpine3.6/Dockerfile b/2.4/alpine3.6/Dockerfile
index 72ce68c..6ba3544 100644
--- a/2.4/alpine3.6/Dockerfile
+++ b/2.4/alpine3.6/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/alpine3.7/Dockerfile b/2.4/alpine3.7/Dockerfile
index ebe856f..1e379ee 100644
--- a/2.4/alpine3.7/Dockerfile
+++ b/2.4/alpine3.7/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/jessie/Dockerfile b/2.4/jessie/Dockerfile
index 6595e05..177c4e9 100644
--- a/2.4/jessie/Dockerfile
+++ b/2.4/jessie/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/jessie/slim/Dockerfile b/2.4/jessie/slim/Dockerfile
index 25a5ea6..adc32b1 100644
--- a/2.4/jessie/slim/Dockerfile
+++ b/2.4/jessie/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile
index 7083c36..2ba93d1 100644
--- a/2.4/stretch/Dockerfile
+++ b/2.4/stretch/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile
index 4dc2f43..0392309 100644
--- a/2.4/stretch/slim/Dockerfile
+++ b/2.4/stretch/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.5/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile
index f6f0538..5c4f833 100644
--- a/2.5/alpine3.7/Dockerfile
+++ b/2.5/alpine3.7/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile
index 4ee1857..0f97089 100644
--- a/2.5/stretch/Dockerfile
+++ b/2.5/stretch/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile
index 814eb23..94ea354 100644
--- a/2.5/stretch/slim/Dockerfile
+++ b/2.5/stretch/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.6-rc/alpine3.7/Dockerfile b/2.6-rc/alpine3.7/Dockerfile
index dc65fd9..690c2d1 100644
--- a/2.6-rc/alpine3.7/Dockerfile
+++ b/2.6-rc/alpine3.7/Dockerfile
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.6-rc/stretch/Dockerfile b/2.6-rc/stretch/Dockerfile
index 97cb7c2..9f93e4e 100644
--- a/2.6-rc/stretch/Dockerfile
+++ b/2.6-rc/stretch/Dockerfile
@@ -69,7 +69,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/2.6-rc/stretch/slim/Dockerfile b/2.6-rc/stretch/slim/Dockerfile
index 590e5ea..7ab8794 100644
--- a/2.6-rc/stretch/slim/Dockerfile
+++ b/2.6-rc/stretch/slim/Dockerfile
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 9f23423..0acb26c 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -104,7 +104,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index fe02a29..8c75007 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -71,7 +71,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 80834f1..e2cbbc1 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -95,7 +95,7 @@ ENV BUNDLE_PATH="$GEM_HOME" \
 	BUNDLE_BIN="$GEM_HOME/bin" \
 	BUNDLE_SILENCE_ROOT_WARNING=1 \
 	BUNDLE_APP_CONFIG="$GEM_HOME"
-ENV PATH $BUNDLE_BIN:$PATH
+ENV PATH $BUNDLE_PATH/gems/bin:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
 	&& chmod 777 "$GEM_HOME" "$BUNDLE_BIN"