Update dependencies and alpine
This commit is contained in:
parent
535b6672a6
commit
6fd8f7ed00
5 changed files with 12 additions and 14 deletions
|
@ -10,7 +10,7 @@ default:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
|
|
||||||
build frontend:
|
build frontend:
|
||||||
image: node:16-alpine
|
image: node:18-alpine
|
||||||
stage: build frontend
|
stage: build frontend
|
||||||
before_script: []
|
before_script: []
|
||||||
variables:
|
variables:
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -1,9 +1,9 @@
|
||||||
FROM node:16 AS frontend-builder
|
FROM node:18 AS frontend-builder
|
||||||
|
|
||||||
COPY ./maubot/management/frontend /frontend
|
COPY ./maubot/management/frontend /frontend
|
||||||
RUN cd /frontend && yarn --prod && yarn build
|
RUN cd /frontend && yarn --prod && yarn build
|
||||||
|
|
||||||
FROM alpine:3.15
|
FROM alpine:3.17
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
python3 py3-pip py3-setuptools py3-wheel \
|
python3 py3-pip py3-setuptools py3-wheel \
|
||||||
|
@ -21,11 +21,10 @@ RUN apk add --no-cache \
|
||||||
py3-packaging \
|
py3-packaging \
|
||||||
py3-markdown \
|
py3-markdown \
|
||||||
py3-alembic \
|
py3-alembic \
|
||||||
# py3-cssselect \
|
py3-cssselect \
|
||||||
py3-commonmark \
|
py3-commonmark \
|
||||||
py3-pygments \
|
py3-pygments \
|
||||||
py3-tz \
|
py3-tz \
|
||||||
# py3-tzlocal \
|
|
||||||
py3-regex \
|
py3-regex \
|
||||||
py3-wcwidth \
|
py3-wcwidth \
|
||||||
# encryption
|
# encryption
|
||||||
|
@ -39,9 +38,8 @@ RUN apk add --no-cache \
|
||||||
py3-magic \
|
py3-magic \
|
||||||
py3-feedparser \
|
py3-feedparser \
|
||||||
py3-dateutil \
|
py3-dateutil \
|
||||||
py3-lxml
|
py3-lxml \
|
||||||
# py3-gitlab
|
py3-semver
|
||||||
# py3-semver@edge
|
|
||||||
# TODO remove pillow, magic, feedparser, lxml, gitlab and semver when maubot supports installing dependencies
|
# TODO remove pillow, magic, feedparser, lxml, gitlab and semver when maubot supports installing dependencies
|
||||||
|
|
||||||
COPY requirements.txt /opt/maubot/requirements.txt
|
COPY requirements.txt /opt/maubot/requirements.txt
|
||||||
|
@ -49,7 +47,7 @@ COPY optional-requirements.txt /opt/maubot/optional-requirements.txt
|
||||||
WORKDIR /opt/maubot
|
WORKDIR /opt/maubot
|
||||||
RUN apk add --virtual .build-deps python3-dev build-base git \
|
RUN apk add --virtual .build-deps python3-dev build-base git \
|
||||||
&& pip3 install -r requirements.txt -r optional-requirements.txt \
|
&& pip3 install -r requirements.txt -r optional-requirements.txt \
|
||||||
dateparser langdetect python-gitlab pyquery cchardet semver tzlocal cssselect \
|
dateparser langdetect python-gitlab pyquery tzlocal \
|
||||||
&& apk del .build-deps
|
&& apk del .build-deps
|
||||||
# TODO also remove dateparser, langdetect and pyquery when maubot supports installing dependencies
|
# TODO also remove dateparser, langdetect and pyquery when maubot supports installing dependencies
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine:3.15
|
FROM alpine:3.17
|
||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
python3 py3-pip py3-setuptools py3-wheel \
|
python3 py3-pip py3-setuptools py3-wheel \
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
pre-commit>=2.10.1,<3
|
pre-commit>=2.10.1,<3
|
||||||
isort>=5.10.1,<6
|
isort>=5.10.1,<6
|
||||||
black>=22.3.0,<22
|
black>=22.3.0,<23
|
||||||
|
|
|
@ -2,12 +2,12 @@ mautrix>=0.15.5,<0.19
|
||||||
aiohttp>=3,<4
|
aiohttp>=3,<4
|
||||||
yarl>=1,<2
|
yarl>=1,<2
|
||||||
SQLAlchemy>=1,<1.4
|
SQLAlchemy>=1,<1.4
|
||||||
asyncpg>=0.20,<0.27
|
asyncpg>=0.20,<0.28
|
||||||
aiosqlite>=0.16,<0.18
|
aiosqlite>=0.16,<0.19
|
||||||
commonmark>=0.9,<1
|
commonmark>=0.9,<1
|
||||||
ruamel.yaml>=0.15.35,<0.18
|
ruamel.yaml>=0.15.35,<0.18
|
||||||
attrs>=18.1.0
|
attrs>=18.1.0
|
||||||
bcrypt>=3,<4
|
bcrypt>=3,<5
|
||||||
packaging>=10
|
packaging>=10
|
||||||
|
|
||||||
click>=7,<9
|
click>=7,<9
|
||||||
|
|
Loading…
Reference in a new issue