Skip to content

Commit a8ff299

Browse files
committed
chore: bump driver version to v0.0.18
1 parent b6239d6 commit a8ff299

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ REGISTRY?=docker.io/deislabs
1616
REGISTRY_NAME = $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
1717
GIT_COMMIT ?= $(shell git rev-parse HEAD)
1818
IMAGE_NAME=secrets-store-csi
19-
IMAGE_VERSION?=v0.0.17
19+
IMAGE_VERSION?=v0.0.18
2020
E2E_IMAGE_VERSION = v0.1.0-e2e-$(GIT_COMMIT)
2121
# Use a custom version for E2E tests if we are testing in CI
2222
ifdef CI

docker/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414

1515
REGISTRY?=docker.io/deislabs
1616
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)
1820
IMAGE_TAG=$(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
1921
export
2022

docker/build.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ TASK=$1
2222

2323
pushd `dirname "$0"`
2424

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'"
2628

2729
# Returns list of all supported architectures from the BASEIMAGE file
2830
listOsArchs() {
@@ -71,7 +73,10 @@ docker_version_check() {
7173
build_and_push() {
7274
docker_version_check
7375

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
7580
trap "docker buildx rm img-builder" EXIT
7681

7782
os_archs=$(listOsArchs)

0 commit comments

Comments
 (0)