source/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-02-09 01:59:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,541 Commits 22 Branches 294 Tags
dcbf005fe4fa2b360b8dd013d6dedc4796c37602
Commit Graph

356 Commits

Author SHA1 Message Date
Laura Brehm
dcbf005fe4 up: gracefully teardown when command ctx cancelled 
Previously, if a long-lived plugin process (such as
an execution of `compose up`) was running and then
detached from a terminal, signalling the parent CLI
process to exit would leave the plugin process behind.

To address this, changes were introduced on the CLI side
(see: https://github.com/docker/cli/pull/4599) to enable
the CLI to notify a running plugin process that it should
exit. This makes it so that, when the parent CLI process
is going to exit, the command context of the plugin
command being executed is cancelled.

This commit takes advantage of these changes by tapping into
the command context's done channel and using it to teardown
on an up.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-12-23 02:49:27 +00:00
Laura Brehm
ce5a0c656f Fix cancellable context detection in AdaptCmd 
`AdaptCmd` was previously checking for a `.WithCancel` suffix
on context strings, however it's possible for a context to be
cancellable without ending in that suffix, such as when
`context.WithValue` was called after `WithContext`, e.g.:

```go
context.Background.WithCancel.WithValue(type trace.traceContextKeyType,
val <not Stringer>).WithValue(type api.DryRunKey, val <not Stringer>)
```

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-12-22 13:39:04 +00:00
Nicolas De Loof
17da54da20 introduce build --with-dependencies 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-20 15:58:54 +01:00
Nicolas De Loof
e4fb5545f0 build do not require environment to be reslved 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-14 11:21:46 +01:00
Nicolas De Loof
74cc091225 github.com/golang/mock is deprecated 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-13 14:47:39 +01:00
Nicolas De Loof
bdbda79043 include disabled services for shell completion 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-06 09:38:11 +01:00
Nicolas De Loof
26aca867d8 avoid use of service.Name when iterating on project.Services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Nicolas De Loof
138facea62 project.Services is a map 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Nicolas De Loof
cda04f288e adopt compose-go/v2 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Milas Bowman
df6fe59f72 tweak help message on oci version flag 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +01:00
Milas Bowman
7c8ff36d78 move around OCI logic, auto fallback/retry 1.1 -> 1.0 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +01:00
Nicolas De Loof
ce1ddb6c7e fix combination of --pull always --no-build 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-04 11:08:08 +01:00
Amit Saha
750553c866 introduce compose logs --index to select a replica container 
Signed-off-by: Amit Saha <asaha@atlassian.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-29 13:56:16 +01:00
Amit Saha
ddda59a130 Add index option to compose logs command 
Signed-off-by: Amit Saha <asaha@atlassian.com>
 2023-11-29 13:56:16 +01:00
Nicolas De Loof
16c4241c0b log we don't expose service ports when --verbose 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-29 11:40:16 +01:00
Nicolas De Loof
a1de0b96c3 Restore Project is ps json output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-24 10:46:33 +01:00
Nicolas De Loof
caa0cbbc4b Introduce ps --orphans so user can include/exclude services not declared by project 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-23 13:43:49 +01:00
Guillaume Lours
c665c53cc1 bump buildx to v0.12.0 and adapt code to changes 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-23 07:36:13 +01:00
Guillaume Lours
2ba5e4c1d0 in watch mode force pull policy to build for services with both build and develop attributes 
This default behaviour will force a rebuild of the service images at watch process startup and be sure containers will be in sync with the local source code

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-21 16:42:43 +01:00
Nicolas De Loof
5e77ae9247 avoir use of []types.ServiceConfig 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-21 12:08:12 +01:00
Nicolas De Loof
c16943609c render quiet after filtering applied 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-15 20:25:40 +01:00
szampardi
646a8fc0e8 fix docker/compose#11170 add newline in cmd/compose/build.go fmt.Fprint 
Signed-off-by: szampardi <szampardi@deepnull.com>
 2023-11-08 16:17:23 +01:00
Nicolas De Loof
2945532f97 fix --pull documentation 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-07 09:03:49 +01:00
Nicolas De Loof
d646d757a2 lint 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof
71237ef62b do not resolve cache dir until remote resource is in use 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof
6727908803 introduce --resolve-image-digests for publish to seal service images by digest 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 10:43:45 +01:00
Matthew Walowski
704a9fd337 Use project.ServiceNames() if no service specified in hash 
Signed-off-by: Matthew Walowski <mattwalowski@gmail.com>
 2023-10-27 21:16:15 +02:00
Nicolas De Loof
dd0803dba1 fix SIGTERM support to stop/kill stack 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-10-26 12:19:50 +02:00
Eng Zer Jun
6c345b3755 refactor(cmd/compose/run): remove redundant len check 
From the Go specification [1]:

  "1. For a nil slice, the number of iterations is 0."

`len` returns 0 if the slice is nil [2]. Therefore, checking
`len(v) > 0` before a loop is unnecessary.

[1]: https://go.dev/ref/spec#For_range
[2]: https://pkg.go.dev/builtin#len

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
 2023-10-23 16:06:52 +08:00
Guillaume Lours
b92981015e check that the pull policy provided is a valid one 
or is not missing when --pull is used

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-10-18 15:44:37 +02:00
Guillaume Lours
af87f10650 Merge pull request #11108 from ndeloof/down-services 
enable profile when down is ran with explicit service names
 2023-10-18 13:49:11 +02:00
Guillaume Lours
5e1d3f2b41 Merge pull request #11051 from ndeloof/warn_remote_disabled 
warn user remote resource is disabled
 2023-10-18 12:54:40 +02:00
Nicolas De Loof
16a7c20960 enable profile when down is ran with explicit service names 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-10-18 12:19:45 +02:00
Guillaume Lours
9dd081b92e add support of COMPOSE_ENV_FILES env variable to pass a list of env files 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-10-05 21:55:43 +02:00
Nicolas De Loof
fe8c2780c8 warn user remote resource is disabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-29 09:30:38 +02:00
Matthew Walowski
a345515f91 Don't delete dependent services 
Signed-off-by: Matthew Walowski <mattwalowski@gmail.com>
 2023-09-29 06:43:16 +02:00
Matthew Walowski
8967df7a91 Apply platform before hashing 
Signed-off-by: Matthew Walowski <mattwalowski@gmail.com>
 2023-09-29 06:43:16 +02:00
Matthieu MOREL
4f694919ff deps: remove deprecated github.com/pkg/errors 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-09-29 06:28:58 +02:00
Nicolas De Loof
44d21280e7 truncate command by default, introduce --no-trunc flag to get the full command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-23 06:34:26 +02:00
Nicolas De Loof
ab81db5bdb config --xx don't need env_file being parsed 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-21 10:47:38 +02:00
Guillaume Lours
6be5f3003a move watch from alpha to main command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-09-20 18:55:08 +02:00
Nicolas De Loof
a697a0690a introduce pull --missing flag to only pull images not present in cache 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-15 08:41:27 +02:00
Guillaume Lours
9d7e0ad6cb correct scale error messages formatting 
Co-authored-by: Milas Bowman <devnull@milas.dev>
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-09-13 11:15:14 +02:00
Guillaume Lours
1a98a70b8a add scale command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-09-13 11:15:14 +02:00
Milas Bowman
13115468d5 cli: fix --build flag for create (#10982) 
I missed this during a refactor and there wasn't test coverage.
Instead of adding more heavy-weight integration tests, I tried
to use `gomock` here to assert on the options objects after CLI
flag parsing. I think with a few more helpers, this could be a
good way to get a lot more combinations covered without adding
a ton of slow E2E tests.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-09-08 11:35:57 -04:00
Rory
e1aa4f779b otel: add args & flags to cli traces (#10974) 
Signed-off-by: rvigus <roryvigus@gmail.com>
 2023-09-07 16:04:36 -04:00
Milas Bowman
d7b0b2bd7d watch: build & launch the project at start (#10957) 
The `alpha watch` command current "attaches" to an already-running
Compose project, so it's necessary to run something like
`docker compose up --wait` first.

Now, we'll do the equivalent of an `up --build` before starting the
watch, so that we know the project is up-to-date and running.

Additionally, unlike an interactive `up`, the services are not stopped
when `watch` exits (e.g. via `Ctrl-C`). This prevents the need to start
from scratch each time the command is run - if some services are already
running and up-to-date, they can be used as-is. A `down` can always be
used to destroy everything, and we can consider introducing a flag like
`--down-on-exit` to `watch` or changing the default.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-09-07 13:27:23 -04:00
Nicolas De Loof
e0f39ebbef pull OCI remote resource 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-07 07:27:32 +02:00
Nicolas De Loof
c9d54f09cf introduce publish (alpha) command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-07 07:27:32 +02:00
Nicolas De Loof
32c3d0a3ff Enable service explicitly requested to be restarted 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-09-01 12:01:02 +02:00