From 4e90a92eb25fd7527f8eb5b6cede5f217f93ab57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 12 Jul 2019 11:16:20 +0200 Subject: [PATCH] Revert "Prefer `BUNDLE_PATH__SYSTEM=true`" This reverts commit e040029c82501556371e9d84a9db607dfb1bba51. --- 2.4/alpine3.10/Dockerfile | 2 +- 2.4/alpine3.9/Dockerfile | 2 +- 2.4/buster/Dockerfile | 2 +- 2.4/buster/slim/Dockerfile | 2 +- 2.4/stretch/Dockerfile | 2 +- 2.4/stretch/slim/Dockerfile | 2 +- 2.5/alpine3.10/Dockerfile | 2 +- 2.5/alpine3.9/Dockerfile | 2 +- 2.5/stretch/Dockerfile | 2 +- 2.5/stretch/slim/Dockerfile | 2 +- 2.6/alpine3.10/Dockerfile | 2 +- 2.6/alpine3.9/Dockerfile | 2 +- 2.6/stretch/Dockerfile | 2 +- 2.6/stretch/slim/Dockerfile | 2 +- 2.7-rc/alpine3.10/Dockerfile | 2 +- 2.7-rc/buster/Dockerfile | 2 +- 2.7-rc/buster/slim/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/2.4/alpine3.10/Dockerfile b/2.4/alpine3.10/Dockerfile index 753b053fa..cd0d8e41f 100644 --- a/2.4/alpine3.10/Dockerfile +++ b/2.4/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.4/alpine3.9/Dockerfile b/2.4/alpine3.9/Dockerfile index 40c2fdbf8..74b6dfed5 100644 --- a/2.4/alpine3.9/Dockerfile +++ b/2.4/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.4/buster/Dockerfile b/2.4/buster/Dockerfile index 6c45422b4..bfa2c957b 100644 --- a/2.4/buster/Dockerfile +++ b/2.4/buster/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.4/buster/slim/Dockerfile b/2.4/buster/slim/Dockerfile index 7081feac9..57075aca5 100644 --- a/2.4/buster/slim/Dockerfile +++ b/2.4/buster/slim/Dockerfile @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.4/stretch/Dockerfile b/2.4/stretch/Dockerfile index d0ee63f35..e2a875af5 100644 --- a/2.4/stretch/Dockerfile +++ b/2.4/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.4/stretch/slim/Dockerfile b/2.4/stretch/slim/Dockerfile index 3870f5587..8c2881acb 100644 --- a/2.4/stretch/slim/Dockerfile +++ b/2.4/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.10/Dockerfile index 7c1958cd7..af24b2328 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.10/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.5/alpine3.9/Dockerfile b/2.5/alpine3.9/Dockerfile index 52d621602..017f7349a 100644 --- a/2.5/alpine3.9/Dockerfile +++ b/2.5/alpine3.9/Dockerfile @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.5/stretch/Dockerfile b/2.5/stretch/Dockerfile index 1a7091ed8..cc2b49c30 100644 --- a/2.5/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.5/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile index f965d1cb0..d16ab2171 100644 --- a/2.5/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -108,7 +108,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.10/Dockerfile index 516b96f99..2d73ec872 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.6/alpine3.9/Dockerfile b/2.6/alpine3.9/Dockerfile index ad0a98ddb..6d506ef53 100644 --- a/2.6/alpine3.9/Dockerfile +++ b/2.6/alpine3.9/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.6/stretch/Dockerfile b/2.6/stretch/Dockerfile index 5bb3d678e..1d58f9f4d 100644 --- a/2.6/stretch/Dockerfile +++ b/2.6/stretch/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.6/stretch/slim/Dockerfile b/2.6/stretch/slim/Dockerfile index 870b4c16b..dbd3ca76a 100644 --- a/2.6/stretch/slim/Dockerfile +++ b/2.6/stretch/slim/Dockerfile @@ -104,7 +104,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.7-rc/alpine3.10/Dockerfile b/2.7-rc/alpine3.10/Dockerfile index 1759627e6..88a95e147 100644 --- a/2.7-rc/alpine3.10/Dockerfile +++ b/2.7-rc/alpine3.10/Dockerfile @@ -120,7 +120,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.7-rc/buster/Dockerfile b/2.7-rc/buster/Dockerfile index 758d272cd..d9d01c846 100644 --- a/2.7-rc/buster/Dockerfile +++ b/2.7-rc/buster/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/2.7-rc/buster/slim/Dockerfile b/2.7-rc/buster/slim/Dockerfile index 285ce88ae..faf5ca5e0 100644 --- a/2.7-rc/buster/slim/Dockerfile +++ b/2.7-rc/buster/slim/Dockerfile @@ -105,7 +105,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ab6b53dc7..dd9f0d86d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -124,7 +124,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4f1d55e7f..8f2c9fcac 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -83,7 +83,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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 diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 78bdd4296..1bb46314b 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -109,7 +109,7 @@ RUN set -eux; \ # install things globally, for great justice # and don't create ".bundle" in all our apps ENV GEM_HOME /usr/local/bundle -ENV BUNDLE_PATH__SYSTEM=true \ +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