From a1a3705311dfb56534effa85130353f3a89b5d3c Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sat, 16 Jan 2016 04:35:36 +0100 Subject: [PATCH 1/2] Silence bundler's root warning by default --- 2.0/Dockerfile | 3 ++- 2.0/onbuild/Dockerfile | 2 ++ 2.0/slim/Dockerfile | 3 ++- 2.1/Dockerfile | 3 ++- 2.1/onbuild/Dockerfile | 2 ++ 2.1/slim/Dockerfile | 3 ++- 2.2/Dockerfile | 3 ++- 2.2/onbuild/Dockerfile | 2 ++ 2.2/slim/Dockerfile | 3 ++- 2.3/Dockerfile | 3 ++- 2.3/onbuild/Dockerfile | 2 ++ 2.3/slim/Dockerfile | 3 ++- 12 files changed, 24 insertions(+), 8 deletions(-) diff --git a/2.0/Dockerfile b/2.0/Dockerfile index 702c10dbb2..5cbeeb45f3 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -35,7 +35,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.0/onbuild/Dockerfile b/2.0/onbuild/Dockerfile index a3674dc3d2..af2cb0bf3e 100644 --- a/2.0/onbuild/Dockerfile +++ b/2.0/onbuild/Dockerfile @@ -3,6 +3,8 @@ FROM ruby:2.0 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 +RUN bundle config --global silence_root_warning true + RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.0/slim/Dockerfile b/2.0/slim/Dockerfile index 9f3190a9af..2a66bafdca 100644 --- a/2.0/slim/Dockerfile +++ b/2.0/slim/Dockerfile @@ -63,7 +63,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 55c97bb25a..896221633a 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -35,7 +35,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.1/onbuild/Dockerfile b/2.1/onbuild/Dockerfile index 9a9bdb7b6b..54a14538e8 100644 --- a/2.1/onbuild/Dockerfile +++ b/2.1/onbuild/Dockerfile @@ -3,6 +3,8 @@ FROM ruby:2.1 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 +RUN bundle config --global silence_root_warning true + RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.1/slim/Dockerfile b/2.1/slim/Dockerfile index 585e8451b6..64a349b09e 100644 --- a/2.1/slim/Dockerfile +++ b/2.1/slim/Dockerfile @@ -63,7 +63,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.2/Dockerfile b/2.2/Dockerfile index a0dd8d753b..949757ef4d 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -35,7 +35,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.2/onbuild/Dockerfile b/2.2/onbuild/Dockerfile index 1c90bfd92d..4361756b90 100644 --- a/2.2/onbuild/Dockerfile +++ b/2.2/onbuild/Dockerfile @@ -3,6 +3,8 @@ FROM ruby:2.2 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 +RUN bundle config --global silence_root_warning true + RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.2/slim/Dockerfile b/2.2/slim/Dockerfile index be69ba2bb3..0b5b83ef87 100644 --- a/2.2/slim/Dockerfile +++ b/2.2/slim/Dockerfile @@ -63,7 +63,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.3/Dockerfile b/2.3/Dockerfile index 4d848354e2..c54f74b79b 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -35,7 +35,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME diff --git a/2.3/onbuild/Dockerfile b/2.3/onbuild/Dockerfile index 7accb9c596..c025094eeb 100644 --- a/2.3/onbuild/Dockerfile +++ b/2.3/onbuild/Dockerfile @@ -3,6 +3,8 @@ FROM ruby:2.3 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 +RUN bundle config --global silence_root_warning true + RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.3/slim/Dockerfile b/2.3/slim/Dockerfile index 4abb8ced35..5286086912 100644 --- a/2.3/slim/Dockerfile +++ b/2.3/slim/Dockerfile @@ -63,7 +63,8 @@ ENV BUNDLER_VERSION 1.11.2 RUN gem install bundler --version "$BUNDLER_VERSION" \ && bundle config --global path "$GEM_HOME" \ - && bundle config --global bin "$GEM_HOME/bin" + && bundle config --global bin "$GEM_HOME/bin" \ + && bundle config --global silence_root_warning true # don't create ".bundle" in all our apps ENV BUNDLE_APP_CONFIG $GEM_HOME From 81a9ccef01dd0e8515f003a5af62316f6106a5cf Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Sat, 23 Jan 2016 21:28:18 +0100 Subject: [PATCH 2/2] Remove setting from onbuild as should inherit from ruby image --- 2.0/onbuild/Dockerfile | 2 -- 2.1/onbuild/Dockerfile | 2 -- 2.2/onbuild/Dockerfile | 2 -- 2.3/onbuild/Dockerfile | 2 -- 4 files changed, 8 deletions(-) diff --git a/2.0/onbuild/Dockerfile b/2.0/onbuild/Dockerfile index af2cb0bf3e..a3674dc3d2 100644 --- a/2.0/onbuild/Dockerfile +++ b/2.0/onbuild/Dockerfile @@ -3,8 +3,6 @@ FROM ruby:2.0 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 -RUN bundle config --global silence_root_warning true - RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.1/onbuild/Dockerfile b/2.1/onbuild/Dockerfile index 54a14538e8..9a9bdb7b6b 100644 --- a/2.1/onbuild/Dockerfile +++ b/2.1/onbuild/Dockerfile @@ -3,8 +3,6 @@ FROM ruby:2.1 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 -RUN bundle config --global silence_root_warning true - RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.2/onbuild/Dockerfile b/2.2/onbuild/Dockerfile index 4361756b90..1c90bfd92d 100644 --- a/2.2/onbuild/Dockerfile +++ b/2.2/onbuild/Dockerfile @@ -3,8 +3,6 @@ FROM ruby:2.2 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 -RUN bundle config --global silence_root_warning true - RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.3/onbuild/Dockerfile b/2.3/onbuild/Dockerfile index c025094eeb..7accb9c596 100644 --- a/2.3/onbuild/Dockerfile +++ b/2.3/onbuild/Dockerfile @@ -3,8 +3,6 @@ FROM ruby:2.3 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 -RUN bundle config --global silence_root_warning true - RUN mkdir -p /usr/src/app WORKDIR /usr/src/app