[WIP] Support for experimental plugins in packaging #332
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
Signed-off-by: Tibor Vass <tibor@docker.com>
seemethere
reviewed
May 23, 2019
seemethere
approved these changes
May 23, 2019
|
Merge is currently pending docker/cli#1902 |
|
Similar will be needed in ee-packaging for ee-specific plugins that need to be experimental. |
seemethere
reviewed
May 23, 2019
| @@ -12,6 +13,7 @@ add_github_ssh_host() { | |||
| } | |||
|
|
|||
| install_binary() { | |||
| [ -n "${EXPERIMENTAL_PLUGIN}" ] && PREFIX=${PREFIX}-experimental | |||
There was a problem hiding this comment.
Might be preferable to do something like this:
Suggested change
| [ -n "${EXPERIMENTAL_PLUGIN}" ] && PREFIX=${PREFIX}-experimental | |
| local install_prefix="${PREFIX}" | |
| if [ -n "${EXPERIMENTAL_PLUGIN}" ]; then | |
| install_prefix="${PREFIX}-experimental" | |
| fi |
Then change line 19 from ${PREFIX} to ${install_prefix} that way we can avoid changing global variables
seemethere
reviewed
May 23, 2019
| @@ -12,6 +13,7 @@ add_github_ssh_host() { | |||
| } | |||
|
|
|||
| install_binary() { | |||
| [ -n "${EXPERIMENTAL_PLUGIN}" ] && PREFIX=${PREFIX}-experimental | |||
| for binary in "$@"; do | |||
| mkdir -p "${DESTDIR}${PREFIX}" | |||
| install -p -m 755 "${binary}" "${DESTDIR}${PREFIX}" | |||
There was a problem hiding this comment.
Suggested change
| install -p -m 755 "${binary}" "${DESTDIR}${PREFIX}" | |
| install -p -m 755 "${binary}" "${DESTDIR}${install_prefix}" |
seemethere
reviewed
May 23, 2019
| @@ -18,8 +19,10 @@ build() { | |||
| git fetch --all | |||
| git checkout -q "${COMMIT}" | |||
| local LDFLAGS | |||
| # TODO: unmark `-tp` when no longer a technical preview | |||
| LDFLAGS="-X ${PKG}/version.Version=$(git describe --match 'v[0-9]*' --always --tags)-tp -X ${PKG}/version.Revision=$(git rev-parse HEAD) -X ${PKG}/version.Package=${PKG}" | |||
| local VERSION | |||
There was a problem hiding this comment.
Might also be useful to name this something different as to avoid overwriting the global VERSION we use for the dockerd/docker-cli builds.
tiborvass
changed the title
|
I think this one can be closed |
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.
Signed-off-by: Tibor Vass tibor@docker.com
To be tested.
Related to docker/cli#1902