Skip to content
This repository was archived by the owner on Dec 3, 2024. It is now read-only.

tidy up build and make configs #88

Merged
merged 1 commit into from
Sep 19, 2023
Merged

tidy up build and make configs #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ DOCKER ?= docker
## Platform for 'build'
PLATFORM ?= linux/$(GOARCH)

## Platform list for multi-arch 'buildx' build
BUILDX_PLATFORMS ?= linux/amd64,linux/arm64

## Image tag for all builds
IMAGE_TAG ?= cosi-controller:latest

Expand All @@ -25,8 +22,7 @@ IMAGE_TAG ?= cosi-controller:latest
.PHONY: build
## Build local image for development, defaulting linux/<hostarch>
build:
# $(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .
true # return true temporarily to allow prow to succeed
$(DOCKER) build --platform $(PLATFORM) --tag $(IMAGE_TAG) .

.PHONY: test
## Test packages
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# K8s infra build example: https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md
# GCloud build docs: https://cloud.google.com/cloud-build/docs/build-config
# Builds go to https://console.cloud.google.com/gcr/images/k8s-staging-test-infra/global/
# Builds go to https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/GLOBAL
# Build logs in https://testgrid.k8s.io/sig-storage-image-build
timeout: 3000s
options:
Expand Down