Skip to content

Commit

Permalink
Merge pull request #814 from gibizer/do-not-run-functional-during-build
Browse files Browse the repository at this point in the history
Do not run functional test during docker build
  • Loading branch information
openshift-merge-bot[bot] authored May 28, 2024
2 parents 6daae48 + 451c174 commit fdacb40
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
go run ./main.go -metrics-bind-address ":$(METRICS_PORT)" -health-probe-bind-address ":$(HEALTH_PORT)"

.PHONY: docker-build
docker-build: test ## Build docker image with the manager.
docker-build: ## Build docker image with the manager.
podman build -t ${IMG} . ${DOCKER_BUILD_ARGS}

.PHONY: docker-push
Expand All @@ -171,7 +171,7 @@ docker-push: ## Push docker image with the manager.
# To properly provided solutions that supports more than one platform you should use this option.
PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
.PHONY: docker-buildx
docker-buildx: test ## Build and push docker image for the manager for cross-platform support
docker-buildx: ## Build and push docker image for the manager for cross-platform support
# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
- docker buildx create --name project-v3-builder
Expand Down

0 comments on commit fdacb40

Please sign in to comment.