[master] more cleaning up - #442
Merged
Merged
Conversation
- expand `PLUGINS_DIR` when "used" instead of when declared - consistently use CLI_DIR to determin GITCOMMIT. When building from the docker/docker-ce monorepo, this should make no difference, but when building from the upstream repositories, this prevents the rpm and deb packages to have a different commit specified. - only set GO_IMAGE if it's not yet defined Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This should prevent situations where the target directory
does not yet exist when make is called.
given the following makefile:
DIRECT := $(realpath ./direct)
LAZY = $(realpath ./lazy)
clean:
@rm -rf ./direct ./lazy
source:
@mkdir -p direct lazy
build: source
@echo DIRECT is $(DIRECT)
@echo LAZY is $(LAZY)
Running the below, will show that only "LAZY" shows the
correct path:
make clean && make build
DIRECT is
LAZY is /Users/sebastiaan/Projects/test/lazy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
All images used are multi-arch now, so no need to parameterize Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sync formatting, and add RUN_FLAGS for rpm (it was available for deb), so allow adding custom flags, without having to define the whole RUN command. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
We were not currently using these to override, so may as well remove them. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
DEB_VERSION and STATIC_VERSION are a macro (evaluated/expanded when called), so renaming them makes it more clear that they're expanded at that point. GEN_*_VER is also in line with the equivalent GEN_RPM_VERSION in the rpm/Makefile. The environment variable used in the container (and scripts) is kept as DEB_VERSION. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
once we build from upstream repositories, CLI and Engine will have different git commits; prepare for those changes by making the variable name more generic. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
more_cleanups
branch
from
March 11, 2020 15:13
95651ff to
d4fff33
Compare
thaJeztah
marked this pull request as ready for review
March 11, 2020 17:00
Member
Author
|
Moved this out of draft; I ran the internal "release-packaging" repo with this branch, and everything still was green, so nothing broke 🎉 |
thaJeztah
commented
Mar 11, 2020
|
|
||
| staticVersion="$VERSION" | ||
| if [[ "$VERSION" == *-dev ]]; then | ||
| # based on golang's pseudo-version: https://groups.google.com/forum/#!topic/golang-dev/a5PqQuBljF4 |
Member
Author
There was a problem hiding this comment.
I'll look at extracting this code to a gen-pseudo-version (e.g.) script, as a follow-up. This PR was already big, so I decided to not make it even bigger for now
silvin-lubecki
approved these changes
Mar 12, 2020
silvin-lubecki
left a comment
silvin-lubecki
left a comment
Contributor
There was a problem hiding this comment.
LGTM (big one to review but great PR @thaJeztah 🤗 )
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
opening as draft to see if I broke anything so far; I'll update the description later