Merge branch 'main' into v2

This commit is contained in:
Tulir Asokan
2025-11-20 10:11:42 +02:00
13 changed files with 225 additions and 96 deletions

View File

@@ -1,6 +1,4 @@
FROM dock.mau.dev/tulir/lottieconverter:alpine-3.19 AS lottie
FROM golang:1-alpine3.20 AS builder
FROM golang:1-alpine3.22 AS builder
RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev
@@ -8,16 +6,13 @@ COPY . /build
WORKDIR /build
RUN go build -o /usr/bin/mautrix-discord
FROM alpine:3.20
FROM alpine:3.22
ENV UID=1337 \
GID=1337
RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq-go curl \
zlib libpng giflib libstdc++ libgcc
RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl yq-go lottieconverter
COPY --from=lottie /usr/lib/librlottie.so* /usr/lib/
COPY --from=lottie /usr/local/bin/lottieconverter /usr/local/bin/lottieconverter
COPY --from=builder /usr/bin/mautrix-discord /usr/bin/mautrix-discord
COPY --from=builder /build/docker-run.sh /docker-run.sh
VOLUME /data