From 50132ae274945ad58f50acefdd09307c0445cb29 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 23 Jun 2020 16:40:05 +0300 Subject: [PATCH] Add ffmpeg to Docker image --- Dockerfile | 6 +++--- Dockerfile.ci | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f85039b..2ab87f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1-alpine AS builder +FROM golang:1-alpine3.12 AS builder RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev@edge_community @@ -7,13 +7,13 @@ COPY . /build WORKDIR /build RUN go build -o /usr/bin/mautrix-whatsapp -FROM alpine:latest +FROM alpine:3.12 ENV UID=1337 \ GID=1337 RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories -RUN apk add --no-cache su-exec ca-certificates olm@edge_community +RUN apk add --no-cache ffmpeg su-exec ca-certificates olm@edge_community COPY --from=builder /usr/bin/mautrix-whatsapp /usr/bin/mautrix-whatsapp COPY --from=builder /build/example-config.yaml /opt/mautrix-whatsapp/example-config.yaml diff --git a/Dockerfile.ci b/Dockerfile.ci index c0147ae..2016702 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,10 +1,10 @@ -FROM alpine:latest +FROM alpine:3.12 ENV UID=1337 \ GID=1337 RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories -RUN apk add --no-cache su-exec ca-certificates olm@edge_community +RUN apk add --no-cache ffmpeg su-exec ca-certificates olm@edge_community ARG EXECUTABLE=./mautrix-whatsapp COPY $EXECUTABLE /usr/bin/mautrix-whatsapp