Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:allanpk716/ChineseSubFinder into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
allanpk716 committed Feb 14, 2022
2 parents 2e6c7e8 + a49da02 commit 4f8f054
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM library/node:14-alpine as frontBuilder
FROM library/node:16-alpine as frontBuilder

USER root
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
add ./frontend/package.json /usr/src/app
add ./frontend/package-lock.json /usr/src/app
RUN npm install
RUN npm ci
COPY ./frontend /usr/src/app
RUN ls -al
RUN npm run build && ls -al dist/spa
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM library/node:14-alpine as builder
FROM library/node:16-alpine as builder

USER root
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
add ./package.json /usr/src/app
add ./package-lock.json /usr/src/app
add ./.npmrc /usr/src/app
RUN npm install
RUN npm ci
ADD . /usr/src/app
RUN ls -al
RUN npm run build && ls -al dist/spa
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"last 5 Opera versions"
],
"engines": {
"node": ">= 12.22.1",
"npm": ">= 6.13.4",
"node": ">= 16",
"npm": ">= 7",
"yarn": ">= 1.21.1"
}
}

0 comments on commit 4f8f054

Please sign in to comment.