From d92d7c4314db355fcc02c4384fcd48cd399b10a1 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 19 Aug 2025 17:44:20 +0300 Subject: [PATCH] Install lottieconverter from Alpine repos --- Dockerfile | 7 +------ Dockerfile.ci | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4913b13..4664399 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -FROM dock.mau.dev/tulir/lottieconverter:alpine-3.22 AS lottie - FROM golang:1-alpine3.22 AS builder RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev @@ -13,11 +11,8 @@ FROM alpine:3.22 ENV UID=1337 \ GID=1337 -RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq 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/example-config.yaml /opt/mautrix-discord/example-config.yaml COPY --from=builder /build/docker-run.sh /docker-run.sh diff --git a/Dockerfile.ci b/Dockerfile.ci index 9e6d845..32b9c35 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,15 +1,10 @@ -FROM dock.mau.dev/tulir/lottieconverter:alpine-3.22 AS lottie - FROM alpine:3.22 ENV UID=1337 \ GID=1337 -RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq \ - zlib libpng giflib libstdc++ libgcc +RUN apk add --no-cache ffmpeg su-exec ca-certificates 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 ARG EXECUTABLE=./mautrix-discord COPY $EXECUTABLE /usr/bin/mautrix-discord COPY ./example-config.yaml /opt/mautrix-discord/example-config.yaml