watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ffmpeg to Docker image

Browse Source
This commit is contained in:
Tulir Asokan 2020-06-23 16:40:05 +03:00
parent 3fe9289f91
commit 50132ae274
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -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 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 RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev@edge_community
@ -7,13 +7,13 @@ COPY . /build
WORKDIR /build WORKDIR /build
RUN go build -o /usr/bin/mautrix-whatsapp RUN go build -o /usr/bin/mautrix-whatsapp
FROM alpine:latest FROM alpine:3.12
ENV UID=1337 \ ENV UID=1337 \
GID=1337 GID=1337
RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories 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 /usr/bin/mautrix-whatsapp /usr/bin/mautrix-whatsapp
COPY --from=builder /build/example-config.yaml /opt/mautrix-whatsapp/example-config.yaml COPY --from=builder /build/example-config.yaml /opt/mautrix-whatsapp/example-config.yaml

4
Dockerfile.ci
View File

@ -1,10 +1,10 @@
FROM alpine:latest FROM alpine:3.12
ENV UID=1337 \ ENV UID=1337 \
GID=1337 GID=1337
RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories 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 ARG EXECUTABLE=./mautrix-whatsapp
COPY $EXECUTABLE /usr/bin/mautrix-whatsapp COPY $EXECUTABLE /usr/bin/mautrix-whatsapp