diff --git a/roles/custom/matrix-bridge-rustpush/templates/Dockerfile.j2 b/roles/custom/matrix-bridge-rustpush/templates/Dockerfile.j2 index a46a432fc..49185aef4 100644 --- a/roles/custom/matrix-bridge-rustpush/templates/Dockerfile.j2 +++ b/roles/custom/matrix-bridge-rustpush/templates/Dockerfile.j2 @@ -75,8 +75,8 @@ RUN BUILD_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ) && \ CGO_LDFLAGS="-L/build" \ go build \ -ldflags "-X main.Tag=${BUILD_VERSION} -X main.Commit=${BUILD_COMMIT} -X main.BuildTime=${BUILD_TIME}" \ - -o /build/mautrix-imessage-v2 \ - ./cmd/mautrix-imessage/ + -o /build/matrix-rustpush \ + ./cmd/matrix-rustpush/ # ── Stage 2: runtime ───────────────────────────────────────────────────────── FROM ubuntu:24.04 @@ -88,8 +88,9 @@ ENV DEBIAN_FRONTEND=noninteractive # libheif1 — HEIC/HEIF conversion (linked at compile time even when disabled) # libolm3 — Matrix OLM encryption (mautrix bridgev2 framework) # libssl3 — OpenSSL (rustpush openssl crate dynamic link) +# ffmpeg — video transcoding RUN apt-get update && apt-get install -y --no-install-recommends \ - libunicorn2 libheif1 libolm3 libssl3 \ + libunicorn2 libheif1 libolm3 libssl3 ffmpeg \ ca-certificates openssl curl \ && curl -fsSL 'https://www.apple.com/appleca/AppleIncRootCertificate.cer' \ -o /tmp/AppleRootCA.cer \ @@ -99,10 +100,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm /tmp/AppleRootCA.cer \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /build/mautrix-imessage-v2 /usr/local/bin/mautrix-imessage-v2 +COPY --from=builder /build/matrix-rustpush /usr/local/bin/matrix-rustpush WORKDIR /data VOLUME /data EXPOSE 29332 -ENTRYPOINT ["mautrix-imessage-v2", "-c", "/data/config.yaml"] +ENTRYPOINT ["matrix-rustpush", "-c", "/data/config.yaml"] diff --git a/roles/custom/matrix-bridge-rustpush/templates/systemd/matrix-rustpush-bridge.service.j2 b/roles/custom/matrix-bridge-rustpush/templates/systemd/matrix-rustpush-bridge.service.j2 index f72f05066..339599fa4 100644 --- a/roles/custom/matrix-bridge-rustpush/templates/systemd/matrix-rustpush-bridge.service.j2 +++ b/roles/custom/matrix-bridge-rustpush/templates/systemd/matrix-rustpush-bridge.service.j2 @@ -26,7 +26,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ --mount type=bind,src={{ matrix_rustpush_bridge_config_path }},dst=/config,ro \ --mount type=bind,src={{ matrix_rustpush_bridge_data_path }},dst=/data \ --label-file={{ matrix_rustpush_bridge_base_path }}/labels \ - --entrypoint /usr/local/bin/mautrix-imessage-v2 \ + --entrypoint /usr/local/bin/matrix-rustpush \ {% for arg in matrix_rustpush_bridge_container_extra_arguments %} {{ arg }} \ {% endfor %}