internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-27 05:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lookup version from git when building bundle / catalog

Browse Source 
VERSION = "latest" breaks `make bundle` and `make catalog`.
This commit is contained in:
Shane McDonald
2021-10-13 14:55:50 -04:00
parent eaff6898a4
commit 7fd4d46f6e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -120,6 +120,7 @@ endif
endif
.PHONY: bundle
bundle: VERSION ?= $(shell git describe --tags)
bundle: kustomize ## Generate bundle manifests and metadata, then validate generated files.
operator-sdk generate kustomize manifests -q
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
@@ -127,10 +128,12 @@ bundle: kustomize ## Generate bundle manifests and metadata, then validate gener
operator-sdk bundle validate ./bundle
.PHONY: bundle-build
bundle-build: VERSION ?= $(shell git describe --tags)
bundle-build: ## Build the bundle image.
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
.PHONY: bundle-push
bundle-push: VERSION ?= $(shell git describe --tags)
bundle-push: ## Push the bundle image.
$(MAKE) docker-push IMG=$(BUNDLE_IMG)
@@ -166,10 +169,12 @@ endif
# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
.PHONY: catalog-build
catalog-build: VERSION ?= $(shell git describe --tags)
catalog-build: opm ## Build a catalog image.
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
# Push the catalog image.
.PHONY: catalog-push
catalog-push: VERSION ?= $(shell git describe --tags)
catalog-push: ## Push a catalog image.
$(MAKE) docker-push IMG=$(CATALOG_IMG)