Skip to content

Commit 0ce70a7

Browse files
committed
chore: change deprecated make targets to buildah targets
1 parent 03d77b8 commit 0ce70a7

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Makefile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ run: apikey manifests generate fmt vet ## Run a controller from your host.
154154

155155
##@ Conatiner-related tasks
156156
.PHONY: buildah-manifest
157-
buildah-manifest: ## creates the buildah manifest for multi-arch images
157+
buildah-manifest: apikey ## creates the buildah manifest for multi-arch images
158158
# The rm is needed due to bug https://www.github.com/containers/podman/issues/19757
159159
buildah manifest rm "${REGISTRY}/${OPERATOR_IMG}" || /bin/true
160160
buildah manifest create "${REGISTRY}/${OPERATOR_IMG}"
@@ -172,22 +172,21 @@ podman-build-arm64: buildah-manifest ## build the container in arm64
172172
buildah manifest add --arch=arm64 "${REGISTRY}/${OPERATOR_IMG}" "${REGISTRY}/${OPERATOR_IMG}-arm64"
173173

174174
.PHONY: buildah-push
175-
buildah-push: ## Uploads the container to quay.io/validatedpatterns/${CONTAINER}
175+
buildah-push: ## Uploads the container to quay.io/validatedpatterns/${OPERATOR_IMG}
176176
@echo "Uploading the ${REGISTRY}/${OPERATOR_IMG} container to ${UPLOADREGISTRY}/${OPERATOR_IMG}"
177177
buildah manifest push --all "${REGISTRY}/${OPERATOR_IMG}" "docker://${UPLOADREGISTRY}/${OPERATOR_IMG}"
178178

179-
.PHONY: docker-build
180-
docker-build: apikey ## Build docker image with the manager.
181-
docker build --secret id=apikey,src=$(APIKEYFILE) --platform $(CONTAINER_OS)/$(CONTAINER_PLATFORM) -t ${IMG} .
182-
183-
.PHONY: docker-push
184-
docker-push: ## Push docker image with the manager.
185-
docker push ${IMG}
186-
187179
.PHONY: golangci-lint
188180
golangci-lint: apikey ## Run golangci-lint locally
189181
podman run --pull=newer --rm -v $(PWD):/app:rw,z -w /app golangci/golangci-lint:v$(GOLANGCI_VERSION) golangci-lint run -v
190182

183+
##@ Legacy docker tasks
184+
.PHONY: docker-build
185+
docker-build: apikey podman-build-amd64 ## Build docker image with the manager.
186+
187+
.PHONY: docker-push
188+
docker-push: buildah-push ## Push docker image with the manager.
189+
191190
##@ Deployment
192191

193192
ifndef ignore-not-found

0 commit comments

Comments
 (0)