Skip to content

Commit

Permalink
Merge branch 'master' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
capfei authored Apr 19, 2024
2 parents 4c2ca1e + 4a881b7 commit 9932312
Show file tree
Hide file tree
Showing 5 changed files with 18,144 additions and 13,313 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ jobs:

- uses: actions/[email protected]
with:
node-version: 10
node-version: 14
cache: 'npm'

- name: Update npm
run: npm install -g npm@9

- name: Install dependencies
run: npm ci

Expand Down
3 changes: 2 additions & 1 deletion DevDockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
# SPDX-License-Identifier: MIT
FROM node:10-alpine as builder
FROM node:14-alpine as builder
COPY . /opt/website
WORKDIR /opt/website
ARG REACT_APP_SERVER=http://localhost:4000
ARG REACT_APP_GA_TRACKINGID
RUN apk add --no-cache git
RUN npm install -g npm@9
RUN npm install

EXPOSE 3000
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Copyright (c) Microsoft Corporation and others. Licensed under the MIT license.
# SPDX-License-Identifier: MIT
FROM node:10-alpine as builder
FROM node:14-alpine as builder
COPY . /opt/website
WORKDIR /opt/website
ARG REACT_APP_SERVER=http://localhost:4000
ARG REACT_APP_GA_TRACKINGID
RUN apk add --no-cache git
RUN npm install -g npm@9
RUN npm install
RUN npm run build

Expand Down
Loading

0 comments on commit 9932312

Please sign in to comment.