No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/Makefile b/Makefile
	index 2ac0193..ae59895 100644
	--- a/Makefile
	+++ b/Makefile
	@@ -1,16 +1,18 @@
	-REGISTRY_NAME?=docker.io/hashicorp
	-VERSION=1.7.0
	-IMAGE_TAG_ENT=$(REGISTRY_NAME)/vault-enterprise:$(VERSION)_ent
	-IMAGE_TAG_OSS=$(REGISTRY_NAME)/vault:$(VERSION)
	+export REGISTRY_NAME?=docker.io/hashicorp
	+export VERSION=1.7.0

	.PHONY: build ent-image oss-image

	build: ent-image oss-image

	+ent-image: export PROJECT_NAME=vault-enterprise
	+ent-image: export TAG_SUFFIX=_ent
	ent-image:
	- docker build --build-arg VAULT_VERSION=$(VERSION)+ent --no-cache -t $(IMAGE_TAG_ENT) .
	- docker tag $(IMAGE_TAG_ENT) $(REGISTRY_NAME)/vault-enterprise:latest
	+ docker build --label version=$(VERSION) --build-arg VAULT_VERSION=$(VERSION)+ent --no-cache -t $(REGISTRY_NAME)/$(PROJECT_NAME):$(VERSION)$(TAG_SUFFIX) .
	+ @../scripts/tag-images.sh

	+oss-image: export PROJECT_NAME=vault
	oss-image:
	- docker build --build-arg VAULT_VERSION=$(VERSION) --no-cache -t $(IMAGE_TAG_OSS) .
	- docker tag $(IMAGE_TAG_OSS) $(REGISTRY_NAME)/vault:latest
	+ docker build --label version=$(VERSION) --build-arg VAULT_VERSION=$(VERSION) --no-cache -t $(REGISTRY_NAME)/$(PROJECT_NAME):$(VERSION) .
	+ @../scripts/tag-images.sh
	+