tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Stop using alpine edge for some packages in dockerfile

Browse source
This commit is contained in:
Tulir Asokan 2020-10-19 01:45:53 +03:00
parent b76b9ce790
commit 22023404bc
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -1,7 +1,6 @@
FROM golang:1-alpine3.12 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
RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev@edge_community
COPY . /build COPY . /build
WORKDIR /build WORKDIR /build
@ -15,8 +14,7 @@ ARG YQ_DOWNLOAD_ADDR=https://github.com/mikefarah/yq/releases/download/3.3.2/yq_
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 apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl && \
RUN apk add --no-cache ffmpeg su-exec ca-certificates olm@edge_community bash jq curl && \
curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \ curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \
chmod +x yq && mv yq /usr/bin/yq chmod +x yq && mv yq /usr/bin/yq

3
Dockerfile.ci
View file

@ -6,8 +6,7 @@ ARG YQ_DOWNLOAD_ADDR=https://github.com/mikefarah/yq/releases/download/3.3.2/yq_
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 apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl && \
RUN apk add --no-cache ffmpeg su-exec ca-certificates olm@edge_community bash jq curl && \
curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \ curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \
chmod +x yq && mv yq /usr/bin/yq chmod +x yq && mv yq /usr/bin/yq