tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,524 Commits 25 Branches 262 Tags 66 MiB
Commit Graph

181 Commits

Author SHA1 Message Date
Nicolas De Loof 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
Eric Freese d871cb98e5 Fix search/replace typo in --no-TTY documentation 
Commit abbba74b27 looks to have
accidentally replaced `pseudo-tty` with `pseudo-noTty` in several
places. In other places, it looks like it replaced `pseudo-tty` with
`pseudo-TTY`, so I used the uppercased version in these places as well.

For example, running version 2.3.3, I get this output:

```
% docker-compose run --help

...

Options:
  ...
  -T, --no-TTY                Disable pseudo-noTty allocation. By default docker compose run allocates a TTY
  ...
```

Signed-off-by: Eric Freese <ericdfreese@gmail.com>
 2022-04-04 19:06:03 +02:00
Ulysses Souza c7473c68ae
Merge pull request #9335 from ulyssessouza/remove-deadcode 
Remove dead warning code
 2022-03-31 17:04:29 +02:00
Ulysses Souza 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
Ulysses Souza 60363c36df Remove dead warning code 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-03-31 16:42:04 +02:00
Matthias Schoettle 6dbd6ffe11 fix typo in ssh option description 
Signed-off-by: Matthias Schoettle <git@mattsch.com>
 2022-03-31 10:14:13 -04:00
Ulysses Souza 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
Guillaume Lours 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
Guillaume Lours 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
Guillaume Lours 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
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof cd8074d501
kill only need project name 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-14 10:26:36 +01:00
Ulysses Souza 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
Sebastiaan van Stijn 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
Guillaume Lours 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
Nicolas De Loof 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
Guillaume Lours 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
Nicolas De Loof 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
Nicolas De Loof 2282159922
map --interactive to StdinOpen 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-08 10:17:17 +01:00
Victor Timofei 9054f6a18b Fix json format for version command 
Signed-off-by: Victor Timofei <victor@vtimothy.com>
 2022-03-08 09:40:25 +01:00
Nicolas De Loof 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
PIG208 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
Guillaume Lours 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
Ulysses Souza 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
Ulysses Souza 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
Nicolas De Loof 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
Mehrad Dadar 5885a250bc
Merge branch 'docker:v2' into issue#9147 2022-02-24 18:03:05 +03:30
Nicolas De Loof 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
Mehrad Dadar 7e7262bc77
Merge branch 'docker:v2' into issue#9147 2022-02-22 05:08:29 +03:30
Nicolas De Loof 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
Vedant Koditkar 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
Nicolas De Loof 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
Mehrad Dadar 65ed8cf4c2 Implemented #9147 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-05 10:27:52 +03:30
Guillaume Rose 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
Ulysses Souza a279c3a934 Discard env_file section on convert/config 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-01-15 11:45:08 +01:00
Ulysses Souza 7b6439997d Fix output redirection on command run 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-15 15:10:22 +01:00
Ulysses Souza 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
Nicolas De Loof 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
Ulysses Souza cf7319fc6e Only kill running containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-10 08:48:38 +01:00
Nicolas De Loof 740276f550 handle "stop" event 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-09 13:57:52 +01:00
Jon Cram f03b7085c3 compose ps: fix typo "unknow" -> "unknown" 
Signed-off-by: Jon Cram <webignition@gmail.com>
 2021-12-09 08:56:35 +01:00
notok 3bbcc3d4d0 Fix lint error 
Signed-off-by: notok <noto.kazufumi@gmail.com>
 2021-12-08 18:42:00 +09:00
Ulysses Souza 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
Mathieu Champlon 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
Nicolas De Loof 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
Nicolas De Loof 45956c36fb introduce docker compose config --images 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-23 19:13:04 +01:00
Nicolas De Loof 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
Nicolas De Loof 3261b60fd1 --quiet implies --progress=quiet 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 13:08:30 +01:00
Nicolas De Loof cb425a23c0 check supported --progress flag values 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-17 13:08:30 +01:00
Ulysses Souza 865b82da6a Remove unused flag 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-12 14:56:27 +01:00
Ulysses Souza a79346b978 Support inherited environment vars on exec 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-11-05 20:51:36 +01:00
Nicolas De Loof 72e4519cbf introduce up --wait condition 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-11-03 18:22:29 +01:00
Nicolas De Loof 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
Ulysses Souza 2530bd981a Fix project settings' options order 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-22 14:59:25 +02:00
Ulysses Souza 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
Debdut Chakraborty 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
Debdut Chakraborty 35b4d1de28 Fix checking -t flag 
Signed-off-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
 2021-10-13 08:59:16 +05:30
Shikachuu 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
Mathieu Champlon 98fe57baac Make command descriptions consistent 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-10-04 15:10:37 +02:00
Ulysses Souza 435387c72c
Merge pull request #8712 from ndeloof/ps-status-services 
allow combination of --status and --services
 2021-09-30 12:51:26 +02:00
Ulysses Souza ecee21b5e5
Merge pull request #8708 from ulyssessouza/standalone 
Add standalone capacility
 2021-09-30 10:23:02 +02:00
Nicolas De Loof 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
Nicolas De Loof 1faa76ee4e
use compose-switch Convert 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-30 09:15:56 +02:00
Ulysses Souza 17354fcc99 Add standalone capacility 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-09-30 02:16:55 +02:00
Nicolas De Loof 7f31fe678f
make --status a multi-flag 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-29 17:17:28 +02:00
Iaroslav Sheptykin 3f37003340 Deprecate --filter. List values for --status 
Signed-off-by: Iaroslav Sheptykin <i.sheptykin@neusta.de>
 2021-09-27 17:47:52 +02:00
Nicolas De Loof 07b5512a68 `run` must attach to stdin 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-27 17:42:37 +02:00
Lorena Rangel 1ec997270d
Merge pull request #8668 from ndeloof/ignore_orphans 
add support for COMPOSE_IGNORE_ORPHANS
 2021-09-27 16:40:25 +02:00
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof 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
Ulysses Souza 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
Ulysses Souza 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
Ulysses Souza 3bf555cbd6 Fix lint make target 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-09-20 13:09:11 +02:00
Nicolas De Loof 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
aviau 21d3b19e57 compose/run: don't waitDependencies if NoDeps 
Signed-off-by: aviau <alexandre@alexandreviau.net>
 2021-09-16 11:09:44 +02:00
Nicolas De Loof 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
Ulysses Souza 4441ff5b21
Merge pull request #8604 from ndeloof/convert_output 
introduce `--output` option to `config` command
 2021-09-14 08:03:03 +02:00
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof a0bff8be96
redundant break statement 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-09 18:47:18 +02:00
Nicolas De Loof 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
Nicolas De Loof e8666b02f3 introduce up --attach 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-09 08:29:07 +02:00
Nicolas De Loof 2ceb176500 support --entrypoint="" as override 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-08 10:39:08 +02:00
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof 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
Nicolas De Loof c944c970ab
use nicer imports 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-08-31 16:58:19 +02:00
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
Nicolas De Loof 19cbbdd79e
only build requested services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-08-26 15:55:19 +02:00
Nicolas De Loof 8d476eee4c
apply filter before formatter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-08-06 15:31:50 +02:00
Hironao OTSUBO 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
Nicolas De loof 3d83989f5d
Merge pull request #1773 from ulyssessouza/completion 2021-07-26 08:23:13 +02:00
Milas Bowman 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
Ulysses Souza c28aec2308 Filter completions by toComplete variable 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-07-12 14:33:37 -03:00
Ulysses Souza 72b66fb5c1 Add 'no completion' or 'service' completion 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-07-12 14:33:37 -03:00