Merge pull request #289 from fluxcd/alpine-3-13-pkgs

Use musl and libgit2 packages from v3.13 branch
This commit is contained in:
Hidde Beydals 2021-02-11 09:52:10 +01:00 committed by GitHub
commit c32d11c23b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions

View File

@ -2,11 +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
# TODO: replace with non-edge musl 1.2.x when made available
# musl 1.2.x is a strict requirement of libgit2 due to time_t changes
# ref: https://musl.libc.org/time64.html
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2
RUN apk add --no-cache musl~=1.2 libgit2-dev~=1.1
WORKDIR /workspace
@ -34,9 +30,7 @@ FROM alpine:3.13
# link repo to the GitHub Container Registry image
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
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2
RUN apk add --no-cache ca-certificates tini libgit2~=1.1 musl~=1.2
COPY --from=builder /workspace/source-controller /usr/local/bin/