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

don’t install optional yarn dependencies 

Change-Id: I6340550449ad69fb1e919b1f2400992aaf2ca526
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/250791
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
Aaron Ogata 2020-10-21 16:45:32 -07:00
parent ee801567ce
commit 508982146e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -4,7 +4,7 @@
ARG RUBY=2.6-p6.0.4
FROM instructure/ruby-passenger:$RUBY AS webpack-final
FROM instructure/ruby-passenger:$RUBY
LABEL maintainer="Instructure"
ARG POSTGRES_CLIENT=12
@ -112,7 +112,7 @@ RUN set -eux; \
/home/docker/.bundler/ \
/home/docker/.cache/yarn \
/home/docker/.gem/ \
&& (DISABLE_POSTINSTALL=1 yarn install --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --pure-lockfile --network-concurrency 1) \
&& (DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile --network-concurrency 1) \
&& yarn cache clean
COPY --chown=docker:docker babel.config.js ${APP_HOME}

2
Dockerfile.jenkins
View File

@ -111,7 +111,7 @@ RUN set -eux; \
/home/docker/.bundler/ \
/home/docker/.cache/yarn \
/home/docker/.gem/ \
&& (DISABLE_POSTINSTALL=1 yarn install --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --pure-lockfile --network-concurrency 1) \
&& (DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile --network-concurrency 1) \
&& yarn cache clean
COPY --chown=docker:docker babel.config.js ${APP_HOME}

6
build/Dockerfile.template
View File

@ -81,7 +81,7 @@ COPY --chown=docker:docker packages ${APP_HOME}packages
RUN set -eux; \
mkdir -p <%= docker_compose_volume_paths.join(" \\\n ") %> \
&& (DISABLE_POSTINSTALL=1 yarn install --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --pure-lockfile --network-concurrency 1) \
&& (DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile || DISABLE_POSTINSTALL=1 yarn install --ignore-optional --pure-lockfile --network-concurrency 1) \
&& yarn cache clean
COPY --chown=docker:docker babel.config.js ${APP_HOME}
@ -115,8 +115,8 @@ RUN COMPILE_ASSETS_API_DOCS=0 COMPILE_ASSETS_NPM_INSTALL=0 COMPILE_ASSETS_STYLEG
COPY --chown=docker:docker . ${APP_HOME}
ARG COMPILE_ASSETS_API_DOCS=0
RUN bash -c "if [[ "$COMPILE_ASSETS_API_DOCS" == "1" ]]; then bundle exec rails doc:api css:styleguide; fi"
ARG COMPILE_ADDITIONAL_ASSETS=0
RUN bash -c "if [[ "$COMPILE_ADDITIONAL_ASSETS" == "1" ]]; then bundle exec rails doc:api css:styleguide; fi"
<% else -%>
COPY --chown=docker:docker . ${APP_HOME}