Skip to content

Commit 1f5f737

Browse files
committed
Makefile: Avoid hardcoding the quay repository in the release target
Update the release target and avoid hardcoding the quay.io/operator-framework/olm quay repository and instead use the existing IMAGE_REPO variable defined further up in the Makefile. Update how the $(ver) variable is handled and avoid hardcoding the 'v' prefix when overriding that 'ver' variable in the environment. Signed-off-by: timflannagan <[email protected]>
1 parent 26c36d7 commit 1f5f737

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,16 @@ verify: verify-codegen verify-mockgen verify-manifests
220220

221221
# before running release, bump the version in OLM_VERSION and push to master,
222222
# then tag those builds in quay with the version in OLM_VERSION
223-
release: ver=$(shell cat OLM_VERSION)
223+
release: ver=v$(shell cat OLM_VERSION)
224224
release: manifests
225-
docker pull quay.io/operator-framework/olm:v$(ver)
225+
@echo "Generating the $(ver) release"
226+
docker pull $(IMAGE_REPO):$(ver)
226227
$(MAKE) target=upstream ver=$(ver) quickstart=true package
227228

228229
verify-release: release
229230
$(MAKE) diff
230231

231-
package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/operator-framework/olm:v$(ver))
232+
package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' $(IMAGE_REPO):$(ver))
232233
package:
233234
ifndef target
234235
$(error target is undefined)

0 commit comments

Comments
 (0)