diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 24ce4ed20..d7a0721b7 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/alpine3.11/Dockerfile b/2.4/alpine3.11/Dockerfile index ec121f509..94068dc72 100644 --- a/2.4/alpine3.11/Dockerfile +++ b/2.4/alpine3.11/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index a515de0f5..47981d772 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 47ea51403..20ab5f247 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index f56da95d1..20937aff2 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 86de60974..9db409eb7 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -111,8 +111,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 6e6a73cac..bcd3fa1db 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index e7fd3bcf4..ea601eb4a 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/Dockerfile b/2.5/buster/Dockerfile index 4c3f7cc26..091480580 100644 --- a/2.5/buster/Dockerfile +++ b/2.5/buster/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/buster/slim/Dockerfile b/2.5/buster/slim/Dockerfile index 99fc79c01..7e59996f1 100644 --- a/2.5/buster/slim/Dockerfile +++ b/2.5/buster/slim/Dockerfile @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index f613b2fae..fa5e92cb2 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index 53f7bc046..7977096b0 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -111,8 +111,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 4bd3c78c0..24548e138 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 84c35b148..68e293a42 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/Dockerfile b/2.6/buster/Dockerfile index f134bd88b..559a30e31 100644 --- a/2.6/buster/Dockerfile +++ b/2.6/buster/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/buster/slim/Dockerfile b/2.6/buster/slim/Dockerfile index c836d9913..afc80b3e1 100644 --- a/2.6/buster/slim/Dockerfile +++ b/2.6/buster/slim/Dockerfile @@ -108,8 +108,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index f1454c0fb..c0aa20580 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 7c8ab08a7..845951c42 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -107,8 +107,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.10/Dockerfile index 7062c3e64..16818edb5 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.10/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index c5f06f649..6368046c9 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -123,8 +123,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/Dockerfile b/2.7/buster/Dockerfile index a97947efb..39d1f683f 100644 --- a/2.7/buster/Dockerfile +++ b/2.7/buster/Dockerfile @@ -82,8 +82,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/2.7/buster/slim/Dockerfile b/2.7/buster/slim/Dockerfile index 6eb2a2cc2..684ce5fb1 100644 --- a/2.7/buster/slim/Dockerfile +++ b/2.7/buster/slim/Dockerfile @@ -108,8 +108,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index dd9f0d86d..46a46b9a3 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -127,8 +127,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8f2c9fcac..2cab186d9 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -86,8 +86,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 1bb46314b..0e7b0bdfb 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -112,8 +112,7 @@ ENV GEM_HOME /usr/local/bundle ENV BUNDLE_PATH="$GEM_HOME" \ BUNDLE_SILENCE_ROOT_WARNING=1 \ BUNDLE_APP_CONFIG="$GEM_HOME" -# path recommendation: https://github.com/bundler/bundler/pull/6469#issuecomment-383235438 -ENV PATH $GEM_HOME/bin:$BUNDLE_PATH/gems/bin:$PATH +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" # (BUNDLE_PATH = GEM_HOME, no need to mkdir/chown both)