diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 797e095..0c5196e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ default: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY build frontend: - image: node:16-alpine + image: node:18-alpine stage: build frontend before_script: [] variables: diff --git a/Dockerfile b/Dockerfile index 8b7eae7..656a7c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM node:16 AS frontend-builder +FROM node:18 AS frontend-builder COPY ./maubot/management/frontend /frontend RUN cd /frontend && yarn --prod && yarn build -FROM alpine:3.15 +FROM alpine:3.17 RUN apk add --no-cache \ python3 py3-pip py3-setuptools py3-wheel \ @@ -21,11 +21,10 @@ RUN apk add --no-cache \ py3-packaging \ py3-markdown \ py3-alembic \ -# py3-cssselect \ + py3-cssselect \ py3-commonmark \ py3-pygments \ py3-tz \ -# py3-tzlocal \ py3-regex \ py3-wcwidth \ # encryption @@ -39,9 +38,8 @@ RUN apk add --no-cache \ py3-magic \ py3-feedparser \ py3-dateutil \ - py3-lxml -# py3-gitlab -# py3-semver@edge + py3-lxml \ + py3-semver # TODO remove pillow, magic, feedparser, lxml, gitlab and semver when maubot supports installing dependencies COPY requirements.txt /opt/maubot/requirements.txt @@ -49,7 +47,7 @@ COPY optional-requirements.txt /opt/maubot/optional-requirements.txt WORKDIR /opt/maubot RUN apk add --virtual .build-deps python3-dev build-base git \ && 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 # TODO also remove dateparser, langdetect and pyquery when maubot supports installing dependencies diff --git a/Dockerfile.ci b/Dockerfile.ci index 8c0f49b..d3a7e32 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 RUN apk add --no-cache \ python3 py3-pip py3-setuptools py3-wheel \ diff --git a/dev-requirements.txt b/dev-requirements.txt index 16231f3..14b83e9 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,3 @@ pre-commit>=2.10.1,<3 isort>=5.10.1,<6 -black>=22.3.0,<22 +black>=22.3.0,<23 diff --git a/requirements.txt b/requirements.txt index 8cce673..d050f78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ mautrix>=0.15.5,<0.19 aiohttp>=3,<4 yarl>=1,<2 SQLAlchemy>=1,<1.4 -asyncpg>=0.20,<0.27 -aiosqlite>=0.16,<0.18 +asyncpg>=0.20,<0.28 +aiosqlite>=0.16,<0.19 commonmark>=0.9,<1 ruamel.yaml>=0.15.35,<0.18 attrs>=18.1.0 -bcrypt>=3,<4 +bcrypt>=3,<5 packaging>=10 click>=7,<9