calico_node/Makefile: Fix build of startup #899
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change CALICO_GIT_VER to a "conditional variable". The git shell command will only be run if a value isn't already defined. This allows the non-containerized execution of `make` to fill in the variable so that that git doesn't need to run inside the container. Fixes projectcalico#897
bcreane
reviewed
Jul 10, 2017
| @@ -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) && \ | |||
There was a problem hiding this comment.
indentation looks off, but is this just in github?
There was a problem hiding this comment.
I switched the line to be all tabs. It is meant to be indented more than the sh line above
ozdanborne
approved these changes
Jul 10, 2017
caseydavenport
pushed a commit
that referenced
this pull request
Dec 14, 2021
…-release-v3.21 [release-v3.21] Semaphore Auto Pin Update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change CALICO_GIT_VER to a "conditional variable". The git shell command
will only be run if a value isn't already defined.
This allows the non-containerized execution of
maketo fill in thevariable so that that git doesn't need to run inside the container.
Fixes #897