File tree 3 files changed +11
-4
lines changed
3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ REGISTRY?=docker.io/deislabs
16
16
REGISTRY_NAME = $(shell echo $(REGISTRY ) | sed "s/.azurecr.io//g")
17
17
GIT_COMMIT ?= $(shell git rev-parse HEAD)
18
18
IMAGE_NAME =secrets-store-csi
19
- IMAGE_VERSION? =v0.0.17
19
+ IMAGE_VERSION? =v0.0.18
20
20
E2E_IMAGE_VERSION = v0.1.0-e2e-$(GIT_COMMIT )
21
21
# Use a custom version for E2E tests if we are testing in CI
22
22
ifdef CI
Original file line number Diff line number Diff line change 14
14
15
15
REGISTRY? =docker.io/deislabs
16
16
IMAGE_NAME =driver
17
- IMAGE_VERSION? =v0.0.17
17
+ IMAGE_VERSION? =v0.0.18
18
+ BUILD_TIMESTAMP := $(shell date +% Y-% m-% d-% H:% M)
19
+ BUILD_COMMIT := $(shell git rev-parse --short HEAD)
18
20
IMAGE_TAG =$(REGISTRY ) /$(IMAGE_NAME ) :$(IMAGE_VERSION )
19
21
export
20
22
Original file line number Diff line number Diff line change @@ -22,7 +22,9 @@ TASK=$1
22
22
23
23
pushd ` dirname " $0 " `
24
24
25
- LDFLAGS=" -X sigs.k8s.io/secrets-store-csi-driver/pkg/secrets-store.vendorVersion=${IMAGE_VERSION} -extldflags '-static'"
25
+ LDFLAGS=" -X sigs.k8s.io/secrets-store-csi-driver/pkg/version.BuildVersion=${IMAGE_VERSION} \
26
+ -X sigs.k8s.io/secrets-store-csi-driver/pkg/version.Vcs=${BUILD_COMMIT} \
27
+ -X sigs.k8s.io/secrets-store-csi-driver/pkg/version.BuildTime=${BUILD_TIMESTAMP} -extldflags '-static'"
26
28
27
29
# Returns list of all supported architectures from the BASEIMAGE file
28
30
listOsArchs () {
@@ -71,7 +73,10 @@ docker_version_check() {
71
73
build_and_push () {
72
74
docker_version_check
73
75
74
- docker buildx create --name img-builder --use
76
+ # only moby/buildkit:foreign-mediatype works on building Windows image now
77
+ # https://github.com/moby/buildkit/pull/1879
78
+ # Github issue: https://github.com/moby/buildkit/issues/1877
79
+ docker buildx create --name img-builder --use --driver-opt image=moby/buildkit:v0.7.2
75
80
trap " docker buildx rm img-builder" EXIT
76
81
77
82
os_archs=$( listOsArchs)
You can’t perform that action at this time.
0 commit comments