tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,882 Commits 25 Branches 264 Tags 67 MiB
Commit Graph

585 Commits

Author SHA1 Message Date
Nicolas De Loof fcb91096b8
remove all references to cli from compose.v2 cmd package 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-08-31 15:41:20 +02:00
Michael Irwin 08c2c44beb
Fix help text when for context create and kube backend 
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
 2021-07-06 15:46:00 -04:00
Sebastiaan van Stijn a0db32043e
Do not strip "v" prefix from version when printing 
I noticed this when building the binary; `internal.Version` is set to `v2.0.0-beta.4`,
to match the tag.

```bash
GIT_TAG=v2.0.0-beta.4
make COMPOSE_BINARY=bin/docker-compose -f builder.Makefile compose-plugin \
    GOOS=linux \
    GOARCH=amd64 \
    CGO_ENABLED=0 \
    go build \
        -trimpath \
        -ldflags="-s -w -X github.com/docker/compose-cli/internal.Version=v2.0.0-beta.4" \
        -o bin/docker-compose \
        ./cmd
```

However, the binary has the `v` prefix stripped (which caused a check to fail
when packaging):

```bash
/root/rpmbuild/BUILDROOT/docker-compose-plugin-2.0.0.beta.4-0.fc34.x86_64/usr/libexec/docker/cli-plugins/docker-compose docker-cli-plugin-metadata
++ awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }'
+ ver=2.0.0-beta.4
+ test 2.0.0-beta.4 = v2.0.0-beta.4
FAIL: docker-compose version (2.0.0-beta.4) did not match
```

This also looks inconsistent with other binaries and plugins we ship:

```bash
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": "2.0.0-beta.4",
    "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"
  }
]
```

Perhaps there was a specific reason for this, but thought I'd open this PR for
discussion (if the v-prefix should not be there, perhaps we should isntead strip
it when setting the version).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-07-03 15:53:21 +02:00
Nicolas De Loof 49e7f2d45d Move compose v2 implementation under pkg/compose with dependencies 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-15 15:52:48 +02:00
Nicolas De Loof e2ea24ceb7 move compose-plugin commands under /cmd 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-15 15:52:48 +02:00
Nicolas De Loof d90495e1cd move compose API into pkg/api 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-15 15:52:48 +02:00
Nicolas De loof 79573e1acc
Merge pull request #1767 from ndeloof/exec_no_tty 
automatically disable TTY if shell isn't a terminal
 2021-06-11 09:44:14 +02:00
Nicolas De Loof 679d24a178
ignore image we can't build when forcing PullPolicyBuild 
close https://github.com/docker/compose-cli/issues/1776

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-10 16:21:32 +02:00
Nicolas De Loof b1d2c18dfc give -T a long name, otherwise help is weird 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-10 09:58:47 +02:00
Nicolas De Loof 1d38001164 automatically disable TTY if shell isn't a terminal 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-10 09:58:47 +02:00
Nicolas De Loof 1ad964603a
config --profiles to list all defined profiles 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-09 12:44:38 +02:00
Nicolas De loof b0a66356e0
Merge pull request #1757 from ndeloof/docs 
update reference docs
 2021-06-09 07:31:22 +02:00
Nicolas De Loof abbba74b27
update reference docs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-08 09:39:49 +02:00
Nicolas De Loof c135bd1d7c
move up logic from CLI into local backend 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-07 20:20:31 +02:00
Nicolas De Loof dec9169198
move progress to backend on "down" 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-07 15:41:59 +02:00
Nicolas De Loof 924d7925d6
showcase simpler command design by using API options as cobra flags target 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-03 17:58:54 +02:00
Nicolas De Loof 82f35d1bac
Move progress writter into backend(s) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-03 14:16:22 +02:00
Nicolas De loof 3ec33face4
Merge pull request #1730 from ndeloof/progress_cleanup 
code cleanup: most progress.Run don't return a value
 2021-06-02 11:22:34 +02:00
