Merge pull request #14 from paulriddle/upd-bundler

Use bundler 1.17.3
abak-press · May 21, 2019 · 2bdafad · 2bdafad
2 parents 6b712a5 + 2bf6b4c
commit 2bdafad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
@@ -62,7 +62,7 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
   && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem install bundler --version 1.17.3 \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries

diff --git a/2.4/Dockerfile b/2.4/Dockerfile
@@ -61,8 +61,10 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1
 # https://github.com/bundler/bundler/issues/4402
 RUN echo 'gem: --no-rdoc --no-ri --no-document' > /root/.gemrc \
   && ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts \
-  && gem update --system 2.6.1 \
-  && gem install bundler --version 1.15.1 \
+  && gem update --system \
+  && gem install bundler \
+  && gem install executable-hooks -v ">=1.3.2" \
+  && gem regenerate_binstubs \
   && bundle config --global jobs 7 \
   && bundle config git.allow_insecure true \
   && bundle config --global build.nokogiri --use-system-libraries