Skip to content

Commit 9c416f9

Browse files
committed
feat: generalize container tool usage in bundle build target
1 parent f01ea54 commit 9c416f9

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
entries:
2+
- description: >
3+
The bundle build target now respects the CONTAINER_TOOL variable, allowing users to use alternative container tools like podman instead of docker.
4+
kind: "change"
5+
breaking: false

internal/plugins/manifests/v2/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
241241
makefileBundleBuildPushFragment = `
242242
.PHONY: bundle-build
243243
bundle-build: ## Build the bundle image.
244-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
244+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
245245
246246
.PHONY: bundle-push
247247
bundle-push: ## Push the bundle image.
@@ -303,7 +303,7 @@ endif
303303
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
304304
.PHONY: catalog-build
305305
catalog-build: opm ## Build a catalog image.
306-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
306+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
307307
308308
# Push the catalog image.
309309
.PHONY: catalog-push

0 commit comments

Comments
 (0)