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

calico_node/Makefile: Fix build of startup #899

Merged
merged 1 commit into from
Jul 10, 2017
Merged

calico_node/Makefile: Fix build of startup #899

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
11 changes: 5 additions & 6 deletions calico_node/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ VERSIONS_FILE?=$(CALICO_NODE_DIR)/../_data/versions.yml
# For local builds this can be made faster by running "go get github.com/mikefarah/yaml" and changing YAML_CMD to "yaml"
YAML_CMD?=$(shell which yaml || echo docker run -i calico/go-build yaml)
CALICO_VER := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].title')
CALICO_GIT_VER := $(shell git describe --tags --dirty --always)
CALICO_GIT_VER ?= $(shell git describe --tags --dirty --always)
BIRD_VER := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico-bird.version')
GOBGPD_VER := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.calico-bgp-daemon.version')
FELIX_VER := $(shell cat $(VERSIONS_FILE) | $(YAML_CMD) read - '"$(RELEASE_STREAM)".[0].components.felix.version')
Expand Down Expand Up @@ -62,7 +62,6 @@ TEST_CONTAINER_FILES=$(shell find tests/ -type f ! -name '*.created')
CALICO_BUILD?=calico/go-build:$(GO_BUILD_VER)
LOCAL_USER_ID?=$(shell id -u $$USER)

# TODO - This should be changed
PACKAGE_NAME?=github.com/projectcalico/calico/calico_node

LIBCALICOGO_PATH?=none
Expand Down Expand Up @@ -184,8 +183,8 @@ dist/startup: $(STARTUP_FILES) vendor
-v $(VERSIONS_FILE):/versions.yaml:ro \
-e VERSIONS_FILE=/versions.yaml \
$(CALICO_BUILD) sh -c '\
cd /go/src/$(PACKAGE_NAME) && \
make startup'
cd /go/src/$(PACKAGE_NAME) && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation looks off, but is this just in github?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I switched the line to be all tabs. It is meant to be indented more than the sh line above

make CALICO_GIT_VER=$(CALICO_GIT_VER) startup'

## Build allocate_ipip_addr.go
.PHONY: allocate-ipip-addr
Expand All @@ -203,8 +202,8 @@ dist/allocate-ipip-addr: $(ALLOCATE_IPIP_FILES) vendor
-e VERSIONS_FILE=/versions.yaml \
-v $(CURDIR)/dist:/go/src/$(PACKAGE_NAME)/dist \
$(CALICO_BUILD) sh -c '\
cd /go/src/$(PACKAGE_NAME) && \
make allocate-ipip-addr'
cd /go/src/$(PACKAGE_NAME) && \
make CALICO_GIT_VER=$(CALICO_GIT_VER) allocate-ipip-addr'

###############################################################################
# Tests
Expand Down