Use musl and libgit2 packages from v3.13 branch
Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
		
							parent
							
								
									bbec5db754
								
							
						
					
					
						commit
						0e7379d6c5
					
				|  | @ -2,11 +2,7 @@ FROM golang:1.15-alpine as builder | ||||||
| 
 | 
 | ||||||
| # These are so as to be able to build with libgit2 | # These are so as to be able to build with libgit2 | ||||||
| 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 | RUN apk add --no-cache musl~=1.2 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 | ||||||
| # Copy the Go Modules manifests | # 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 | RUN apk add --no-cache ca-certificates tini | ||||||
| 
 | 
 | ||||||
| # For libgit2 -- just the runtime libs this time | # 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 musl~=1.2 libgit2~=1.1 | ||||||
| RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main musl~=1.2 |  | ||||||
| 
 | 
 | ||||||
| COPY --from=builder /workspace/image-automation-controller /usr/local/bin/ | COPY --from=builder /workspace/image-automation-controller /usr/local/bin/ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue