Skip to content

Commit

Permalink
Merge pull request #177 from ninoseki/update-frontend
Browse files Browse the repository at this point in the history
Update frontend
  • Loading branch information
ninoseki committed Nov 23, 2022
2 parents 98aa4aa + 301c04f commit 920854b
Show file tree
Hide file tree
Showing 6 changed files with 2,139 additions and 2,041 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/node.yml
Expand Up @@ -12,14 +12,17 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache-dependency-path: frontend/package-lock.json

- name: Install npm dependencies
run: npm install
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/test.yml
Expand Up @@ -12,19 +12,20 @@ jobs:
poetry-version: [1.1.15]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v3

- name: Run image
uses: abatilo/actions-poetry@v2.1.4
- name: Setup poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: ${{ matrix.poetry-version }}

- name: Install
run: |
poetry install
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"

- name: Install dependencies
run: poetry install

- name: Run tests
run: |
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
@@ -1,8 +1,9 @@
# build env
FROM node:18-alpine as build
FROM node:18-buster-slim as build

COPY ./frontend /frontend
WORKDIR /frontend
ENV NODE_OPTIONS --openssl-legacy-provider
RUN npm install && npm run build && rm -rf node_modules

# prod env
Expand All @@ -21,8 +22,8 @@ COPY pyproject.toml poetry.lock /backend/
COPY gunicorn.conf.py /backend
COPY app /backend/app

RUN pip3 install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
RUN pip3 install circus
RUN pip install poetry==1.1.15 && poetry config virtualenvs.create false && poetry install --no-dev
RUN pip install circus

COPY circus.ini /etc/circus.ini

Expand Down
5 changes: 3 additions & 2 deletions app.Dockerfile
@@ -1,8 +1,9 @@
# build env
FROM node:18-alpine as build
FROM node:18-buster-slim as build

COPY ./frontend /frontend
WORKDIR /frontend
ENV NODE_OPTIONS --openssl-legacy-provider
RUN npm install && npm run build && rm -rf node_modules

# prod env
Expand All @@ -19,7 +20,7 @@ COPY pyproject.toml poetry.lock /backend/
COPY gunicorn.conf.py /backend
COPY app /backend/app

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

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

Expand Down

0 comments on commit 920854b

Please sign in to comment.