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

Update to yarn 1.5.1 

closes GH-1250

Test Plan:
  - Everything builds

Change-Id: Id51b8997f5ae1b53c24c2b4b616c6956833ed2b5
Reviewed-on: https://gerrit.instructure.com/142553
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Tested-by: Jenkins
This commit is contained in:
Clay Diffrient 2018-03-05 09:12:09 -07:00
parent 04349fe757
commit 497fe4d5ea
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -8,7 +8,7 @@ FROM instructure/ruby-passenger:2.4
ENV APP_HOME /usr/src/app/
ENV RAILS_ENV "production"
ENV NGINX_MAX_UPLOAD_SIZE 10g
ENV YARN_VERSION 1.3.2-1
ENV YARN_VERSION 1.5.1-1
# Work around github.com/zertosh/v8-compile-cache/issues/2
# This can be removed once yarn pushes a release including the fixed version
@ -72,7 +72,11 @@ USER root
COPY . $APP_HOME
RUN mkdir -p .yardoc \
app/stylesheets/brandable_css_brands \
app/views/info \
client_apps/canvas_quizzes/dist \
client_apps/canvas_quizzes/node_modules \
client_apps/canvas_quizzes/tmp \
config/locales/generated \
gems/canvas_i18nliner/node_modules \
gems/selinimum/node_modules \
log \
@ -81,6 +85,7 @@ RUN mkdir -p .yardoc \
public/doc/api \
public/javascripts/client_apps \
public/javascripts/compiled \
public/javascripts/translations \
tmp \
/home/docker/.bundler/ \
/home/docker/.cache/yarn \

2
Dockerfile-production
View File

@ -8,7 +8,7 @@ FROM instructure/ruby-passenger:2.4
ENV APP_HOME /usr/src/app/
ENV RAILS_ENV "production"
ENV NGINX_MAX_UPLOAD_SIZE 10g
ENV YARN_VERSION 1.3.2-1
ENV YARN_VERSION 1.5.1-1
# Work around github.com/zertosh/v8-compile-cache/issues/2
# This can be removed once yarn pushes a release including the fixed version

2
build/Dockerfile.template
View File

@ -5,7 +5,7 @@ FROM instructure/ruby-passenger:2.4
ENV APP_HOME /usr/src/app/
ENV RAILS_ENV "production"
ENV NGINX_MAX_UPLOAD_SIZE 10g
ENV YARN_VERSION 1.3.2-1
ENV YARN_VERSION 1.5.1-1
# Work around github.com/zertosh/v8-compile-cache/issues/2
# This can be removed once yarn pushes a release including the fixed version

2
package.json
View File

@ -4,7 +4,7 @@
"version": "0.0.0",
"engines": {
"node": ">=8.9.4",
"yarn": "1.3.2"
"yarn": "1.5.1"
},
"dependencies": {
"@instructure/ui-core": "^4.7.2",