Nicolas De Loof a2ff974ac6
remove obsolete compose grpc service 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-01 15:33:55 +02:00
Nicolas De Loof 9b0bc6fee1
code cleanup: most progress.Run don't return a value 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-01 15:18:03 +02:00
Nicolas De loof 2315a1dad7
Merge pull request #1707 from docker/up_follow 2021-05-31 10:54:40 +02:00
Nicolas De Loof 3aaec6a554
split compose-cli "docker" and composeV2 cli-plugin release processes 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-27 12:46:39 +02:00
Nicolas De Loof c16834cba6
attach to containers added by "scale" 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-25 22:59:57 +02:00
Nicolas De loof 93a3392d3a
Merge pull request #1696 from ndeloof/compose_file_env 
support compose file set by COMPOSE_FILE env var
 2021-05-21 10:22:57 +02:00
Nicolas De loof ed11511d29
Merge pull request #1691 from docker/pre_run 
validate and pre-process flags in PreRun
 2021-05-20 18:50:50 +02:00
Nicolas De Loof 8b9ed85928
validate and pre-process flags in PreRun 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-20 18:35:13 +02:00
Nicolas De loof d70b50bc3b
Merge pull request #1689 from chris-crone/bump-linter 2021-05-20 18:33:48 +02:00
Nicolas De loof e91e163c84
Merge pull request #1688 from docker/interceptor 2021-05-20 18:33:41 +02:00
Nicolas De Loof de85b0624b
support compose file set by COMPOSE_FILE env var 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-20 15:41:41 +02:00
Nicolas De Loof c76dd110c7
only (re)start selected services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-20 12:03:30 +02:00
Chris Crone d27bda5e1d build: Update golangci-lint 
* Replace goling with revive as the former is deprecated

Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-05-19 15:00:53 +00:00
Nicolas De Loof 21e2f5c062
use interceptor to implement ACI-specific flags 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-19 16:00:26 +02:00
Nicolas De loof 2162bc922a
Merge pull request #1675 from ndeloof/ps_exitcode 
ps shows healthcheck only for running container
 2021-05-17 16:31:43 +02:00
Nicolas De Loof 377bcd8048
only start current project services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-17 11:05:23 +02:00
Nicolas De Loof 221f420ce2
ps shows healthcheck only for running container 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-17 10:02:47 +02:00
Nicolas De loof 4c0cbea24b
Merge pull request #1623 from JulienTant/1391-add-cp 2021-05-06 15:49:51 +02:00
Guillaume Tardif adcadf0af2 Use location specifed by user if provided, and do not override with group location. ACI allow deploying in any location regardless of resource group 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-05-05 17:06:26 +02:00
Nicolas De Loof 13f37cf1c8
fix detecting active profiles implied by selected services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-05-05 10:12:04 +02:00
Ulysses Souza 36d6c40e52 Add support for services on ps command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-05-03 20:03:52 -03:00
Julien Tant c2f2196d30 Add all parameter 
Signed-off-by: Julien Tant <julien@craftyx.fr>
 2021-05-01 19:24:07 -07:00
Julien Tant 8f9ce9d763 Add cp command 
Signed-off-by: Julien Tant <julien@craftyx.fr>
 2021-05-01 18:20:52 -07:00
Nicolas De loof 63057f6d1f
Merge pull request #1606 from gtardif/compose_rm_all 
Add rm --all flag for backward compatibility (deprecated - no effect)
 2021-04-30 13:26:56 +02:00
Chris Crone a764f8c5a8 cli.compose: Add missing \n for version 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-04-29 18:30:58 +02:00
Nicolas De loof b46015f2f8
Merge pull request #1610 from ndeloof/build_args_from_env 2021-04-29 12:15:35 +02:00
Nicolas De Loof 15eab93b31
docker compose exec to return command exit code 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-29 10:58:45 +02:00
Nicolas De Loof e433777796
resolve build args without value from environment 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-29 10:43:09 +02:00
Guillaume Tardif 850f81c44f Add rm --all flag for backward compatibility (deprecated - no effect) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-28 14:37:44 +02:00
Guillaume Tardif 38b4220bdb
Merge pull request #1603 from gtardif/compose-cli-plugin-version 
Separate compose CLI plugin version from Cloud integration version
 2021-04-27 10:56:59 +02:00
Guillaume Tardif 28bd7bda3e Separate compose CLI plugin version from Cloud integration version 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-04-27 09:16:41 +02:00
Nicolas De Loof 92c9be5f87
load override sibling compose file when auto-discovered from parent dir 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-04-26 14:41:06 +02:00