From 22023404bcec78254a600082277cd39155e4e104 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 19 Oct 2020 01:45:53 +0300 Subject: [PATCH] Stop using alpine edge for some packages in dockerfile --- Dockerfile | 6 ++---- Dockerfile.ci | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd06613..7ff17b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ 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 +RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev COPY . /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 \ 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@edge_community bash jq curl && \ +RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl && \ curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \ chmod +x yq && mv yq /usr/bin/yq diff --git a/Dockerfile.ci b/Dockerfile.ci index d2fdda8..1f7ec81 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,8 +6,7 @@ ARG YQ_DOWNLOAD_ADDR=https://github.com/mikefarah/yq/releases/download/3.3.2/yq_ 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 ffmpeg su-exec ca-certificates olm@edge_community bash jq curl && \ +RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl && \ curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \ chmod +x yq && mv yq /usr/bin/yq