Skip to content

Commit

Permalink
use RubyGems version in base docker image
Browse files Browse the repository at this point in the history
Change-Id: I740ac57029983f82a7d8508a3798b47b93c3fa88
Reviewed-on: https://gerrit.instructure.com/140249
Tested-by: Jenkins
Reviewed-by: Marc Alan Phillips <mphillips@instructure.com>
QA-Review: Tyler Burraston <tburraston@instructure.com>
Product-Review: Bryan Petty <bpetty@instructure.com>
  • Loading branch information
tierra committed Feb 7, 2018
1 parent 902ec4e commit 150dfe1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
RUN if [ -e /var/lib/gems/$RUBY_MAJOR.0/gems/bundler-* ]; then BUNDLER_INSTALL="-i /var/lib/gems/$RUBY_MAJOR.0"; fi \
&& gem uninstall --all --ignore-dependencies --force $BUNDLER_INSTALL bundler \
&& gem install bundler --no-document -v 1.15.2 \
&& gem update --system --no-document \
&& find $GEM_HOME ! -user docker | xargs chown docker:docker

# We will need sfnt2woff in order to build fonts
Expand Down
1 change: 0 additions & 1 deletion Dockerfile-production
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
RUN if [ -e /var/lib/gems/$RUBY_MAJOR.0/gems/bundler-* ]; then BUNDLER_INSTALL="-i /var/lib/gems/$RUBY_MAJOR.0"; fi \
&& gem uninstall --all --ignore-dependencies --force $BUNDLER_INSTALL bundler \
&& gem install bundler --no-document -v 1.15.2 \
&& gem update --system --no-document \
&& find $GEM_HOME ! -user docker | xargs chown docker:docker


Expand Down
1 change: 0 additions & 1 deletion build/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
RUN if [ -e /var/lib/gems/$RUBY_MAJOR.0/gems/bundler-* ]; then BUNDLER_INSTALL="-i /var/lib/gems/$RUBY_MAJOR.0"; fi \
&& gem uninstall --all --ignore-dependencies --force $BUNDLER_INSTALL bundler \
&& gem install bundler --no-document -v 1.15.2 \
&& gem update --system --no-document \
&& find $GEM_HOME ! -user docker | xargs chown docker:docker

<% if development? -%>
Expand Down

0 comments on commit 150dfe1

Please sign in to comment.