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

upgrade to node14 

fixes FOO-1527
flag  = none

test plan: you can install node modules and run webpack

Change-Id: I33347d791b0923f4471b555c6fac303b098b1ef4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/257333
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
Ahmad Amireh 2021-01-25 12:16:32 -07:00
parent e9a0cab890
commit 486b0bf72c
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nvmrc
View File

@ -1 +1 @@
v12.19.1 v14.15.4

2
Dockerfile
View File

@ -34,7 +34,7 @@ ARG USER_ID
RUN if [ -n "$USER_ID" ]; then usermod -u "${USER_ID}" docker \ RUN if [ -n "$USER_ID" ]; then usermod -u "${USER_ID}" docker \
&& chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi && chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \

2
Dockerfile.jenkins
View File

@ -27,7 +27,7 @@ ENV BUNDLE_APP_CONFIG /home/docker/.bundle
WORKDIR $APP_HOME WORKDIR $APP_HOME
USER root USER root
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \

2
Dockerfile.package-translations
View File

@ -1,4 +1,4 @@
FROM instructure/node:12 FROM instructure/node:14
ARG NPM_PRIVATE_SCOPE ARG NPM_PRIVATE_SCOPE
ARG NPM_PRIVATE_REGISTRY ARG NPM_PRIVATE_REGISTRY

2
build/Dockerfile.template
View File

@ -37,7 +37,7 @@ RUN if [ -n "$USER_ID" ]; then usermod -u "${USER_ID}" docker \
&& chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi && chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi
<% end -%> <% end -%>
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \

2
build/ubuntu.Dockerfile.template
View File

@ -18,7 +18,7 @@ ENV YARN_VERSION 1.19.1-1
USER root USER root
WORKDIR /root WORKDIR /root
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \

2
docker-compose/karma/Dockerfile
View File

@ -1,4 +1,4 @@
FROM instructure/node:12 FROM instructure/node:14
ENV APP_HOME /usr/src/app/ ENV APP_HOME /usr/src/app/
ENV NODE_ENV test ENV NODE_ENV test

2
package.json
View File

@ -3,7 +3,7 @@
"license": "AGPL-3.0", "license": "AGPL-3.0",
"version": "0.0.0", "version": "0.0.0",
"engines": { "engines": {
"node": ">=12.5.0", "node": ">=14.0.0",
"yarn": "^1.19.1" "yarn": "^1.19.1"
}, },
"private": true, "private": true,

2
packages/canvas-planner/Dockerfile
View File

@ -1,4 +1,4 @@
FROM instructure/node:12 FROM instructure/node:14
USER docker USER docker

2
packages/canvas-rce/Dockerfile
View File

@ -1,4 +1,4 @@
FROM instructure/node:12 FROM instructure/node:14
ARG NPM_PRIVATE_SCOPE ARG NPM_PRIVATE_SCOPE
ARG NPM_PRIVATE_REGISTRY ARG NPM_PRIVATE_REGISTRY

2
ubuntu.development.Dockerfile
View File

@ -16,7 +16,7 @@ ENV YARN_VERSION 1.19.1-1
USER root USER root
WORKDIR /root WORKDIR /root
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \

2
ubuntu.production.Dockerfile
View File

@ -14,7 +14,7 @@ ENV YARN_VERSION 1.19.1-1
USER root USER root
WORKDIR /root WORKDIR /root
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \ && printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \