Install as a Docker CLI plugin #48
Merged
Conversation
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
Signed-off-by: Eugén Cowie <[email protected]>
schristoff
reviewed
Sep 27, 2024
pkg/docker-compose/build.go
Outdated
| curl -fL "https://github.com/docker/compose/releases/download/v%s/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose && \ | ||
| chmod +x /usr/local/bin/docker-compose`, dockerComposeVersion) | ||
| curl -fL "https://github.com/docker/compose/releases/download/v%s/docker-compose-linux-x86_64" -o /usr/local/lib/docker/cli-plugins/docker-compose --create-dirs && \ | ||
| chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \ |
There was a problem hiding this comment.
Why ln over setting it in -o, just generally curious
There was a problem hiding this comment.
This has changed slightly after merging the latest from main and fixing the conflicts. Initially, I updated it to use ADD to download the file and then RUN ln -s to create the symlink (63bfacc). However, after doing that, it occurred to me that instead of creating a symlink in /usr/local/bin, we could just update the PATH:
ADD --chmod=755 https://github.com/docker/compose/releases/download/v%s/docker-compose-linux-x86_64 /usr/local/lib/docker/cli-plugins/docker-compose
ENV PATH="$PATH:/usr/local/lib/docker/cli-plugins"
This seems like a nicer way of ensuring that docker-compose can still be used. I've tested and pushed that change up, but could revert to using a symlink or just installing the binary into both folders, whichever you think is cleaner.
Thanks for the review!
schristoff
approved these changes
Sep 27, 2024
Signed-off-by: Eugén Cowie <[email protected]>
Signed-off-by: Eugén Cowie <[email protected]>
kichristensen
approved these changes
Sep 27, 2024
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.
What does this change?
Installs the docker-compose binary to /usr/local/lib/docker/cli-plugins/ and symlinks /usr/local/bin/docker-compose to the new location. This allows using either
docker composeordocker-composein scripts. The motivation for this change is detailed in #47.What issue does it fix?
Closes #47
Notes for the reviewer
I've tested this locally with the examples in the repo and my own bundle, it doesn't break the mixin commands nor scripts which use the
docker-composecommand.