Skip to content

Commit

Permalink
consistent Docker image creation
Browse files Browse the repository at this point in the history
This ensures that Makefile variables and the "push" target behave the
same in driver-registrar, drivers, external-attacher and
external-provisioner.

Related-to: kubernetes-csi/docs#23
  • Loading branch information
pohly committed May 15, 2018
1 parent 53fe5da commit 38c0e81
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

.PHONY: all csi-attacher clean test

IMAGE_NAME=quay.io/k8scsi/csi-attacher
REGISTRY_NAME=quay.io/k8scsi
IMAGE_NAME=csi-attacher
IMAGE_VERSION=canary
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)

REV=$(shell git describe --long --match='v*' --dirty)

Expand All @@ -36,10 +38,10 @@ clean:
-rm -rf bin

container: csi-attacher
docker build -t $(IMAGE_NAME):$(IMAGE_VERSION) .
docker build -t $(IMAGE_TAG) .

push: container
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
docker push $(IMAGE_TAG)

test:
go test `go list ./... | grep -v 'vendor'` $(TESTARGS)
Expand Down

0 comments on commit 38c0e81

Please sign in to comment.