fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from fluxcd/arm-debug 

Upgrade to `musl>=1.2.0` to be able to provide ARMv7 build
This commit is contained in:
Philip Laine 2020-12-10 00:19:43 +01:00 committed by GitHub
parent 00309185ec 3feda81109
commit af4e48937a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/run-tests/Dockerfile vendored
View File

@ -2,7 +2,7 @@ FROM golang:1.15-alpine
# Add any build or testing essential system packages # Add any build or testing essential system packages
RUN apk add --no-cache build-base git pkgconf RUN apk add --no-cache build-base git pkgconf
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1.0 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1
# Use the GitHub Actions uid:gid combination for proper fs permissions # Use the GitHub Actions uid:gid combination for proper fs permissions
RUN addgroup -g 116 -S test && adduser -u 1001 -S -g test test RUN addgroup -g 116 -S test && adduser -u 1001 -S -g test test

8
Dockerfile
View File

@ -2,7 +2,11 @@
FROM golang:1.15-alpine as builder FROM golang:1.15-alpine as builder
RUN apk add gcc pkgconfig libc-dev 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.0 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
WORKDIR /workspace WORKDIR /workspace
@ -31,7 +35,7 @@ FROM alpine:3.12
LABEL org.opencontainers.image.source="https://github.com/fluxcd/source-controller" LABEL org.opencontainers.image.source="https://github.com/fluxcd/source-controller"
RUN apk add --no-cache ca-certificates tini RUN apk add --no-cache ca-certificates tini
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev~=1.1.0 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2~=1.1
COPY --from=builder /workspace/source-controller /usr/local/bin/ COPY --from=builder /workspace/source-controller /usr/local/bin/