15
15
# Args:
16
16
# GCE_PD_CSI_STAGING_IMAGE: Staging image repository
17
17
REV =$(shell git describe --long --tags --match='v* ' --dirty 2>/dev/null || git rev-list -n1 HEAD)
18
- ifdef GCE_PD_CSI_STAGING_VERSION
19
- STAGINGVERSION=${GCE_PD_CSI_STAGING_VERSION}
20
- else
21
- STAGINGVERSION=${REV}
22
- endif
18
+ GCE_PD_CSI_STAGING_VERSION ?= ${REV}
19
+ STAGINGVERSION =${GCE_PD_CSI_STAGING_VERSION}
23
20
STAGINGIMAGE =${GCE_PD_CSI_STAGING_IMAGE}
24
21
DRIVERBINARY =gce-pd-csi-driver
25
22
DRIVERWINDOWSBINARY =${DRIVERBINARY}.exe
@@ -45,7 +42,7 @@ gce-pd-driver-windows:
45
42
GOOS=windows go build -mod=vendor -ldflags -X=main.version=$(STAGINGVERSION ) -o bin/${DRIVERWINDOWSBINARY} ./cmd/gce-pd-csi-driver/
46
43
47
44
build-container : require-GCE_PD_CSI_STAGING_IMAGE
48
- $(DOCKER ) build --build-arg TAG =$(STAGINGVERSION ) -t $(STAGINGIMAGE ) :$(STAGINGVERSION ) .
45
+ $(DOCKER ) build --build-arg STAGINGVERSION =$(STAGINGVERSION ) -t $(STAGINGIMAGE ) :$(STAGINGVERSION ) .
49
46
50
47
build-and-push-windows-container-ltsc2019 : require-GCE_PD_CSI_STAGING_IMAGE init-buildx
51
48
$(DOCKER ) buildx build --file=Dockerfile.Windows --platform=windows \
@@ -82,7 +79,7 @@ push-container: build-container
82
79
build-and-push-container-linux : require-GCE_PD_CSI_STAGING_IMAGE init-buildx
83
80
$(DOCKER ) buildx build --platform=linux \
84
81
-t $(STAGINGIMAGE ) :$(STAGINGVERSION ) _linux \
85
- --build-arg TAG =$(STAGINGVERSION ) --push .
82
+ --build-arg STAGINGVERSION =$(STAGINGVERSION ) --push .
86
83
87
84
test-sanity : gce-pd-driver
88
85
go test -mod=vendor --v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
0 commit comments