27227a8824
lint: add `nolintlint` and clean up `nolint` directives ( #9738 )
...
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2022-08-09 16:43:58 -04:00
c47079e795
don't apply default pull policy from command line if one is define in service configuration
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-08-05 12:01:32 +02:00
8d4846f210
docs: remove extra whitespaces in help text ( #9710 )
...
Remove superfluous whitespaces
Signed-off-by: Khoa Le <ltkhoa2711@gmail.com>
2022-08-03 16:37:15 -04:00
c586ca4d0e
Change `projectOrName()` to check COMPOSE_PROJECT_NAME env var
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-08-03 18:39:39 +02:00
be495ab8e6
Filter `compose ps` output by provided compose model
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-08-02 22:33:26 +02:00
f6e96dd783
if command is ran with a compose file, apply the compose model, not just project name
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-08-02 22:33:26 +02:00
9db79856be
update usage strings for consistency
...
This updates the format of various usage strings to be more consistent
with other parts of the CLI.
- Use `[OPTIONS]` to indicate where command-specific options should be added
- Use `[SERVICE...]` to indicate zero-or-more services
- Remove some usage strings for specific options (e.g. `-e NAME=VAL`), as that
option is part of the already mentioned `[OPTIONS]` and we don't provide usage
for each possible option that can be passed.
- Remove `[--]`, which (I think) was needed for the Python implementation, but is
a general feature to stop processing flag-options.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-02 13:32:29 +02:00
1eeb12fe1e
Merge pull request #9698 from laurazard/dont-load-composefile-version
...
Overwrite parent commands PreRun code for `compose version`
2022-08-01 12:14:14 +02:00
c9876f4c66
Overwrite parent commands PreRun code for `compose version`
...
.. to avoid trying (and failing) to load a compose file if the COMPOSE_FILE env var is set such as `COMPOSE_FILE=foo compose version`
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-08-01 11:44:05 +02:00
6d613c8cb2
Merge pull request #9636 from ulyssessouza/dotenvfile-priority
...
Environment variables priority
2022-07-29 19:42:50 +02:00
150fd4b8cf
use '-' as separator by default for image name
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-07-29 18:55:22 +02:00
b49bd7c6ce
Merge pull request #9179 from ndeloof/no_build_image
...
as --no-build is set, set service image to default image name
2022-07-29 17:50:01 +02:00
abf5f736c7
as --no-build is set, set service image to default image name
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-07-29 17:41:53 +02:00
38a18790ed
cmd: consistent handling no-args commands ( #9660 )
...
Enforce args rejection for commands without args:
* ls
* version
Additionally, docs for `restart` are fixed.
Signed-off-by: piroux <pierre.roux01@gmail.com>
2022-07-29 09:30:11 -04:00
e9c8cfcef3
Fix environment variables priority between environment and .env
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-28 12:57:44 +02:00
e83d940a3c
add pull & build config to project before create
...
add pull flag to create and up documentation
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-07-27 11:25:53 +02:00
9976077e24
introduce --pull
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-07-27 11:24:00 +02:00
fc723acb3b
Fix nolint issues
...
Reference -> https://golangci-lint.run/usage/false-positives/#nolint-directive
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-13 19:33:06 +02:00
96cbb1cbcf
Add "style" tag to gocritic
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-13 19:33:06 +02:00
d42adf6efb
Add "opinionated" tag to gocritic
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-13 19:33:06 +02:00
a81f23a199
Add "diagnostic" tag to gocritic
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-13 19:33:06 +02:00
2e96829607
Add gocritic to linters
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-13 19:33:03 +02:00
5a1fea8272
Merge pull request #9507 from TheodosiouTh/tc/simplify-flag-conversion
...
TC: Use switch case to simplify flag conversion and avoid multiple if statements
2022-07-04 09:19:21 +02:00
115ac6d529
Use switch/case instead of static map for simplicity
...
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
2022-06-30 18:50:24 +03:00
8648f30351
TC: Add missing tests for argumetns
...
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
2022-06-30 18:50:24 +03:00
9542bdf445
TC: fix naming
...
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
2022-06-30 18:50:24 +03:00
40f0dbd971
TC: Use map to simplify flag conversion and avoid multilple if statements
...
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
2022-06-30 18:50:24 +03:00
fd5e8b8c28
fix: panic caused by empty string argument
...
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-06-28 10:18:38 -05:00
ab25aabfb9
Merge pull request #9311 from quite/no-ansi-be-kind
...
Don't use ansi even when deprecated option is requested
2022-06-16 17:15:19 -04:00
4ea3ba77b2
Merge pull request #9559 from venthur/fix_spell
...
fixed some spelling mistakes
2022-06-16 15:56:44 -04:00
49fb4ca25f
down: fix COMPOSE_REMOVE_ORPHANS env name and add test
...
Fixes #9562 .
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-06-16 08:40:40 -05:00
8a5d555de7
fixed some spelling mistakes
...
that's all :)
Signed-off-by: Bastian Venthur <venthur@debian.org>
2022-06-14 21:33:36 +02:00
80b7a8d274
Only start direct dependencies of service on `compose run ...`
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-06-14 07:32:15 +02:00
b2c0d25005
ps: use DisplayablePorts from docker/cli
...
Fixes #9527 .
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-06-07 17:11:16 -05:00
67c13cf821
Import dotenv file to os environment
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-05-30 17:36:41 +02:00
8d03e29994
attach _only_ to services declared by project applying profiles
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-05-20 10:36:06 +02:00
65b827d08f
bump compose-go to 1.2.5
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-05-17 17:11:32 +02:00
84f2168f80
Fix extra space printed with `--no-log-prefix` option
...
Signed-off-by: Jan Vitturi <vitturi.jan@gmail.com>
2022-05-17 15:20:21 +02:00
6d9d75406c
update usage of the index flag of the cp command
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-10 10:50:40 +02:00
a983cf551d
cp command: copy to all containers of a service as default behaviour
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-10 10:50:40 +02:00
710b637e4a
Don't use ansi even when deprecated option is requested
...
Signed-off-by: Daniel Lublin <daniel@lublin.se>
2022-05-03 14:45:46 +02:00
d89c143c39
Clarify what default work dir is when multiple compose files
...
Signed-off-by: Daniel Lublin <daniel@lublin.se>
2022-05-03 13:14:34 +02:00
147c2d8fae
down: Reject all arguments
...
The down command silently ignored all arguments, which might cause
confusion and/or outages if someone expects `docker-compose down
$service` to be the opposite of `docker-compose up $service`, rather
than turning down everything.
Signed-off-by: Jille Timmermans <jille@quis.cx>
2022-05-02 15:28:30 +02:00
69e21d89f0
Fix relative paths on envfile label
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-04-30 10:14:39 +02:00
db698562a9
use project we just created to start services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-04-07 13:38:30 +02:00
d871cb98e5
Fix search/replace typo in --no-TTY documentation
...
Commit abbba74b27
2022-04-04 19:06:03 +02:00
c7473c68ae
Merge pull request #9335 from ulyssessouza/remove-deadcode
...
Remove dead warning code
2022-03-31 17:04:29 +02:00
5e63f12ae8
Merge pull request #9332 from ulyssessouza/fix-project-name
...
Takes COMPOSE_PROJECT_NAME into consideration on commands
2022-03-31 17:04:12 +02:00
60363c36df
Remove dead warning code
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-03-31 16:42:04 +02:00
6dbd6ffe11
fix typo in ssh option description
...
Signed-off-by: Matthias Schoettle <git@mattsch.com>
2022-03-31 10:14:13 -04:00
eee0e8bed9
Takes COMPOSE_PROJECT_NAME into consideration on commands
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-03-31 14:28:38 +02:00
ff73827a6f
Add support of ssh authentications defined in compose file or via cli flags
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-03-31 12:47:15 +02:00
b7fd6eb7d8
pass interactive flag to ExecOptions for the RunExec command
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-03-26 07:23:31 +01:00
099715fb6f
update run no-TTY flag description as auto-detected by default
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-03-18 10:42:05 +01:00
c843d373de
restore TTY auto-detection using dockerCli.Out.IsTerminal
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-16 16:34:26 +01:00
1d4b4e3c8e
use docker/cli RunExec and RunStart to handle all the interactive/tty/* terminal logic
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-16 16:34:26 +01:00
cd8074d501
kill only need project name
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-14 10:26:36 +01:00
6ce57ea2f4
Remove DEPRECATED text, since it's just the default
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-03-11 13:01:55 +01:00
2d32d7450c
ps: un-deprecate --filter, and enhance docs
...
Compose currently only supports a single filter options on --filter,
for which reason the --status flag was added, which is more convenient
to use.
However, the `--filter` flag is common among various docker commands, and
it's possible that additional filters get added at some point (which may
be less "commonly" used, and not warrant a dedicated flag).
This PR removes the "deprecated" mention from the flag, to keep consistency
with other commands, but adds documentation to explain how they relate to
eachother.
Also added a short example for the `--format` flag.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-10 20:39:19 +01:00
7036cda306
Merge pull request #9198 from ndeloof/dockerCli_stdout
...
composeService to use dockerCli's In/Out/Err streams
2022-03-09 14:36:07 +01:00
158b5ff6a3
build full compose model from resources, then filter by services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-09 11:29:30 +01:00
ce944520ff
Merge pull request #9247 from ndeloof/plain
...
use plain text progress when ansi=never is set
2022-03-08 16:55:55 +01:00
57e8e8ef29
use plain text progress when ansi=never is set
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-08 15:05:37 +01:00
2282159922
map --interactive to StdinOpen
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-08 10:17:17 +01:00
9054f6a18b
Fix json format for version command
...
Signed-off-by: Victor Timofei <victor@vtimothy.com>
2022-03-08 09:40:25 +01:00
dbe7de50a7
don't try to start dependencies when there are none
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-07 08:25:05 +01:00
bcaa908f74
Support COMPOSE_IGNORE_ORPHANS for compose run
...
This revives #7020 and resolves the issue mentioned in #4992 .
Signed-off-by: Zixuan James Li <359101898@qq.com>
2022-03-05 22:54:16 +01:00
c64b044b7e
Merge pull request #9229 from ulyssessouza/add-ti-run-exec
...
Add -i and -t to run and exec
2022-03-04 17:33:09 +01:00
67b4669f9b
Add function to convert strings to bool
...
Typically used on boolean environment variable values
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-03-04 16:42:37 +01:00
61735c0012
Add -i and -t to run and exec
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-03-04 14:27:06 +01:00
f86f252a66
composeService to use dockerCli's In/Out/Err streams
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-03-03 16:34:57 +01:00
5885a250bc
Merge branch 'docker:v2' into issue#9147
2022-02-24 18:03:05 +03:30
aa864fde20
COMPOSE_REMOVE_ORPHANS can be set to always apply --remove-orphans
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-02-23 14:04:12 +01:00
7e7262bc77
Merge branch 'docker:v2' into issue#9147
2022-02-22 05:08:29 +03:30
416498441c
declare `--volume` as an alias for `--volumes`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-02-18 17:40:47 +01:00
fb3f9e270f
Add compose file path to ls command
...
docker compose ls will not include config files section in result
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
2022-02-18 16:37:35 +01:00
fb9310caf2
use CustomLabels for composeV2 metadata and not impact service hash
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-02-17 09:05:54 +01:00
65ed8cf4c2
Implemented #9147
...
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
2022-02-05 10:27:52 +03:30
99cd90a4b2
Return only numbers in short version
...
Python version of docker compose removes the v prefix in the version.
```
$ docker-compose version --short
1.25.5
```
Signed-off-by: Guillaume Rose <gurose@redhat.com>
2022-01-17 07:30:27 +01:00
a279c3a934
Discard env_file section on convert/config
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-01-15 11:45:08 +01:00
7b6439997d
Fix output redirection on command run
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-12-15 15:10:22 +01:00
9e52e9fbe3
Merge pull request #9004 from ndeloof/cp_stopped
...
compose cp doesn't need a full project and can copy from stopped containers
2021-12-14 14:27:51 +01:00
c5b7624d10
compose cp doesn't need a full project and can copy from stopped container
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-12-12 16:15:56 +01:00
cf7319fc6e
Only kill running containers
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-12-10 08:48:38 +01:00
740276f550
handle "stop" event
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-12-09 13:57:52 +01:00
f03b7085c3
compose ps: fix typo "unknow" -> "unknown"
...
Signed-off-by: Jon Cram <webignition@gmail.com>
2021-12-09 08:56:35 +01:00
3bbcc3d4d0
Fix lint error
...
Signed-off-by: notok <noto.kazufumi@gmail.com>
2021-12-08 18:42:00 +09:00
e2f33af831
Merge and fix Convert function from `docker/compose-switch`
...
This also removes the vendoring of the repo
Note that it fixes the problem of double "compose" on calling
the compose plugin with "docker" root flags.
Like in "docker --context default compose version"
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-12-03 12:17:17 +01:00
e1a38f984b
Merge pull request #8947 from ndeloof/run_quietpull
...
introduce run —quiet-pull to align with up
2021-11-23 19:17:08 +01:00
4dafeb57a5
introduce run —quiet-pull to align with up
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-23 19:14:12 +01:00
45956c36fb
introduce docker compose config --images
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-23 19:13:04 +01:00
d00eacbba0
don't normalize compose model in compatibility mode
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-22 21:02:44 +01:00
3261b60fd1
--quiet implies --progress=quiet
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-17 13:08:30 +01:00
cb425a23c0
check supported --progress flag values
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-17 13:08:30 +01:00
865b82da6a
Remove unused flag
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-11-12 14:56:27 +01:00
a79346b978
Support inherited environment vars on exec
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-11-05 20:51:36 +01:00
72e4519cbf
introduce up --wait condition
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-11-03 18:22:29 +01:00
c4cfaeb12a
COMPOSE_COMPATIBILITY can be set by .env file
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-10-28 10:10:43 +02:00
2530bd981a
Fix project settings' options order
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-10-22 14:59:25 +02:00
94379769e3
Make service>build>dockerfile a simple filename
...
- It makes it keep a simple filename instead of an absolute path
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-10-20 10:24:08 +02:00
55a214a45e
Fix -t flag for compose up command
...
Signed-off-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
2021-10-13 09:11:44 +05:30
35b4d1de28
Fix checking -t flag
...
Signed-off-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
2021-10-13 08:59:16 +05:30
fc8a433cee
Remove the hidden flag from version, added --version and -v flags to root command.
...
Signed-off-by: Shikachuu <zcmate@gmail.com>
2021-10-04 18:15:43 +02:00
98fe57baac
Make command descriptions consistent
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2021-10-04 15:10:37 +02:00
435387c72c
Merge pull request #8712 from ndeloof/ps-status-services
...
allow combination of --status and --services
2021-09-30 12:51:26 +02:00
ecee21b5e5
Merge pull request #8708 from ulyssessouza/standalone
...
Add standalone capacility
2021-09-30 10:23:02 +02:00
7c0e865960
allow combination of --status and --services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-30 09:59:11 +02:00
1faa76ee4e
use compose-switch Convert
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-30 09:15:56 +02:00
17354fcc99
Add standalone capacility
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-09-30 02:16:55 +02:00
7f31fe678f
make --status a multi-flag
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-29 17:17:28 +02:00
3f37003340
Deprecate --filter. List values for --status
...
Signed-off-by: Iaroslav Sheptykin <i.sheptykin@neusta.de>
2021-09-27 17:47:52 +02:00
07b5512a68
`run` must attach to stdin
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-27 17:42:37 +02:00
1ec997270d
Merge pull request #8668 from ndeloof/ignore_orphans
...
add support for COMPOSE_IGNORE_ORPHANS
2021-09-27 16:40:25 +02:00
bc25259f07
add support for COMPOSE_IGNORE_ORPHANS
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-24 08:24:48 +02:00
244834ff12
compose exec doesn't need project
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-23 17:09:37 +02:00
97a0efd7c3
group ports to render ranges as ... ranges
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-23 15:35:07 +02:00
e39ea13002
fix support for `compose run --label`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-23 14:52:04 +02:00
99e75639d6
define compose container names with a valid hostname
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-22 19:06:34 +02:00
2a1e989f3e
Stop only the service ran by it's up command
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-09-20 16:45:40 +02:00
480a255a0e
Merge pull request #8620 from ndeloof/scale_0
...
get scale from deploy.replicas. Require scale normalization
2021-09-20 16:27:11 +02:00
3bf555cbd6
Fix lint make target
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-09-20 13:09:11 +02:00
3324429320
introduce --compatibility (noop) for backward ... compatibility
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-20 11:43:23 +02:00
21d3b19e57
compose/run: don't waitDependencies if NoDeps
...
Signed-off-by: aviau <alexandre@alexandreviau.net>
2021-09-16 11:09:44 +02:00
a2947457b9
get scale from deploy.replicas. Require scale normalization
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-15 14:02:01 +02:00
4441ff5b21
Merge pull request #8604 from ndeloof/convert_output
...
introduce `--output` option to `config` command
2021-09-14 08:03:03 +02:00
caf157969e
introduce `--output` option to `config` command
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-10 15:10:02 +02:00
cc47e5385b
use a sync.Map to avoid concurrency issue accessing log presenters
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-10 12:54:24 +02:00
a0bff8be96
redundant break statement
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-09 18:47:18 +02:00
e44aacfbc1
fix run --volume flag (mistakely renamed --volumes)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-09 15:42:17 +02:00
e8666b02f3
introduce up --attach
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-09 08:29:07 +02:00
2ceb176500
support --entrypoint="" as override
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-08 10:39:08 +02:00
010776f6db
introduce --resolve-paths and restore compose v1 behavior
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-06 17:05:13 +02:00
5b30accf35
Change URLs to reflect new project home
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-02 09:06:52 +02:00
e1267cddfd
don't exit with err=1 when no container listed
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-01 15:32:43 +02:00
1ae9b3cb5d
move compose-cli code into docker/compose/v2
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-08-31 19:09:19 +02:00
c944c970ab
use nicer imports
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-08-31 16:58:19 +02:00
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
19cbbdd79e
only build requested services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-08-26 15:55:19 +02:00
8d476eee4c
apply filter before formatter
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-08-06 15:31:50 +02:00
1a0efdd413
Fix issue `docker compose rm -s` not removing containers
...
Signed-off-by: Hironao OTSUBO <motemen@gmail.com>
2021-07-29 23:37:48 +09:00
3d83989f5d
Merge pull request #1773 from ulyssessouza/completion
2021-07-26 08:23:13 +02:00
1e35245390
Print services in dependency order
...
Currently, `compose config --services` outputs the services in
a random/non-deterministic order.
In Compose v1, this was implicitly topologically sorted because
the project services were pre-sorted. With `compose-go`, the
services are unordered, and the `WithServices()` helper can be
used to iterate in dependency order.
Signed-off-by: Milas Bowman <milasb@gmail.com>
2021-07-21 11:11:38 -04:00
c28aec2308
Filter completions by toComplete variable
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-12 14:33:37 -03:00
72b66fb5c1
Add 'no completion' or 'service' completion
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-12 14:33:37 -03:00
37961c51ca
Add completion to "compose ps"
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-12 14:33:37 -03:00
3174f49dc2
Add completion to shells
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-12 14:33:37 -03:00
8fd04195be
Merge pull request #1914 from ndeloof/run_volumes
...
run -v should not remove configured volumes
2021-07-12 16:02:21 +02:00
e6f7c64eb8
run -v should not remove configured volumes
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-12 12:40:37 +02:00
bf0b75cee0
report error on `ps` when no container found for service(s)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-12 10:42:31 +02:00
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
96e1e041d6
distinguish stdout and stderr
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-02 10:53:11 +02:00
b5827d4a86
pass --force and --volumes options to backend
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-25 13:46:34 +02:00
d8d739307e
test
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-24 10:11:01 +02:00
05b510a447
compose ps to include container command
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-22 16:09:47 +02:00
13b57023d7
Merge pull request #1823 from ndeloof/filter_status
...
implement ps --status=xx filter
2021-06-22 13:32:57 +02:00
46a65b8c77
add --verbose option for compatibility
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-22 11:49:54 +02:00
3e4f030d2d
implement ps --status=xx filter
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-21 11:16:09 +02:00
df6d709aa5
Merge branch 'main' of github.com:docker/compose-cli into docker_compose_logs_since_option
2021-06-16 08:57:02 +08:00
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
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
3bb4fe163c
Add `docker context create` command
...
This creates a context with a name and a type
2020-04-26 19:42:20 +02:00
244adb77a4
Merge pull request #20 from chris-crone/copyright
...
Update copyright date
2020-04-24 18:06:14 +02:00
d166ad82f9
Update copyright date
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2020-04-24 14:39:49 +02:00
b44547c71f
Refactor NewContext
...
This renames NewContext to NewSigContext and
moves it to ./util/util.go avoiding the servers
to import "github.com/docker/api/client"
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-04-24 11:50:30 +02:00
29a838ddf5
Merge pull request #15 from glours/find_existing_docker_binary
...
Use docker binary find in path to fallback to Moby CLI
2020-04-23 11:32:13 +02:00
8db55e8c5c
Use v2 of urfave/cli
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-04-23 09:43:53 +02:00
8af8924a58
Use docker binary find in path to fallback to Moby CLI
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-04-22 23:47:04 +02:00
6bfeda054b
Go mods initialized, protos without gogo
2020-04-21 15:07:41 +02:00
4b2c8ae9cf
Call original docker on moby context
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-04-20 21:16:03 +02:00
f5aa9638af
Add default shellout to engine if no context specified
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-04-20 17:16:37 +02:00
a8403241e4
Add default shellout to engine if no context specified
...
Improve CLI documentation
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2020-04-20 16:22:15 +02:00
3dac4df803
Implement context loading
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-04-20 16:22:15 +02:00
dfa8e03860
Configure client connection backoff
...
For faster startup times (from 2s to ~130ms)
2020-04-17 14:37:54 +02:00
91951eb03a
Rename context to example to make it more explicit, context will be a local command managing contexts (similar to docker-cli context command, adapted here for more generic purpose)
2020-04-07 21:36:25 +02:00
37591c714b
Add base cli and connection logic
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-04-06 11:54:01 -04:00
Milas Bowman
Guillaume Lours
Khoa Le
Laura Brehm
Nicolas De Loof
Sebastiaan van Stijn
Pierre Roux
Ulysses Souza
ThedosiouTh
Nick Sieger
Bastian Venthur
Jan Vitturi
Guillaume Lours
Daniel Lublin
Jille Timmermans
Eric Freese
Matthias Schoettle
Victor Timofei
PIG208
Mehrad Dadar
Vedant Koditkar
Mehrad Dadar
Guillaume Rose
Ulysses Souza
Jon Cram
notok
Mathieu Champlon
Debdut Chakraborty
Shikachuu
Iaroslav Sheptykin
Lorena Rangel
aviau
Hironao OTSUBO
Milas Bowman
Afshin Paydar
Djordje Lukic
Christopher Crone
Guillaume Tardif
Michael Crosby