Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove more bazel defaults #665

Merged
merged 1 commit into from
Mar 14, 2019
Merged

Remove more bazel defaults #665

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
3 changes: 0 additions & 3 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
build --define=MANAGER_IMAGE_NAME=cluster-api-aws-controller
build --define=MANAGER_IMAGE_TAG=0.0.4

build --workspace_status_command=./hack/print-workspace-status.sh
build --verbose_failures

Expand Down
14 changes: 13 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,25 @@

# A release should define this with gcr.io/cluster-api-provider-aws
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)

# A release should define this with IfNotPresent
PULL_POLICY ?= Always

# A release does not need to define this
MANAGER_IMAGE_NAME ?= cluster-api-aws-controller

# A release should define this with the next version after 0.0.4
MANAGER_IMAGE_TAG ?= dev

## Image URL to use all building/pushing image targets
DEPCACHEAGE ?= 24h # Enables caching for Dep
BAZEL_ARGS ?=
BAZEL_BUILD_ARGS := --define=REGISTRY=$(REGISTRY) --define=PULL_POLICY=$(PULL_POLICY) $(BAZEL_ARGS)

BAZEL_BUILD_ARGS := --define=REGISTRY=$(REGISTRY)\
--define=PULL_POLICY=$(PULL_POLICY)\
--define=MANAGER_IMAGE_NAME=$(MANAGER_IMAGE_NAME)\
--define=MANAGER_IMAGE_TAG=$(MANAGER_IMAGE_TAG)\
$(BAZEL_ARGS)

# Bazel variables
BAZEL_VERSION := $(shell command -v bazel 2> /dev/null)
Expand Down