[20.10 backport] add docker-compose-plugin package (deb, rpm) #638
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
thaJeztah
force-pushed
the
20.10_backport_add_compose_cli_package
branch
from
524f16a to
00263d8
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]>
(cherry picked from commit d66f7a6)
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]>
(cherry picked from commit 276d806)
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]>
(cherry picked from commit cab7b56)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
20.10_backport_add_compose_cli_package
branch
from
00263d8 to
237ad94
Compare
rumpl
approved these changes
Mar 8, 2022
This was referenced Mar 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
backport of #553
depends on #637
git cherry-pick -s -S -x \ d66f7a68c9cf5ecb42d7aa66c22287ea5f0241c3 \ 276d806d084c0b11acf66ede0aef484049632449 \ cab7b567fdd3e7108af65ed2734820d3095d2e4dMinor conflict in the first two commits, due to #547 not being in the 20.10 branch