Skip to content

Commit c32d11c

Browse files
authored
Merge pull request #289 from fluxcd/alpine-3-13-pkgs
Use musl and libgit2 packages from v3.13 branch
2 parents b501172 + 15ecae6 commit c32d11c

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Dockerfile

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

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

@@ -34,9 +30,7 @@ FROM alpine:3.13
3430
# link repo to the GitHub Container Registry image
3531
LABEL org.opencontainers.image.source="https://github.com/fluxcd/source-controller"
3632

37-
RUN apk add --no-cache ca-certificates tini
38-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2~=1.1
39-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2
33+
RUN apk add --no-cache ca-certificates tini libgit2~=1.1 musl~=1.2
4034

4135
COPY --from=builder /workspace/source-controller /usr/local/bin/
4236

0 commit comments

Comments
 (0)