ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Gemfile.lock in docker for dev 

Change-Id: I4fd5d13f959de1a2b1d03175e3a3fff17ec97958
Reviewed-on: https://gerrit.instructure.com/194515
Tested-by: Jenkins
Reviewed-by: Marc Phillips <mphillips@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
This commit is contained in:
Derek Bender 2019-05-21 10:22:45 -05:00
parent 02a38b9e96
commit b3826e0d88
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -98,5 +98,7 @@ RUN mkdir -p .yardoc \
&& find ${APP_HOME} /home/docker ! -user docker -print0 | xargs -0 chown -h docker:docker
USER docker
# update any existing lock file since it wasn't used to bundle install
RUN [[ -f Gemfile.lock || -f Gemfile.lock.52 ]] && bundle lock --update
# TODO: switch to canvas:compile_assets_dev once we stop using this Dockerfile in production/e2e
RUN COMPILE_ASSETS_NPM_INSTALL=0 bundle exec rake canvas:compile_assets

2
build/Dockerfile.template
View File

@ -126,6 +126,8 @@ RUN mkdir -p <%= docker_compose_volume_paths.join(" \\\n ") %> \
&& find ${APP_HOME} /home/docker ! -user docker -print0 | xargs -0 chown -h docker:docker
USER docker
# update any existing lock file since it wasn't used to bundle install
RUN [[ -f Gemfile.lock || -f Gemfile.lock.52 ]] && bundle lock --update
# TODO: switch to canvas:compile_assets_dev once we stop using this Dockerfile in production/e2e
RUN COMPILE_ASSETS_NPM_INSTALL=0 bundle exec rake canvas:compile_assets
<% end -%>