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

This commit is contained in:
Hidde Beydals 2021-02-11 09:52:22 +01:00 committed by GitHub
commit 2576ec7426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions

View File

@ -2,11 +2,7 @@ FROM golang:1.15-alpine as builder
# These are so as to be able to build with libgit2
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
# Copy the Go Modules manifests
@ -36,8 +32,7 @@ LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-automatio
RUN apk add --no-cache ca-certificates tini
# For libgit2 -- just the runtime libs this time
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 musl~=1.2 libgit2~=1.1
COPY --from=builder /workspace/image-automation-controller /usr/local/bin/