Skip to content

Commit 0e7379d

Browse files
committed
Use musl and libgit2 packages from v3.13 branch
Signed-off-by: Hidde Beydals <[email protected]>
1 parent bbec5db commit 0e7379d

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ FROM golang:1.15-alpine as builder
22

33
# These are so as to be able to build with libgit2
44
RUN apk add gcc pkgconfig libc-dev
5-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1
6-
# TODO: replace with non-edge musl 1.2.x when made available
7-
# musl 1.2.x is a strict requirement of libgit2 due to time_t changes
8-
# ref: https://musl.libc.org/time64.html
9-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2
5+
RUN apk add --no-cache musl~=1.2 libgit2-dev~=1.1
106

117
WORKDIR /workspace
128
# Copy the Go Modules manifests
@@ -36,8 +32,7 @@ LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-automatio
3632
RUN apk add --no-cache ca-certificates tini
3733

3834
# For libgit2 -- just the runtime libs this time
39-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2~=1.1
40-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2
35+
RUN apk add --no-cache musl~=1.2 libgit2~=1.1
4136

4237
COPY --from=builder /workspace/image-automation-controller /usr/local/bin/
4338

0 commit comments

Comments
 (0)