Skip to content

Commit

Permalink
upgrade node from 14.x to 16.x
Browse files Browse the repository at this point in the history
refs DE-1264

Change-Id: If8b9d73a487b1914b19070a2249394e5116eb8d3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/295892
Reviewed-by: Charley Kline <[email protected]>
Product-Review: Charley Kline <[email protected]>
Tested-by: Service Cloud Jenkins <[email protected]>
QA-Review: Aaron Ogata <[email protected]>
  • Loading branch information
aogata-inst committed Jul 12, 2022
1 parent 0c036a4 commit 6988472
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14.15.4
v16.16.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ARG USER_ID
RUN if [ -n "$USER_ID" ]; then usermod -u "${USER_ID}" docker \
&& chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi

RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& 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 \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ENV BUNDLE_APP_CONFIG /home/docker/.bundle
WORKDIR $APP_HOME

USER root
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& 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 \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.package-translations
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instructure/node:14
FROM instructure/node:16

ARG NPM_PRIVATE_SCOPE
ARG NPM_PRIVATE_REGISTRY
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN if [ -n "$USER_ID" ]; then usermod -u "${USER_ID}" docker \
&& chown --from=9999 docker /usr/src/nginx /usr/src/app -R; fi

<% end -%>
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& 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 \
&& printf 'path-exclude /usr/share/doc/*\npath-exclude /usr/share/man/*' > /etc/dpkg/dpkg.cfg.d/01_nodoc \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/karma/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instructure/node:14
FROM instructure/node:16

ENV APP_HOME /usr/src/app/
ENV NODE_ENV test
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "AGPL-3.0",
"version": "0.0.0",
"engines": {
"node": ">=14.0.0",
"node": ">=16.0.0",
"yarn": "^1.19.1"
},
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/canvas-planner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instructure/node:14
FROM instructure/node:16

USER docker

Expand Down
2 changes: 1 addition & 1 deletion packages/canvas-rce/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM instructure/node:14
FROM instructure/node:16

ARG NPM_PRIVATE_SCOPE
ARG NPM_PRIVATE_REGISTRY
Expand Down
5 changes: 0 additions & 5 deletions ui/shared/sentry/__tests__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,4 @@ describe('isolate', () => {
})()
expect(console.error).toHaveBeenCalledWith(new Error('nope'))
})

it('cannot isolate rejections that were not returned', async () => {
await isolate(() => { Promise.reject(new Error('nope')) })()
expect(console.error).not.toHaveBeenCalled()
})
})

0 comments on commit 6988472

Please sign in to comment.