Skip to content

Commit cd5e074

Browse files
author
Paulo Gomes
committedSep 29, 2022
Bump libgit2 to v0.3.0
Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
1 parent 08ee794 commit cd5e074

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed
 

‎Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GO_VERSION=1.19
33
ARG XX_VERSION=1.1.2
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only
6-
ARG LIBGIT2_TAG=v0.2.0
6+
ARG LIBGIT2_TAG=v0.3.0
77

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

@@ -62,12 +62,12 @@ ARG TARGETARCH
6262
ENV CGO_ENABLED=1
6363

6464
RUN export LIBRARY_PATH="/usr/local/$(xx-info triple)" && \
65-
export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig" && \
66-
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libgit2) -static -fuse-ld=lld" && \
67-
xx-go build \
68-
-ldflags "-s -w" \
69-
-tags 'netgo,osusergo,static_build' \
70-
-o /image-automation-controller -trimpath main.go;
65+
export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig" && \
66+
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libgit2) -static -fuse-ld=lld" && \
67+
xx-go build \
68+
-ldflags "-s -w" \
69+
-tags 'netgo,osusergo,static_build' \
70+
-o /image-automation-controller -trimpath main.go;
7171

7272
# Ensure that the binary was cross-compiled correctly to the target platform.
7373
RUN xx-verify --static /image-automation-controller

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CRD_OPTIONS ?= crd:crdVersions=v1
88

99
# Base image used to build the Go binary
1010
LIBGIT2_IMG ?= ghcr.io/fluxcd/golang-with-libgit2-only
11-
LIBGIT2_TAG ?= v0.2.0
11+
LIBGIT2_TAG ?= v0.3.0
1212

1313
# Allows for defining additional Docker buildx arguments,
1414
# e.g. '--push'.

‎tests/fuzz/oss_fuzz_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -euxo pipefail
1818

19-
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.2.0}"
19+
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.3.0}"
2020
GOPATH="${GOPATH:-/root/go}"
2121
GO_SRC="${GOPATH}/src"
2222
PROJECT_PATH="github.com/fluxcd/image-automation-controller"

0 commit comments

Comments
 (0)