tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,450 Commits 23 Branches 268 Tags
Commit Graph

169 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
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
Guillaume Lours
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
Laura Brehm
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
Guillaume Lours
6d613c8cb2
Merge pull request #9636 from ulyssessouza/dotenvfile-priority 
Environment variables priority
 2022-07-29 19:42:50 +02:00
Guillaume Lours
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
Guillaume Lours
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
Nicolas De Loof
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
Pierre Roux
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
Ulysses Souza
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
Guillaume Lours
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
Nicolas De Loof
9976077e24 introduce --pull 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-07-27 11:24:00 +02:00
Ulysses Souza
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
Ulysses Souza
96cbb1cbcf Add "style" tag to gocritic 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Ulysses Souza
d42adf6efb Add "opinionated" tag to gocritic 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Ulysses Souza
a81f23a199 Add "diagnostic" tag to gocritic 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Ulysses Souza
2e96829607 Add gocritic to linters 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:03 +02:00
Guillaume Lours
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
ThedosiouTh
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
ThedosiouTh
8648f30351 TC: Add missing tests for argumetns 
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
 2022-06-30 18:50:24 +03:00
ThedosiouTh
9542bdf445 TC: fix naming 
Signed-off-by: ThedosiouTh <thanosthd@gmail.com>
 2022-06-30 18:50:24 +03:00
ThedosiouTh
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
Nick Sieger
fd5e8b8c28
fix: panic caused by empty string argument 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-28 10:18:38 -05:00
Milas Bowman
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
Milas Bowman
4ea3ba77b2
Merge pull request #9559 from venthur/fix_spell 
fixed some spelling mistakes
 2022-06-16 15:56:44 -04:00
Nick Sieger
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
Bastian Venthur
8a5d555de7 fixed some spelling mistakes 
that's all :)

Signed-off-by: Bastian Venthur <venthur@debian.org>
 2022-06-14 21:33:36 +02:00
Laura Brehm
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
Nick Sieger
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
Ulysses Souza
67c13cf821 Import dotenv file to os environment 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-05-30 17:36:41 +02:00
Nicolas De Loof
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
Nicolas De Loof
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
Jan Vitturi
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
Guillaume Lours
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
Guillaume Lours
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
Daniel Lublin
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
Daniel Lublin
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
Jille Timmermans
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
Ulysses Souza
69e21d89f0 Fix relative paths on envfile label 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-04-30 10:14:39 +02:00
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 abbba74b27bfbcb7e5dea8018f02e2b065ad51d7 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