Skip to content

Commit 1a11e7c

Browse files
committed
chore: regenerate dependent files
Signed-off-by: Roland Huß <[email protected]>
1 parent c77de01 commit 1a11e7c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

testdata/go/v4/memcached-operator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
279279

280280
.PHONY: bundle-build
281281
bundle-build: ## Build the bundle image.
282-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
282+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
283283

284284
.PHONY: bundle-push
285285
bundle-push: ## Push the bundle image.
@@ -319,7 +319,7 @@ endif
319319
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
320320
.PHONY: catalog-build
321321
catalog-build: opm ## Build a catalog image.
322-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
322+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
323323

324324
# Push the catalog image.
325325
.PHONY: catalog-push

testdata/go/v4/monitoring/memcached-operator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
294294

295295
.PHONY: bundle-build
296296
bundle-build: ## Build the bundle image.
297-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
297+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
298298

299299
.PHONY: bundle-push
300300
bundle-push: ## Push the bundle image.
@@ -334,7 +334,7 @@ endif
334334
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
335335
.PHONY: catalog-build
336336
catalog-build: opm ## Build a catalog image.
337-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
337+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
338338

339339
# Push the catalog image.
340340
.PHONY: catalog-push

testdata/helm/memcached-operator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
180180

181181
.PHONY: bundle-build
182182
bundle-build: ## Build the bundle image.
183-
docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
183+
$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
184184

185185
.PHONY: bundle-push
186186
bundle-push: ## Push the bundle image.
@@ -219,7 +219,7 @@ endif
219219
# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
220220
.PHONY: catalog-build
221221
catalog-build: opm ## Build a catalog image.
222-
$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
222+
$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
223223

224224
# Push the catalog image.
225225
.PHONY: catalog-push

0 commit comments

Comments
 (0)