Skip to content

Commit

Permalink
Merge pull request #420 from skooner-k8s/fix-406
Browse files Browse the repository at this point in the history
Fix 406
  • Loading branch information
yuqiuw committed Sep 13, 2023
2 parents fa2538b + 6992099 commit 7976045
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
working-directory: "./client"
steps:
- uses: actions/checkout@v2
- name: Setup node 12
- name: Setup node 16
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
- run: npm ci
working-directory: ${{env.working-directory}}
- run: npm run build
Expand All @@ -29,10 +29,10 @@ jobs:
# working-directory: "./server"
# steps:
# - uses: actions/checkout@v2
# - name: Setup node 12
# - name: Setup node 16
# uses: actions/setup-node@v1
# with:
# node-version: 12.x
# node-version: 16.x
# - run: npm ci
# working-directory: ${{env.working-directory}}
# - run: npm run build
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
working-directory: "./client"
steps:
- uses: actions/checkout@v2
- name: Setup node 12
- name: Setup node 16
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
- run: npm ci
working-directory: ${{env.working-directory}}
- run: npm run build
Expand All @@ -32,10 +32,10 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
- name: Setup node 12
- name: Setup node 16
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
registry-url: https://npm.pkg.github.com/
- run: npm ci
working-directory: ${{env.working-directory}}
Expand All @@ -54,10 +54,10 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
- name: Setup node 12
- name: Setup node 16
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 16.x
registry-url: https://npm.pkg.github.com/
- run: npm ci
working-directory: ${{env.working-directory}}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1 - the build react app
FROM node:12.22.10-alpine as build-deps
FROM node:16.11.7 as build-deps
WORKDIR /usr/src/app
COPY client/package.json client/package-lock.json ./
RUN npm i
Expand All @@ -8,7 +8,7 @@ COPY client/ ./
RUN npm run build

# Stage 2 - the production environment
FROM node:12.22.10-alpine
FROM node:16.11.7

RUN apk add --no-cache tini
ENV NODE_ENV production
Expand Down

0 comments on commit 7976045

Please sign in to comment.