From 38e2e58c545f3660156e82521fe942460db029b8 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 9 Dec 2020 16:55:24 +0100 Subject: [PATCH] Use semver tidle range for `libgit2-dev` package Signed-off-by: Hidde Beydals --- .github/actions/run-tests/Dockerfile | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile index c096a0b9..e5f1c131 100644 --- a/.github/actions/run-tests/Dockerfile +++ b/.github/actions/run-tests/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.15-alpine # Add any build or testing essential system packages RUN apk add --no-cache build-base git pkgconf -RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev=1.1.0-r1 +RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1.0 # Use the GitHub Actions uid:gid combination for proper fs permissions RUN addgroup -g 116 -S test && adduser -u 1001 -S -g test test diff --git a/Dockerfile b/Dockerfile index 287048e6..93c8c112 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.15-alpine as builder RUN apk add gcc pkgconfig libc-dev -RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev=1.1.0-r1 +RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1.0 WORKDIR /workspace @@ -31,7 +31,7 @@ FROM alpine:3.12 LABEL org.opencontainers.image.source="https://github.com/fluxcd/source-controller" RUN apk add --no-cache ca-certificates tini -RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2=1.1.0-r1 +RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1.0 COPY --from=builder /workspace/source-controller /usr/local/bin/