diff --git a/Dockerfile b/Dockerfile index 601a4e4..b5e85d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM docker.io/alpine:3.17 as builder +FROM docker.io/alpine:3.18 as builder -ENV VERSION=59ab7be28353b99f41eb18c3baee14355257ae16 +ENV VERSION=23ec691128d30545c208c06eb4805443e292eb23 RUN apk --no-cache add \ sed \ - gcc \ + gcc \ g++ \ git \ musl-dev \ @@ -12,7 +12,7 @@ RUN apk --no-cache add \ python3-dev \ rust \ cargo \ - py3-pip \ + py3-pip \ py3-wheel \ py3-brotli \ py3-olm \ @@ -43,10 +43,10 @@ WORKDIR /telegram RUN git checkout "$VERSION" RUN pip3 install --prefix=/install --upgrade -r requirements.txt RUN pip3 install --prefix=/install --upgrade -r optional-requirements.txt -RUN cp -r mautrix_telegram /install/lib/python3.10/site-packages/ +RUN cp -r mautrix_telegram /install/lib/python3.11/site-packages/ -FROM docker.io/thallian/confd-env:3.17-3.1.3.0 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 ENV FFMPEG_BINARY=/usr/bin/ffmpeg @@ -56,11 +56,11 @@ RUN addgroup -g 2222 matrix-bridge RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge RUN apk --no-cache add \ - ca-certificates \ - ffmpeg \ - libffi \ + ca-certificates \ + ffmpeg \ + libffi \ python3 \ - py3-brotli \ + py3-brotli \ py3-olm \ py3-qrcode \ py3-pillow \ @@ -84,7 +84,7 @@ RUN apk --no-cache add \ py3-mako \ py3-setuptools -ENV PYTHONPATH=/usr/lib/python3.10/site-packages:/py-pkgs/lib/python3.10/site-packages/ +ENV PYTHONPATH=/usr/lib/python3.11/site-packages:/py-pkgs/lib/python3.11/site-packages/ WORKDIR /var/lib/matrix-bridge