-
Notifications
You must be signed in to change notification settings - Fork 142
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.
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
[master] add docker-compose-plugin package (deb, rpm) #553
Conversation
# FIXME: using GOPROXY, to work around: | ||
# go: github.com/Azure/[email protected]+incompatible: reading github.com/Azure/azure-sdk-for-go/go.mod at revision v48.2.0: unknown revision v48.2.0 | ||
cd /go/src/github.com/docker/compose-cli \ | ||
&& GOPROXY="https://proxy.golang.org" GO111MODULE=on go mod download \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We really need to update the Dockerfiles to include the source-code in an (intermediate) stage, instead of bind-mounting from the host. Especially with go modules, we should cache those.
f7529db
to
17c8873
Compare
This comment has been minimized.
This comment has been minimized.
d0005b3
to
d6debae
Compare
This comment has been minimized.
This comment has been minimized.
4121a31
to
a17a73f
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
a17a73f
to
0c803a6
Compare
This comment has been minimized.
This comment has been minimized.
808c14b
to
40fcfbb
Compare
Removed the temporary fix, because v2.0.0-beta.5 was tagged, which removes the |
1ebfa52
to
66a9d5d
Compare
66a9d5d
to
2be2e97
Compare
Is there going to be a way to use this as Interesting that this is being done in docker-ce-packaging repo. |
On linux, we could document creating an alias; alias docker-compose="docker compose" or to set it automatically for new sessions (for Bash) echo 'alias docker-compose="docker compose"' >> ~/.bashrc Or zsh: echo 'alias docker-compose="docker compose"' >> ~/.zshrc I don't think those will/should be set automatically, because the linux packages current do not install
Yeah, the release pipeline for Linux packages is quite complex (this repository and https://github.com/docker/containerd-packaging are only a small bit of the release pipeline); currently the CLI plugins are packaged in the same pipeline / pipeline-steps as the |
If you take the source ~/.bashrc source ~/.zshrc |
I replied in https://github.com/docker/compose-cli/issues/2012#issuecomment-906367152 - a wrapper of some type really is required. Most of these usages aren't logged in users, think CI and a dozen other contexts. We're not talking about personal accounts that can be adjusted to make an alias work. We need a distributed wrapper named docker-compose that does what it needs to do. |
2be2e97
to
3f9a8d2
Compare
Hmm.. that's indeed an interesting idea. I must admit I've never looked into that, but it appears there's (at least for deb package) a helper dh_installalternatives |
de57534
to
a0c6ae2
Compare
a0c6ae2
to
a8859a6
Compare
9b4c1c2
to
c03d97f
Compare
c03d97f
to
0c5025b
Compare
0c5025b
to
4028230
Compare
3b44152
to
cd10d46
Compare
Adds a deb package for the docker-compose cli plugin with this: dpkg -i ./docker-ce-cli_0.0.0-20210629140245-4a6fe51-0~ubuntu-focal_amd64.deb dpkg -i ./docker-compose-plugin_2.3.1.3~ubuntu-focal_amd64.deb docker info --format '{{json .ClientInfo.Plugins}}' | jq . [ { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v0.5.1-docker", "ShortDescription": "Build with BuildKit", "Name": "buildx", "Path": "/usr/libexec/docker/cli-plugins/docker-buildx" }, { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v2.3.1", "ShortDescription": "Docker Compose", "Name": "compose", "Path": "/usr/libexec/docker/cli-plugins/docker-compose" } ] Signed-off-by: Sebastiaan van Stijn <[email protected]>
Adds an rpm package for the docker-compose cli plugin with this: rpm -i \ ./docker-ce-cli-0.0.0.20210702143511.f782d13-0.el8.x86_64.rpm \ ./docker-scan-plugin-0.8.0-0.el8.x86_64.rpm \ ./docker-compose-plugin-2.3.1.3-0.el8.x86_64.rpm docker info --format '{{json .ClientInfo.Plugins}}' | jq . [ { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v0.5.1-docker", "ShortDescription": "Build with BuildKit", "Name": "buildx", "Path": "/usr/libexec/docker/cli-plugins/docker-buildx" }, { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v2.3.1", "ShortDescription": "Docker Compose", "Name": "compose", "Path": "/usr/libexec/docker/cli-plugins/docker-compose" }, { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v0.8.0", "ShortDescription": "Docker Scan", "Name": "scan", "Path": "/usr/libexec/docker/cli-plugins/docker-scan" } ] Signed-off-by: Sebastiaan van Stijn <[email protected]>
This removes the "require" docker-ce-cli, so that the package can be installed stand-alone (withouth the docker cli itself installed). Unlike "deb" packages, rpm package do not have "soft" requirement ("enhances", "recommends"), so having a "requires" makes the docker-cli a hard requirement. While in most situations, the plugin would be installed together with the docker cli, the plugin _is_ able to run standalone: /usr/libexec/docker/cli-plugins/docker-compose up [+] Running 2/2 ⠿ Network test_default Created 4.3s ⠿ Container test_web_1 Started 2.1s Attaching to web_1 web_1 | 10-listen-on-ipv6-by-default.sh: Getting the checksum of /etc/nginx/conf.d/default.conf web_1 | 10-listen-on-ipv6-by-default.sh: Enabled listen on IPv6 in /etc/nginx/conf.d/default.conf web_1 | /docker-entrypoint.sh: Launching /docker-entrypoint.d/20-envsubst-on-templates.sh web_1 | /docker-entrypoint.sh: Configuration complete; ready for start up This removes the "Requires" annotation from the package, to simplify the dependency graph, and to allow installing the package separately (which could be for testing purposes, or for a minimal install). Signed-off-by: Sebastiaan van Stijn <[email protected]>
cd10d46
to
cab7b56
Compare
[ce-nightly] Always use test channel when installing containerd
depends on:
Adds a package for the docker-compose cli plugin
with this: