internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-06 21:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #613 from shanemcd/obtain-version-from-git

Browse Source 
Obtain version from git
This commit is contained in:
Shane McDonald
2021-10-18 17:56:01 -04:00
committed by GitHub
parent 3d6094a5b0 2e74c63c9e
commit c8d4ae16bb
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= latest
VERSION ?= $(shell git describe --tags)
# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -120,7 +120,6 @@ 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)
@@ -129,12 +128,10 @@ 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)
@@ -170,12 +167,10 @@ 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)