This commit is contained in:
Sebastian Hugentobler 2023-07-31 11:52:43 +02:00
parent 6b3b7b143d
commit 637b01c2d1
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0

View File

@ -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 \ RUN apk --no-cache add \
sed \ sed \
gcc \ gcc \
g++ \ g++ \
git \ git \
musl-dev \ musl-dev \
@ -12,7 +12,7 @@ RUN apk --no-cache add \
python3-dev \ python3-dev \
rust \ rust \
cargo \ cargo \
py3-pip \ py3-pip \
py3-wheel \ py3-wheel \
py3-brotli \ py3-brotli \
py3-olm \ py3-olm \
@ -43,10 +43,10 @@ WORKDIR /telegram
RUN git checkout "$VERSION" RUN git checkout "$VERSION"
RUN pip3 install --prefix=/install --upgrade -r requirements.txt RUN pip3 install --prefix=/install --upgrade -r requirements.txt
RUN pip3 install --prefix=/install --upgrade -r optional-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 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 adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge
RUN apk --no-cache add \ RUN apk --no-cache add \
ca-certificates \ ca-certificates \
ffmpeg \ ffmpeg \
libffi \ libffi \
python3 \ python3 \
py3-brotli \ py3-brotli \
py3-olm \ py3-olm \
py3-qrcode \ py3-qrcode \
py3-pillow \ py3-pillow \
@ -84,7 +84,7 @@ RUN apk --no-cache add \
py3-mako \ py3-mako \
py3-setuptools 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 WORKDIR /var/lib/matrix-bridge