Skip to content

Commit b434578

Browse files
author
Paulo Gomes
committed
Update libgit2 to v0.1.2
Signed-off-by: Paulo Gomes <[email protected]>
1 parent 4536554 commit b434578

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GO_VERSION=1.17
33
ARG XX_VERSION=1.1.0
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-all
6-
ARG LIBGIT2_TAG=v0.1.1
6+
ARG LIBGIT2_TAG=v0.1.2
77

88
FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} AS libgit2-libs
99

@@ -82,10 +82,10 @@ ENV CGO_ENABLED=1
8282

8383
# Instead of using xx-go, (cross) compile with vanilla go leveraging musl tool chain.
8484
RUN export $(cat build/musl/$(xx-info alpine-arch).env | xargs) && \
85-
export LIBRARY_PATH="/usr/local/$(xx-info triple):/usr/local/$(xx-info triple)/lib64" && \
86-
export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig:/usr/local/$(xx-info triple)/lib64/pkgconfig" && \
87-
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libssh2 openssl libgit2) -static" && \
88-
GOARCH=$TARGETARCH go build \
85+
export LIBRARY_PATH="/usr/local/$(xx-info triple):/usr/local/$(xx-info triple)/lib64" && \
86+
export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig:/usr/local/$(xx-info triple)/lib64/pkgconfig" && \
87+
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libssh2 openssl libgit2) -static" && \
88+
GOARCH=$TARGETARCH go build \
8989
-ldflags "-s -w" \
9090
-tags 'netgo,osusergo,static_build' \
9191
-o /source-controller -trimpath main.go;
@@ -98,7 +98,7 @@ FROM alpine:3.16
9898

9999
ARG TARGETPLATFORM
100100
RUN apk --no-cache add ca-certificates \
101-
&& update-ca-certificates
101+
&& update-ca-certificates
102102

103103
# Create minimal nsswitch.conf file to prioritize the usage of /etc/hosts over DNS queries.
104104
# https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TAG ?= latest
44

55
# Base image used to build the Go binary
66
LIBGIT2_IMG ?= ghcr.io/fluxcd/golang-with-libgit2-all
7-
LIBGIT2_TAG ?= v0.1.1
7+
LIBGIT2_TAG ?= v0.1.2
88

99
# Allows for defining additional Go test args, e.g. '-tags integration'.
1010
GO_TEST_ARGS ?= -race

tests/fuzz/oss_fuzz_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -euxo pipefail
1818

19-
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.1}"
19+
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.2}"
2020
GOPATH="${GOPATH:-/root/go}"
2121
GO_SRC="${GOPATH}/src"
2222
PROJECT_PATH="github.com/fluxcd/source-controller"

0 commit comments

Comments
 (0)