@@ -19,6 +19,7 @@ STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
19
19
STAGINGVERSION =${GCE_PD_CSI_STAGING_VERSION}
20
20
DRIVERBINARY =gce-pd-csi-driver
21
21
DRIVERWINDOWSBINARY =${DRIVERBINARY}.exe
22
+ REV =$(shell git describe --long --tags --match='v* ' --dirty 2>/dev/null || git rev-list -n1 HEAD)
22
23
23
24
all : gce-pd-driver
24
25
gce-pd-driver :
@@ -28,12 +29,9 @@ ifndef GCE_PD_CSI_STAGING_VERSION
28
29
endif
29
30
go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/
30
31
31
- build -windows :
32
+ gce-pd-driver -windows :
32
33
mkdir -p bin
33
- ifndef GCE_PD_CSI_STAGING_VERSION
34
- $(error "Must set environment variable GCE_PD_CSI_STAGING_VERSION to staging version")
35
- endif
36
- GOOS=windows go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERWINDOWSBINARY} ./cmd/
34
+ GOOS=windows go build -ldflags -X=main.vendorVersion=$(REV ) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
37
35
38
36
build-container :
39
37
ifndef GCE_PD_CSI_STAGING_IMAGE
@@ -44,6 +42,16 @@ ifndef GCE_PD_CSI_STAGING_VERSION
44
42
endif
45
43
docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
46
44
45
+ build-push-windows-container :
46
+ ifndef GCE_PD_CSI_STAGING_IMAGE
47
+ $(error "Must set enviroment variable GCE_PD_CSI_STAGING_IMAGE to staging image repository")
48
+ endif
49
+ ifndef GCE_PD_CSI_STAGING_VERSION
50
+ $(error "Must set enviroment variable GCE_PD_CSI_STAGING_VERSION to staging version")
51
+ endif
52
+ @sh init-buildx.sh; \
53
+ DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build -f Dockerfile.Windows --platform=windows -t $(STAGINGIMAGE):$(STAGINGVERSION) --push .
54
+
47
55
push-container : build-container
48
56
gcloud docker -- push $(STAGINGIMAGE ) :$(STAGINGVERSION )
49
57
@@ -52,3 +60,4 @@ test-sanity: gce-pd-driver
52
60
53
61
test-k8s-integration :
54
62
go build -o bin/k8s-integration-test ./test/k8s-integration
63
+
0 commit comments