Merge pull request #27 from aryan9600/libgit2-only

fix Dockerfile comments and Makefile test step

Author: stefanprodan

Dockerfile

@@ -1,4 +1,5 @@
-# This Dockerfile tests the hack/Makefile output against git2go.
+# This Dockerfile builds and packages libgit2 linked with openssl and libssh2.
+
 ARG BASE_VARIANT=alpine
 ARG GO_VERSION=1.18
 ARG XX_VERSION=1.1.0

Dockerfile.libgit2-only

@@ -1,4 +1,5 @@
-# This Dockerfile tests the hack/Makefile output against git2go.
+# This Dockerfile builds and packages libgit2 only (not linked with openssl and libssh2)
+
 ARG BASE_VARIANT=alpine
 ARG GO_VERSION=1.17
 ARG XX_VERSION=1.1.0

Dockerfile.test

@@ -1,4 +1,5 @@
-# This Dockerfile tests the hack/Makefile output against git2go.
+# This Dockerfile builds libgit2 linked with openssl and libssh2; and tests it against git2go.
+
 ARG BASE_VARIANT=alpine
 ARG GO_VERSION=1.18
 ARG XX_VERSION=1.1.0

Dockerfile.test-libgit2-only

@@ -1,4 +1,5 @@
-# This Dockerfile tests the hack/Makefile output against git2go.
+# This Dockerfile builds and packages libgit2 only (not linked with openssl and libssh2); and tests it against git2go.
+
 ARG BASE_VARIANT=alpine
 ARG GO_VERSION=1.17
 ARG XX_VERSION=1.1.0

Makefile

@@ -3,9 +3,11 @@ TAG ?= latest
 ifeq ($(LIBGIT2_ONLY),true)
 	IMG ?= ghcr.io/fluxcd/golang-with-libgit2-only
 	DOCKERFILE ?= Dockerfile.libgit2-only
+	TEST_DOCKERFILE ?= Dockerfile.test-libgit2-only
 else
 	IMG ?= ghcr.io/fluxcd/golang-with-libgit2-all
 	DOCKERFILE ?= Dockerfile
+	TEST_DOCKERFILE ?= Dockerfile.test
 endif
 
 PLATFORMS ?= linux/amd64,linux/arm/v7,linux/arm64
@@ -56,9 +58,7 @@ test:
 	docker buildx build \
 		--platform=$(PLATFORMS) \
 		--tag $(IMG):$(TAG)-test \
-		--build-arg LIBGIT2_IMG=$(IMG) \
-		--build-arg LIBGIT2_TAG=$(TAG) \
-		--file $(DOCKERFILE) \
+		--file $(TEST_DOCKERFILE) \
 		$(BUILD_ARGS) .
 
 .PHONY: builder