Skip to content

Commit

Permalink
Merge pull request #405 from aramase/bump-v0.0.18
Browse files Browse the repository at this point in the history
chore: bump driver version to v0.0.18
  • Loading branch information
k8s-ci-robot authored Dec 10, 2020
2 parents b6239d6 + a8ff299 commit b2d2640
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ REGISTRY?=docker.io/deislabs
REGISTRY_NAME = $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
GIT_COMMIT ?= $(shell git rev-parse HEAD)
IMAGE_NAME=secrets-store-csi
IMAGE_VERSION?=v0.0.17
IMAGE_VERSION?=v0.0.18
E2E_IMAGE_VERSION = v0.1.0-e2e-$(GIT_COMMIT)
# Use a custom version for E2E tests if we are testing in CI
ifdef CI
Expand Down
4 changes: 3 additions & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

REGISTRY?=docker.io/deislabs
IMAGE_NAME=driver
IMAGE_VERSION?=v0.0.17
IMAGE_VERSION?=v0.0.18
BUILD_TIMESTAMP := $(shell date +%Y-%m-%d-%H:%M)
BUILD_COMMIT := $(shell git rev-parse --short HEAD)
IMAGE_TAG=$(REGISTRY)/$(IMAGE_NAME):$(IMAGE_VERSION)
export

Expand Down
9 changes: 7 additions & 2 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ TASK=$1

pushd `dirname "$0"`

LDFLAGS="-X sigs.k8s.io/secrets-store-csi-driver/pkg/secrets-store.vendorVersion=${IMAGE_VERSION} -extldflags '-static'"
LDFLAGS="-X sigs.k8s.io/secrets-store-csi-driver/pkg/version.BuildVersion=${IMAGE_VERSION} \
-X sigs.k8s.io/secrets-store-csi-driver/pkg/version.Vcs=${BUILD_COMMIT} \
-X sigs.k8s.io/secrets-store-csi-driver/pkg/version.BuildTime=${BUILD_TIMESTAMP} -extldflags '-static'"

# Returns list of all supported architectures from the BASEIMAGE file
listOsArchs() {
Expand Down Expand Up @@ -71,7 +73,10 @@ docker_version_check() {
build_and_push() {
docker_version_check

docker buildx create --name img-builder --use
# only moby/buildkit:foreign-mediatype works on building Windows image now
# https://github.com/moby/buildkit/pull/1879
# Github issue: https://github.com/moby/buildkit/issues/1877
docker buildx create --name img-builder --use --driver-opt image=moby/buildkit:v0.7.2
trap "docker buildx rm img-builder" EXIT

os_archs=$(listOsArchs)
Expand Down

0 comments on commit b2d2640

Please sign in to comment.