Skip to content

Commit

Permalink
Merge 42ce9d9 into 505b0d0
Browse files Browse the repository at this point in the history
  • Loading branch information
ninoseki committed Mar 1, 2022
2 parents 505b0d0 + 42ce9d9 commit 5855648
Show file tree
Hide file tree
Showing 8 changed files with 3,971 additions and 3,654 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.yml
Expand Up @@ -12,7 +12,7 @@ jobs:

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

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Expand Up @@ -8,8 +8,8 @@ jobs:

strategy:
matrix:
python-version: [3.8, 3.9]
poetry-version: [1.1.6]
python-version: [3.9]
poetry-version: [1.1.11]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -48,4 +48,4 @@ jobs:
pip3 install --upgrade coveralls
coveralls --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Expand Up @@ -11,21 +11,21 @@ repos:
]

- repo: https://github.com/asottile/pyupgrade
rev: v2.29.0
rev: v2.31.0
hooks:
- id: pyupgrade
args: [--py37-plus]
args: [--py38-plus]

- repo: https://github.com/timothycrosley/isort
rev: 5.9.3
rev: 5.10.1
hooks:
- id: isort
args: ["--profile", "black"]
additional_dependencies: [toml]
exclude: ^.*/?setup\.py$

- repo: https://github.com/psf/black
rev: 21.9b0
rev: 22.1.0
hooks:
- id: black

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
@@ -1,5 +1,5 @@
# build env
FROM node:14-alpine as build
FROM node:16-alpine as build

COPY ./frontend /frontend
WORKDIR /frontend
Expand All @@ -20,13 +20,14 @@ WORKDIR /backend
COPY pyproject.toml /backend
COPY poetry.lock /backend
COPY app /backend/app
COPY --from=build /frontend /backend/frontend

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

COPY circus.ini /etc/circus.ini

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

# spamd envs
ENV SPAMD_MAX_CHILDREN=1 \
SPAMD_PORT=7833 \
Expand Down

0 comments on commit 5855648

Please sign in to comment.