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

Jump to bottom

Move variable definitions above include of common makefile. #935

Merged
merged 1 commit into from Apr 19, 2021
Merged

Move variable definitions above include of common makefile. #935

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
@@ -1,8 +1,11 @@
PACKAGE_NAME?=github.com/projectcalico/node
GO_BUILD_VER?=v0.51

# This needs to be evaluated before the common makefile is included.
# This var contains some default values that the common makefile may append to.
# These need to be defined before the common makefile is included due to the way
# the common makefile expands certain variables. (If they are not pre-defined then
# the variables won't expand correctly in pre-requisites.)
BUILD_IMAGE?=calico/node
RELEASE_IMAGES?=gcr.io/projectcalico-org/node eu.gcr.io/projectcalico-org/node asia.gcr.io/projectcalico-org/node us.gcr.io/projectcalico-org/node
PUSH_IMAGES?=$(BUILD_IMAGE) quay.io/calico/node

ORGANIZATION=projectcalico
Expand Down Expand Up @@ -45,9 +48,6 @@ include Makefile.common

###############################################################################

BUILD_IMAGE?=calico/node
RELEASE_IMAGES?=gcr.io/projectcalico-org/node eu.gcr.io/projectcalico-org/node asia.gcr.io/projectcalico-org/node us.gcr.io/projectcalico-org/node

# Versions and location of dependencies used in the build.
BIRD_VERSION=v0.3.3-167-g0a2f8d2d
BIRD_IMAGE ?= calico/bird:$(BIRD_VERSION)-$(ARCH)
Expand Down