Skip to content

Commit

Permalink
Merge pull request #289 from fluxcd/alpine-3-13-pkgs
Browse files Browse the repository at this point in the history
Use musl and libgit2 packages from v3.13 branch
  • Loading branch information
hiddeco authored Feb 11, 2021
2 parents b501172 + 15ecae6 commit c32d11c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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/

Expand Down

0 comments on commit c32d11c

Please sign in to comment.