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

580 Commits

Author SHA1 Message Date
Dan Miller 17087447e9 logger: move to pkg (#2031) 2023-02-02 14:59:30 +01:00
Nick Santos ec781687fd watch: add retry counts to fsync (#2023) 2023-02-02 14:59:30 +01:00
Nick Santos b22dde9f18 dockerignore: improve MatchesEntireDir (#1865) 2023-02-02 14:59:30 +01:00
Nick Santos a31350ede1 watch: move more of the directory-skipping logic into the interface (#1864) 2023-02-02 14:59:30 +01:00
Nick Santos d744c97f13 watch: add a simple check when there are no exclusions (#1863) 2023-02-02 14:59:30 +01:00
Nick Santos 37647bc600 watch: skip setup if nothing is being watched (#1861) 2023-02-02 14:59:30 +01:00
Nick Santos 21e5d564af watch: FileEvents must always be absolute (#1841) 
there were a lot of confused tests that were using relative paths, then trying to workaround this
 2023-02-02 14:59:30 +01:00
Nick Santos 390d5cf165 watch: add tests for ignores and number of watches (#1838) 2023-02-02 14:59:30 +01:00
Nick Santos 7f6e189dbc watch: change the watcher interface to better match how we actually use it (#1835) 2023-02-02 14:59:30 +01:00
Dan Miller b5ccea7b0e watch: record num watches in expvars (#1795) 2023-02-02 14:59:30 +01:00
Matt Landis 47551895f3 makefile: fix goimports -local (#1763) 2023-02-02 14:59:30 +01:00
Nick Santos 5e0f1eec16 watch: fix spurious errors while watching (#1726) 2023-02-02 14:59:30 +01:00
Dan Bentley f82e2de57e watch: don't watch each individual file (#1613) 2023-02-02 14:59:30 +01:00
Matt Landis 9c7f7bc0fa live_update: error if syncing from outside of docker context (#1396) 2023-02-02 14:59:30 +01:00
Nick Santos 6defe7cac6 watch: tfw you have a test that asserts broken file-watch behavior 😢 (#1354) 2023-02-02 14:59:30 +01:00
Dan Miller 0482f9276a watch: add watch function that traverses up directory structure recursively (#1013) 2023-02-02 14:59:30 +01:00
Nick Santos e8a34c8d1e watch: remove inotify-specific bits of watcher_linux (#890) 
the tests on windows don't pass yet, but at least it compiles
 2023-02-02 14:59:30 +01:00
Nick Santos 9e261c18b3 watch: fix a bug when a file and its ancestor both have direct watches (#863) 2023-02-02 14:59:30 +01:00
Nick Santos 1fd7ca5440 testing: update internal/watch to use the tempdir fixture (#862) 2023-02-02 14:59:30 +01:00
Maia McCormick 139edc403f cleanup: wrap errors properly (#772) 
* cleanup: wrap errors properly

* fix build error

* asdfg linux

* fix test
 2023-02-02 14:59:30 +01:00
Dan Miller 38b3f3b678 watch: use `sinceWhen` and `HistoryDone` to avoid spurious events (#557) 
Here's our new watch strategy on Darwin in a nutshell:

1. Create an fsevents stream for events "since" the last event ID that
we saw globally.
2. Add a path that we want to watch
3. Add that path to a map of paths that we're watching _directly_.
4. Restart the event stream to pick up the new path.
5. Ignore all events for all watches until we've seen a `HistoryDone`
event.
6. Ignore the first `ItemCreated` event for paths we're watching that
are also directories
7. Otherwise, forward along all events.
 2023-02-02 14:59:30 +01:00
Nick Santos c5bce8bd42 watch: fix a spurious error (#344) 2023-02-02 14:59:30 +01:00
Nick Santos c8a358a455 watch: try a slightly different ignore strategy (#174) 2023-02-02 14:59:30 +01:00
Nick Santos a6701652d2 watch: fix more data races on darwin (#166) 2023-02-02 14:59:30 +01:00
Nick Santos 4562b0bf95 watch: a new strategy for handling spurious events, hoping to fix race conditions (#163) 2023-02-02 14:59:30 +01:00
Nick Santos 4801d2b1a4 watch: fix a flaky test by ignoring spurious events correctly (#162) 2023-02-02 14:59:30 +01:00
Nick Santos 3850a34114 watch: fix a segfault on linux (#148) 2023-02-02 14:59:30 +01:00
Nick Santos 664e6f6f23 watch: stop skipping tests (#145) 2023-02-02 14:59:30 +01:00
Nick Santos d4f074b32f watch: simplify the fileEvent interface to only contain paths (#144) 2023-02-02 14:59:30 +01:00
Dan Miller a3b012d89f add errcheck (#93) 2023-02-02 14:59:30 +01:00
Matt Landis a755c84ea0 tilt: copy watch code from tesseract 2023-02-02 14:59:30 +01:00
Ben Moss ef34a38ac0
Add remote buildx driver 
Signed-off-by: Ben Moss <ben@mossity.com>
 2023-02-01 10:30:07 -05:00
Guillaume Lours f24d3458c6
Merge pull request #10217 from glours/dry-run-pause-support 
Dry run pause support
 2023-01-31 14:56:27 +01:00
Nicolas De Loof 41e056341b rename `convert` to `config` to align with compose v1 UX 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-30 22:23:53 +01:00
Guillaume Lours 6754c6b68a add dry-run support of pause and unpause commands 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-30 10:36:36 +01:00
Guillaume Lours 982a8ccb88 support dry-run for kill command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-30 09:27:17 +01:00
Guillaume Lours 790712fa92 update tty and plain text writers to support dry run mode 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-30 09:27:17 +01:00
maxcleme 634a7d2a7b Support for docker compose build --push when using multiple platforms 
Signed-off-by: maxcleme <maxime.clement@docker.com>
 2023-01-26 16:54:41 +01:00
Nicolas De Loof aa31387355 cleanup TUI lines after switching to "compact" mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-26 07:56:49 +01:00
Guillaume Lours d5d9f67547
Merge pull request #10173 from glours/dry-run 
Skeleton for dry-run under alpha command
 2023-01-20 15:37:52 +01:00
Laura Brehm 220626ec5e
Only account running containers for logs 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-01-20 13:30:05 +01:00
Nicolas De Loof c15bf1955a debounce refresh requests with quietperiod 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-18 22:12:54 +01:00
Laura Brehm 0b1c86726e Add tests for filtering containers not created by Compose 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-01-17 19:00:02 +01:00
Laura Brehm 82ef998511 Ignore containers created outside compose 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-01-17 19:00:02 +01:00
Guillaume Lours fb36f7fffd directly embed the orignal APIClient in the DryRunClient 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours 3fac506a30 identify functions which need to be ovorridden for dry run feature 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours eb59b0e265 add alpha command to test dry-run 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours 5081ab0507 create custom CLI when dry-run mode active 
update documentation

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours 13ef440d6a add DryRun API Client with delagation pattern 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours fbf845c5f8 add dry-run flag 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-16 11:11:35 +01:00
Guillaume Lours 5a2b7b83cd use compose service methods when exist instead of directly service.dockerCli 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-01-13 21:02:00 +01:00
Laura Brehm 9daf41892f
Adjust terminal height calc 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-01-12 11:20:05 +01:00
Laura Brehm 2aa88b5c9e
Merge pull request #10149 from TColl/typo-fix 
fix typo
 2023-01-12 10:56:28 +01:00
Nicolas De Loof bb9cf32245 introduce experimental watch command (skeletton) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-12 10:52:58 +01:00
Laura Brehm 69a09624c9 Skip child events when printer events > terminal height 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-01-12 09:52:25 +01:00
Tom Collingwood f2088bb917 fix typo 
Signed-off-by: Tom Collingwood <tomcollingwood@yahoo.co.uk>
 2023-01-11 19:07:29 +00:00
Nicolas De Loof 3e12a7cb23 pass proxy config as build args - same as docker/buildx#959 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-10 12:15:13 +01:00
Edward Muller 73ebbffb08 Don't share the options map 
Without this I get an exception when building multiple images in a
compose run.

```
fatal error: concurrent map writes

goroutine 16 [running]:
github.com/docker/compose/v2/pkg/compose.(*composeService).build.func1({0x2cba4e0, 0xc00019b2c0}, {0xc000233150?, 0xd?})
        github.com/docker/compose/v2/pkg/compose/build.go:95 +0x652
github.com/docker/compose/v2/pkg/compose.(*graphTraversal).run.func1()
        github.com/docker/compose/v2/pkg/compose/dependencies.go:127 +0x63
golang.org/x/sync/errgroup.(*Group).Go.func1()
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:75 +0x64
created by golang.org/x/sync/errgroup.(*Group).Go
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:72 +0xa5
...
```

I'm not sure why the map is currently shared, but with this patch
applied my docker-compose build run works.

Signed-off-by: Edward Muller <emuller@fastly.com>
 2023-01-09 12:01:57 +01:00
Nicolas De Loof b326a9da1d
don't filter by services if no filter was set 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-09 11:49:08 +01:00
Nicolas De Loof f1313f3a09 use a simpler prompt implementation when we lack a terminal 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-09 10:28:16 +01:00
Nicolas De Loof 96bbda98f8 add support for uts namespace 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-06 08:15:52 +01:00
Guillaume Lours f6f29a4438
Merge pull request #10133 from ndeloof/build_concurrency 
limit build concurrency according to --parallel
 2023-01-05 09:57:13 +01:00
Nicolas De Loof d5e4f00644 introduce --no-attach to ignore some service output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-03 18:43:40 +01:00
Nicolas De Loof 8b4ac37f9c introduce `--ignore-buildable` to ignore buildable images on pull 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-03 18:43:23 +01:00
Nicolas De Loof b96e27e0e7 limit build concurrency according to --parallel 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-03 12:01:30 +01:00
Guillaume Tardif 37d15d7e6b Ignore not only auto-removed containers but also "removal in progress" for orphan containers 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2023-01-03 11:09:41 +01:00
Guillaume Lours fd353ffa94 add support of privileged attribut in service.build section 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-23 09:32:48 +01:00
Guillaume Lours adf8e75317 cleanup framework.go from uncessary debug logs 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-21 21:28:06 +01:00
Guillaume Lours 6c537cc0f4
Merge pull request #10113 from glours/add-buildx-plugin-e2e 
add buildx plugin to e2e configuration directory
 2022-12-21 21:21:01 +01:00
Nicolas De Loof 9f7ad18d62 reduce cyclomatic complexity 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-21 21:12:06 +01:00
Nicolas De Loof 40ebcd6203 fix security opts support (seccomp and unconfined) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-21 21:12:06 +01:00
Nicolas De Loof 9bd9f1765c check service names based on project, not running containers 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-21 21:11:44 +01:00
Guillaume Lours 5dcadc05d9
debut output for CI 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-21 21:09:49 +01:00
Guillaume Lours c72f161afb
change the way finding the just built compose binary 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-21 19:47:39 +01:00
Guillaume Lours 86a648bd51
e2e tests display Compose version used to run the test 
currently the version displayed is the one installed and not the one use for the tests

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-21 18:38:24 +01:00
Guillaume Lours 935968fe2c
add buildx plugin to e2e configuration directory 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-21 15:27:34 +01:00
Nicolas De Loof 91371fef7a remove flaky TestLocalComposeLogsFollow 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-21 08:45:41 +01:00
Nicolas De Loof 986bc44549 service hash MUST exclude replicas 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-21 08:45:41 +01:00
Nicolas De Loof 24f83271f2 don't assume os.Stdout and rely on dockerCLI.streams 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-20 23:52:25 +01:00
Nicolas De Loof dacf24374d
dump stdout to help diagnose flaky test 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-20 23:50:58 +01:00
Nicolas De Loof 22d2e83896
don't fail `logs` when driver:none is set 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-20 16:23:47 +01:00
Nicolas De Loof b4b7319901
introduce support for cgroup namespace 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-20 14:06:33 +01:00
Nicolas De Loof 0ab5079c1a
fix race condition on compose logs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-20 09:21:31 +01:00
Nicolas De Loof b8bbdcd872 detect dependency failed to start 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-19 16:26:39 +01:00
Nicolas De Loof d0e95ccac3
set CPU quota 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-19 15:05:09 +01:00
Guillaume Lours 1e682a40ac
Merge pull request #10099 from laurazard/use-defaultplatform-create 
Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container
 2022-12-19 14:17:49 +01:00
Laura Brehm 7bc27d441b
Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-12-19 11:58:03 +00:00
Nicolas De Loof c1ce53c972 fix regression running pull --ignore-pull-failures 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-19 11:56:03 +01:00
Nicolas De Loof e42673daed only list running containers when --all=false 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-16 21:46:55 +01:00
Milas Bowman ffb95449a2 volume: fix WCOW volume mounts 
Do not use the older `Volumes` field in the API; instead rely on
the more robust `Mounts`. For Linux containers, it seems that it's
fine to set both of these. For Windows containers (WCOW), however,
there appears to be a Moby bug that causes it to normalize the
anonymous (`Volumes`) variant to lowercase, which can result in
duplicative volume definitions and an error when trying to start
the container.

Fixes #9577.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-12-16 09:52:34 -05:00
Nicolas De Loof 5c1484ece6 apply uid/gid when creating secret from environment 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-15 15:54:04 +01:00
Nicolas De Loof 8c39b5b7fd align `--format` flag and UX with docker cli 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-14 22:53:43 +01:00
Nicolas De Loof bc568eeb9b align `compose ps` output with `docker ps` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-14 22:53:43 +01:00
Sebastiaan van Stijn a501ab3a2f use StatusError from docker/cli, not "dockerd" 
This package is a leftover from when the "docker" cli and the "dockerd"
cli both lived in the same repository. The package in docker/docker will
be (re)moved soon, so replace it with the implementation in docker/cli,
which is the right one :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-14 22:53:18 +01:00
Nicolas De Loof 05e987dd0a fix parsing of repository:tag 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-14 09:23:07 +01:00
Nicolas De Loof 0368f19030 distinguish stdout and stderr in `up` logs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-13 14:42:42 +01:00
Nicolas De Loof 3ee2ab87bb ContainerStart must run sequentially for engine to assing distinct ports within configured range 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-12 16:08:50 +01:00
Nicolas De Loof 8f991a20db Fix corner case when there's no container to attach to 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-09 10:02:56 +01:00
Nicolas De Loof 0234e13454 Don't stop pull for images that can be built 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-08 21:20:04 +01:00
Nicolas De Loof a73dce44b3 fix race condition collecting pulled images IDs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-07 21:33:44 +01:00