Add build image arg

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>

.github/workflows/docker_main.yml

@@ -24,6 +24,11 @@ jobs:
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
+<<<<<<< HEAD
+=======
+            --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+>>>>>>> 66e0aba (Add build image arg)
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
 
       - name: Tag release

.github/workflows/docker_release.yml

@@ -16,6 +16,11 @@ jobs:
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
+<<<<<<< HEAD
+=======
+            --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+>>>>>>> 66e0aba (Add build image arg)
             --tag ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/} \
             --tag ghcr.io/hyperledger/firefly-fabconnect:head \
             .

.github/workflows/go.yml

@@ -42,4 +42,9 @@ jobs:
             --label commit=$GITHUB_SHA \
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
+<<<<<<< HEAD
+=======
+            --build-arg BASE_IMAGE=alpine:3.19 \
+            --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 \
+>>>>>>> 66e0aba (Add build image arg)
             --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .

Dockerfile

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 FROM golang:1.21-alpine3.19 AS fabconnect-builder
+=======
+ARG BASE_IMAGE
+ARG BUILD_IMAGE
+
+FROM ${BUILD_IMAGE} AS fabconnect-builder
+>>>>>>> 66e0aba (Add build image arg)
 RUN apk add make
 ADD . /fabconnect
 WORKDIR /fabconnect

Makefile

@@ -26,6 +26,11 @@ firefly-fabconnect: ${GOFILES}
 	$(VGO) build -o ${BINARY_NAME} -ldflags "-X main.buildDate=`date -u +\"%Y-%m-%dT%H:%M:%SZ\"` -X main.buildVersion=$(BUILD_VERSION)" -tags=prod -tags=prod -v
 go-mod-tidy: .ALWAYS
 	go mod tidy
+<<<<<<< HEAD
+=======
+docker:
+	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.21-alpine3.19 -t hyperledger/firefly-fabconnect .
+>>>>>>> 66e0aba (Add build image arg)
 build: firefly-fabconnect-nocgo firefly-fabconnect
 .ALWAYS: ;
 clean: