Skip to content

Commit 1ab7626

Browse files
author
Paulo Gomes
committed
Bump libgit2 image to v0.3.0
Signed-off-by: Paulo Gomes <[email protected]>
1 parent ac80849 commit 1ab7626

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Dockerfile

+6-6
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

@@ -64,11 +64,11 @@ ENV CGO_ENABLED=1
6464

6565
# Instead of using xx-go, (cross) compile with vanilla go leveraging musl tool chain.
6666
RUN export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig" && \
67-
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libgit2) -static -fuse-ld=lld" && \
68-
xx-go build \
69-
-ldflags "-s -w" \
70-
-tags 'netgo,osusergo,static_build' \
71-
-o /source-controller -trimpath main.go;
67+
export CGO_LDFLAGS="$(pkg-config --static --libs --cflags libgit2) -static -fuse-ld=lld" && \
68+
xx-go build \
69+
-ldflags "-s -w" \
70+
-tags 'netgo,osusergo,static_build' \
71+
-o /source-controller -trimpath main.go;
7272

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

Makefile

+1-1
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-only
7-
LIBGIT2_TAG ?= v0.2.0
7+
LIBGIT2_TAG ?= v0.3.0
88

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

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/source-controller"

0 commit comments

Comments
 (0)