diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c5196e..8c8c6db 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:18-alpine + image: node:20-alpine stage: build frontend before_script: [] variables: diff --git a/Dockerfile b/Dockerfile index f4bd0df..b4ee106 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM node:18 AS frontend-builder +FROM node:20 AS frontend-builder COPY ./maubot/management/frontend /frontend RUN cd /frontend && yarn --prod && yarn build -FROM alpine:3.18 +FROM alpine:3.20 RUN apk add --no-cache \ python3 py3-pip py3-setuptools py3-wheel \ @@ -11,7 +11,6 @@ RUN apk add --no-cache \ su-exec \ yq \ py3-aiohttp \ - py3-sqlalchemy \ py3-attrs \ py3-bcrypt \ py3-cffi \ @@ -34,20 +33,19 @@ RUN apk add --no-cache \ py3-unpaddedbase64 \ py3-future \ # plugin deps - #py3-pillow \ + py3-pillow \ py3-magic \ py3-feedparser \ py3-dateutil \ py3-lxml \ - py3-semver \ - && apk add --no-cache py3-pillow --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community + py3-semver # TODO remove pillow, magic, feedparser, lxml, gitlab and semver when maubot supports installing dependencies COPY requirements.txt /opt/maubot/requirements.txt 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 \ + && pip3 install --break-system-packages -r requirements.txt -r optional-requirements.txt \ 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 7a957f8..3f83a1c 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.20 RUN apk add --no-cache \ python3 py3-pip py3-setuptools py3-wheel \ @@ -6,7 +6,6 @@ RUN apk add --no-cache \ su-exec \ yq \ py3-aiohttp \ - py3-sqlalchemy \ py3-attrs \ py3-bcrypt \ py3-cffi \ @@ -30,11 +29,10 @@ RUN apk add --no-cache \ py3-unpaddedbase64 \ py3-future \ # plugin deps - #py3-pillow \ + py3-pillow \ py3-magic \ py3-feedparser \ - py3-lxml \ - && apk add --no-cache py3-pillow --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community + py3-lxml # py3-gitlab # py3-semver # TODO remove pillow, magic, feedparser, lxml, gitlab and semver when maubot supports installing dependencies @@ -43,7 +41,7 @@ COPY requirements.txt /opt/maubot/requirements.txt 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 \ + && pip3 install --break-system-packages -r requirements.txt -r optional-requirements.txt \ dateparser langdetect python-gitlab pyquery semver tzlocal cssselect \ && apk del .build-deps # TODO also remove dateparser, langdetect and pyquery when maubot supports installing dependencies