Skip to content

Commit 920854b

Browse files
authored
Merge pull request #177 from ninoseki/update-frontend
Update frontend
2 parents 98aa4aa + 301c04f commit 920854b

File tree

6 files changed

+2139
-2041
lines changed

6 files changed

+2139
-2041
lines changed

.github/workflows/node.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [16.x]
15+
node-version: [18.x]
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
19+
1920
- name: Use Node.js ${{ matrix.node-version }}
20-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v3
2122
with:
2223
node-version: ${{ matrix.node-version }}
24+
cache: "npm"
25+
cache-dependency-path: frontend/package-lock.json
2326

2427
- name: Install npm dependencies
2528
run: npm install

.github/workflows/test.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@ jobs:
1212
poetry-version: [1.1.15]
1313

1414
steps:
15-
- uses: actions/checkout@v2
16-
- uses: actions/setup-python@v2
17-
with:
18-
python-version: ${{ matrix.python-version }}
15+
- uses: actions/checkout@v3
1916

20-
- name: Run image
21-
uses: abatilo/actions-poetry@v2.1.4
17+
- name: Setup poetry
18+
uses: abatilo/actions-poetry@v2
2219
with:
2320
poetry-version: ${{ matrix.poetry-version }}
2421

25-
- name: Install
26-
run: |
27-
poetry install
22+
- uses: actions/setup-python@v4
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
cache: "poetry"
26+
27+
- name: Install dependencies
28+
run: poetry install
2829

2930
- name: Run tests
3031
run: |

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# build env
2-
FROM node:18-alpine as build
2+
FROM node:18-buster-slim as build
33

44
COPY ./frontend /frontend
55
WORKDIR /frontend
6+
ENV NODE_OPTIONS --openssl-legacy-provider
67
RUN npm install && npm run build && rm -rf node_modules
78

89
# prod env
@@ -21,8 +22,8 @@ COPY pyproject.toml poetry.lock /backend/
2122
COPY gunicorn.conf.py /backend
2223
COPY app /backend/app
2324

24-
RUN pip3 install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
25-
RUN pip3 install circus
25+
RUN pip install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
26+
RUN pip install circus
2627

2728
COPY circus.ini /etc/circus.ini
2829

app.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# build env
2-
FROM node:18-alpine as build
2+
FROM node:18-buster-slim as build
33

44
COPY ./frontend /frontend
55
WORKDIR /frontend
6+
ENV NODE_OPTIONS --openssl-legacy-provider
67
RUN npm install && npm run build && rm -rf node_modules
78

89
# prod env
@@ -19,7 +20,7 @@ COPY pyproject.toml poetry.lock /backend/
1920
COPY gunicorn.conf.py /backend
2021
COPY app /backend/app
2122

22-
RUN pip3 install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
23+
RUN pip install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
2324

2425
COPY --from=build /frontend /backend/frontend
2526

0 commit comments

Comments
 (0)