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

Remove conditional for docker bundler lock step 

Restores POSIX compliance

Closes: GRADE-2203
Closes: gh-1451

Test Plan:
- works on systems without modern bash syntax (i.e.`[[]]`)

Change-Id: I2c4924a9abe8d0561782150d3daf4df10b7a7fd1
Reviewed-on: https://gerrit.instructure.com/194898
Reviewed-by: Keith Garner <kgarner@instructure.com>
Tested-by: Jenkins
QA-Review: Derek Bender <djbender@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
This commit is contained in:
Derek Bender 2019-05-23 10:16:10 -05:00
parent 59582a5836
commit 989813fe76
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

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

4
build/Dockerfile.template
View File

@ -126,8 +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 && find ${APP_HOME} /home/docker ! -user docker -print0 | xargs -0 chown -h docker:docker
USER docker USER docker
# update any existing lock file since it wasn't used to bundle install # update Gemfile.lock in cases where a lock file was pulled in during the `COPY . $APP_HOME` step
RUN [[ -f Gemfile.lock || -f Gemfile.lock.52 ]] && bundle lock --update RUN bundle lock --update
# TODO: switch to canvas:compile_assets_dev once we stop using this Dockerfile in production/e2e # 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 RUN COMPILE_ASSETS_NPM_INSTALL=0 bundle exec rake canvas:compile_assets
<% end -%> <% end -%>