Skip to content

Commit

Permalink
base: docker-compose: update to v2.18.1
Browse files Browse the repository at this point in the history
Release notes: https://github.com/docker/compose/releases/tag/v2.18.1

Relevant changes from 2.10.2:
- cd0fc214 only check the platform of cached image if image found
- 9b5a4588 introduce --no-path-resolution to skip relative path to be resolved
- 00f72cb5 report external network not found when swarm is disabled
- fd7847f2 `parallel` flag belong do top-level "compose" cobra command, not the current one
- 18a112e8 detect terminal is not a `console.File` to avoid a panic
- dc01b98a Merge pull request #10559 from ndeloof/COMPOSE_ANSI
- 312f0d1d Update dry-run documentation
- e8caad19 move dry-run support from alpha to main command
- fca454b4 introduce COMPOSE_ANSI to define --ansi default value
- 77dc9b54 rm: remove debugging output (#10554)
- bceb3c18 detect active endpoint trying to remove network and skip with a warning (#10555)
- a14abb90 cli: option to write status messages on stdout (#10549)
- 0363d926 fix local image removal when `compose down` is ran with `--project-name` (#10558)
- 0e375a8c restore long description to be included in `docker compose help` (#10504)
- b776826d check local image matches the required platform
- 3b32a264 Merge pull request #10544 from ndeloof/parallel_race
- e92c5d13 fix race condition running `compose up` with --parallel < number of services
- 0c1a691f fix container being recreated while config has not changed (#10540)
- f72d5d60 Merge pull request #10508 from laurazard/tests-inline-dockerfile
- ee70085f tests: inline dockerfile
- 90bcf610 build(deps): bump github.com/moby/term from 0.0.0-20221205130635-1aeaba878587 to 0.5.0 (#10523)
- 2d25019f Merge pull request #10521 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.15.1
- fb16e49c Merge pull request #10542 from docker/dependabot/go_modules/github.com/docker/cli-23.0.6incompatible
- 109ce190 deps: update related modules
- ef03c906 build(deps): bump github.com/docker/cli
- 865a0867 build(deps): bump go.opentelemetry.io/otel from 1.15.0 to 1.15.1
- 6ee0376b build(deps): bump golang.org/x/sync from 0.1.0 to 0.2.0 (#10534)
- 67455e9f fix builkit progressui integration (#10535)
- 5fdcaa0f Merge pull request #10529 from glours/dry-run-up-support
- 01afe526 Merge pull request #10527 from ndeloof/build_secret_id
- 2e4faf80 add dry-run support to up command
- e88836ff Merge pull request #10525 from thaJeztah/update_go1.20.4
- b45ca827 let user declare build secret target (id)
- d1c36c6e update go to go1.20.4
- b304c4e1 stop containers after termination
- eca1365d cli: dry run support for `build` (#10502)
- 03f4c0e6 progress: make title configurable (#10507)
- 2a0e83ad Merge pull request #10519 from glours/revert-image-spec-upgrade
- 2df9919e Revert "build(deps): bump github.com/opencontainers/image-spec"
- 74fc40d8 Merge pull request #10518 from docker/dependabot/go_modules/github.com/opencontainers/image-spec-1.1.0-rc.3
- d54a95fe build(deps): bump github.com/opencontainers/image-spec
- c1369869 Merge pull request #10515 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.15.0
- f5ff40a2 build(deps): bump go.opentelemetry.io/otel from 1.14.0 to 1.15.0
- 6347b49f Merge pull request #10516 from docker/dependabot/go_modules/github.com/moby/buildkit-0.11.6
- c072a6f5 build(deps): bump github.com/moby/buildkit from 0.11.5 to 0.11.6
- a06d32e7 Merge pull request #10506 from docker/dependabot/go_modules/github.com/opencontainers/image-spec-1.1.0-rc.3
- 28fa309c build(deps): bump github.com/opencontainers/image-spec
- 4f2c933f Merge pull request #10501 from docker/dependabot/go_modules/github.com/docker/cli-23.0.5incompatible
- e22c8964 build(deps): bump github.com/docker/cli
- 07c4849c TailMsgf must format with args
- e606701d Merge pull request #10500 from docker/dependabot/go_modules/github.com/docker/docker-23.0.5incompatible
- 114e5c64 build(deps): bump github.com/docker/docker
- 37dfb5bf build(deps): bump github.com/moby/buildkit from 0.11.5 to 0.11.6 (#10489)
- d01ef588 restore support for `--memory`
- dec608f3 don't block events loop collecting logs
- eb0632b1 Merge pull request #10494 from milas/e2e-dd-419
- 1383ab09 test: fix E2E tests under Engine v23 / DD 4.19
- 5eaafe42 Fixed issue when project name contains dashes (`-`)
- 7840a92c Added tests to `viz` subcommand
- 3751c307 Added docs
- 2bc6a45c Replaced calls to WriteRune with WriteByte and reformatted imports
- 2268d1e5 Started working on `viz` subcommand
- 7b0ed132 bump compose-go to v1.13.4
- d4441efe Merge pull request #10474 from docker/dependabot/go_modules/github.com/docker/docker-23.0.4incompatible
- 58368f69 build(deps): bump github.com/docker/docker
- bc2b2e52 Merge pull request #10475 from docker/dependabot/go_modules/github.com/docker/cli-23.0.4incompatible
- 7723d119 build(deps): bump github.com/docker/cli
- 65fda188 bump compose-go
- 0e7e1b94 Remove redundant goroutine while removing containers (#10449)
- af6f0ffb Merge pull request #10458 from thaJeztah/simplify_auth
- 9ef173a3 log: fix race on container kill (#10459)
- 1fb0c03e Merge pull request #10457 from thaJeztah/mod_tidy
- 1892be8c Don't use "info.IndexServerAddress" for authentication
- 37068a70 go.mod: fix grouping of dependencies, and tidy
- a4af5e22 Merge pull request #10455 from docker/dependabot/go_modules/github.com/opencontainers/runc-1.1.5
- 87da6c14 build(deps): bump github.com/opencontainers/runc from 1.1.3 to 1.1.5
- a99acd94 Merge pull request #10444 from glours/dry-run-down-support
- 7fb87856 add dry-run support to down command
- eb933add Merge pull request #10451 from glours/fix-gocyclo-ci-issue
- cb688b5f fix gocyclo lint error which currently block Compose CI
- 8b5b78fb can't watch a service without a build section
- d3e49fe3 ansi=auto|never|always
- 1bca8d5c Merge pull request #10438 from glours/bump-docker-23.0.3
- 76d9cf27 bump docker version to 23.0.3 (CVE-2023-28840)
- d762f5f4 better support NO_COLOR by disabling colors, not ANSI TUI (#10434)
- 90eda35f Merge pull request #10437 from milas/bump-go-1.20.3
- 7ce0096f ci: bump Go to 1.20.3 and various dependencies
- 00eca0af Merge pull request #10432 from ndeloof/timeout
- a10c4c6d restore `--timeout` flag renamed by mistake
- 6a374284 Merge pull request #10413 from glours/dry-run-create-support
- 449a46a2 Merge pull request #10423 from ndeloof/build_classic_panic
- 981cb202 prevent panic using classic builder
- b83edbd0 add dry-run support to create command
- 02ad467f Merge pull request #10415 from docker/dependabot/go_modules/github.com/docker/cli-23.0.2incompatible
- d9e1d419 Merge pull request #10414 from docker/dependabot/go_modules/github.com/docker/docker-23.0.2incompatible
- a4c324b8 build(deps): bump github.com/docker/cli
- 087fae98 build(deps): bump github.com/docker/docker
- aafeaa66 Merge pull request #10409 from ndeloof/ContainerList_race
- c5317496 workaround race condition in ContainerList
- 67c9ecb4 Merge pull request #10404 from glours/dry-run-run-support
- 72a61c06 add dry-run support to run command
- 0b6133f7 Merge pull request #10406 from milas/fix-name-validation
- b24af42b ci: bump compose-go to v1.13.2
- cc70851b Merge pull request #10403 from milas/fix-e2e-win
- 3b85cd2f test: fix e2e commands on Windows
- d818bf6f Merge pull request #10401 from milas/deps-update
- 45a852f4 test: generate valid Compose project names from Cucumber specs
- f0bf4fca Merge pull request #10402 from milas/fix-e2e-race
- cd17c8a9 test: update error message
- 36625ed2 test: fix race in e2e build test
- a6ffdf61 ci: upgrade to Go 1.20.2 & bump deps
- 72260d61 Merge pull request #10400 from docker/dependabot/go_modules/github.com/moby/buildkit-0.11.5
- fd28ab8d Merge pull request #10399 from ndeloof/watch_rebuild
- 9ab5d8c4 build(deps): bump github.com/moby/buildkit from 0.11.4 to 0.11.5
- d637cc3a watch involves up --build after change has been detected
- 925bc6fb Merge pull request #10393 from milas/fix-watch-segfault
- 16d5354d watch: add note about goroutine-safety & test
- 7aaea283 watch: data race / segfault fixes
- 6bedc196 update -p project name flag documentation
- a11515e0 introduce `ignore` attribute for watch triggers
- 6c1f06e4 Run classic builder with BuildConfig, not buildx.Options
- 88b0d17f use `build` as common API for build scenarios
- 9e19bc84 use progress to show copy status
- bef9c48a Merge pull request #10386 from milas/fw-renames
- 105a7c5b watch: add file delete/rename handling
- 03f0ed13 Merge pull request #10352 from docker/dependabot/go_modules/github.com/docker/buildx-0.10.4
- f7a13aee build(deps): bump github.com/docker/buildx from 0.10.3 to 0.10.4
- bfeb1dc2 Fix concurrent map read/write when recreating containers
- 9ec43973 Merge pull request #10353 from docker/dependabot/go_modules/github.com/moby/buildkit-0.11.4
- 0b41df98 build(deps): bump github.com/moby/buildkit from 0.11.3 to 0.11.4
- 643557d5 build and push binaries images when a PR is merged or a tag pushed
- 200f47e5 Add support for `additional_contexts` in `build` service config
- e0aaccf4 introduce dockerfile_inline
- 754c0688 one off container name use configured Separator for naming
- e492330d collect built image IDs
- bbe1b77a progress writer uses dockercli.Err stream
- fc4d2dfd Remove "-s" from LDFLAGS
- 85ddfde5 use go 1.20 -cover support
- 6a0398d7 pad can be negative on small terminal
- 4434cea5 add dry-run support for push command
- 62fbf208 Merge pull request #10341 from glours/dry-run-pull-support
- 3f7d3c26 add dry-run support for pull command
- 9cc1613b adopt http://no-color.org/
- c4b47fe9 Merge pull request #10339 from glours/dry-run-restart-support
- 167c6a89 add dry-run support to restart command
- a84345be Merge pull request #10338 from glours/fix-restart-depends_on
- 3cfbac66 restart only needed services by checking depends_on relations
- a3bed265 update compose-go
- ae26426c Report error if project name is empty after normalization
- 4ea44797 only consider containers with config_hash labels (i.e, created by compose)
- a99a0b50 Merge pull request #10320 from milas/e2e-win-pause
- af414e9e Merge pull request #10330 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.19
- 89633748 build(deps): bump github.com/containerd/containerd from 1.6.18 to 1.6.19
- f648c294 Merge pull request #10329 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.14.0
- 33aa6ace build(deps): bump go.opentelemetry.io/otel from 1.13.0 to 1.14.0
- e31b95c1 test: tweak pause test to try and prevent failures in Windows CI
- d4f156cc Merge pull request #10311 from milas/fw-ephemeral
- c0daf8d3 Merge pull request #10316 from docker/dependabot/go_modules/github.com/stretchr/testify-1.8.2
- 7bb60d09 build(deps): bump github.com/stretchr/testify from 1.8.1 to 1.8.2
- da1ca578 watch: ignore ephemeral files & minor output tweaks
- 267cde91 Merge pull request #10302 from glours/update-golang-x-net
- 18af72af bump golang/x/net to v0.7.0 (CVE-2022-41723)
- e831ea82 add support for `restart` for `depends_on`
- 8d56db5e Merge pull request #10287 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.18
- 1edc64ef build(deps): bump github.com/containerd/containerd from 1.6.17 to 1.6.18
- 156e54a0 Merge pull request #10291 from docker/dependabot/go_modules/github.com/docker/buildx-0.10.3
- 762cf9d9 Merge pull request #10252 from glours/dry-run-exec-support
- f3e543fd apply config options for pseudo-subcommands
- 9732608e build(deps): bump github.com/docker/buildx from 0.10.2 to 0.10.3
- 24ff0982 compact TUI to monitor layers download progress
- 593c4263 ci: bump to Go 1.20.1 and latest deps
- 313b82e9 ignore services without a build section
- 5e3e2171 sort service --hash output by service name
- 9ac0392b introduce --timeout on `up`
- 0612b34c introduce --no-deps on restart
- 92e0cd40 also restart dependent services after a service has been restarted
- 1a410ffe Merge pull request #10279 from docker/dependabot/go_modules/go.uber.org/goleak-1.2.1
- 282a29e6 build(deps): bump go.uber.org/goleak from 1.1.12 to 1.2.1
- 256ec499 exclude unstable labels from config hash
- 9765f171 store exec details to offer better dry-run status on ExecStart
- b19df5c9 add support for `excludes` and `rebuild`
- 7a42ba7e use CGO to enable fsevent on OSX
- 5b043c4d ci: don't use `-race` on Windows
- d93da187 Merge pull request #10261 from milas/ci-win-e2e
- 15f7104c ci: use CGO for tests to enable race detector
- eb1c7989 support dry-run for rm command
- 78b94047 support dry-run for stop command
- 25be264e support dry-run for exec command
- e6e2f783 Merge pull request #10251 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.13.0
- 7532f769 build(deps): bump go.opentelemetry.io/otel from 1.12.0 to 1.13.0
- 70ab9f8f bump docker engine and cli version to 23.0.0 with buildkit(v0.11.2) and buildx (v0.10.2)
- 7daa2a53 Merge pull request #10250 from ndeloof/nil_build_args
- 93bffd9a prevent assignment to entry in nil map
- 9a4e74c7 Merge pull request #10209 from ndeloof/wait_containers
- 52478f0c wait on service containers as dependencies to be deterministic
- b5f0a4ee use containers we expect to start for wait condition
- e908f41e Merge pull request #10239 from glours/bump-golang-1.20
- 0f5b5ccb detect replacement container is created and inform printer so it attach and don't stop
- a2d36b6c bump golang to 1.20
- b3ec1106 Merge pull request #10242 from jongwooo/ci/replace-deprecated-command-with-environment-file
- 30772342 ci: Replace deprecated command with environment file
- 23585b9e Merge pull request #10235 from glours/dry-run-cp-support
- fdc17381 add log when copying files/directories between host and containers (both way)
- 2336d9fe support dry-run for cp command
- bf0ed9a4 Merge pull request #10226 from benmoss/add-remote-builder
- 1640f155 initial support for `sync`
- e63cbfba use tilt watcher to track filesystem changes
- 25576289 adjust code and dependencies
- 7d6ee74e cleanup deprecated ioutil functions (#5919)
- c08e0771 watch: optimization to help avoid inotify nodes for large file trees (#5769)
- cf314623 tests: make test fixtures responsible for tearing themselves down (#5512)
- 1b71e3ef lint: fix local-prefixes for goimports (#5453)
- 4d822676 ci: add exportloopref linter and upgrade to golangci-lint v1.43.0 (#5281)
- 6fc0b6ff build: ensure file handles properly closed (#5298)
- ab84b6ac Fix local go_lintfix errors (#5191)
- 7161778c watch: use WalkDir to speed up file listing (#4684)
- 1f5bfe88 test: clean up test loggers a bit (#4580)
- f79c75ab test: fix lint errors on Darwin (macOS) (#4247)
- e62993a8 test: enable unused check, remove dead code (#4208)
- 28251e8b watch: improve error messages when you run out of inotify instances (#3960)
- c7ba7d9d dockerignore: convert ignore patterns to absolute paths [ch9237] (#3743)
- 8b393223 watch: fix a dumb errcheck (#3622)
- b3615d64 watch: increase the windows watch i/o buffer (#3620)
- 1a1d1707 change org name from windmilleng to tilt-dev (#3346)
- fd3e0bbe watch: use the recursive watcher on windows (#3306)
- d2d4d052 Revert "watch: fix inotify tests on windows" (#3147)
- dda0362b watch: fix inotify tests on windows (#3140)
- ddc88ec4 circleci: run make shorttest on windows. flag off a large swath of broken tests (#3132)
- 92c6a65a tilt: enable errcheck on tests (#2877)
- 00b3caec  ci: enable staticcheck, fix problems that were surfaced (#2809)
- 17087447 logger: move to pkg (#2031)
- ec781687 watch: add retry counts to fsync (#2023)
- b22dde9f dockerignore: improve MatchesEntireDir (#1865)
- a31350ed watch: move more of the directory-skipping logic into the interface (#1864)
- d744c97f watch: add a simple check when there are no exclusions (#1863)
- 37647bc6 watch: skip setup if nothing is being watched (#1861)
- 21e5d564 watch: FileEvents must always be absolute (#1841)
- 390d5cf1 watch: add tests for ignores and number of watches (#1838)
- 7f6e189d watch: change the watcher interface to better match how we actually use it (#1835)
- b5ccea7b watch: record num watches in expvars (#1795)
- 47551895 makefile: fix goimports -local (#1763)
- 5e0f1eec watch: fix spurious errors while watching (#1726)
- f82e2de5 watch: don't watch each individual file (#1613)
- 9c7f7bc0 live_update: error if syncing from outside of docker context (foundriesio#1396)
- 6defe7ca watch: tfw you have a test that asserts broken file-watch behavior 😢 (foundriesio#1354)
- 0482f927 watch: add watch function that traverses up directory structure recursively (foundriesio#1013)
- e8a34c8d watch: remove inotify-specific bits of watcher_linux (foundriesio#890)
- 9e261c18 watch: fix a bug when a file and its ancestor both have direct watches (foundriesio#863)
- 1fd7ca54 testing: update internal/watch to use the tempdir fixture (foundriesio#862)
- 139edc40 cleanup: wrap errors properly (foundriesio#772)
- 38b3f3b6 watch: use `sinceWhen` and `HistoryDone` to avoid spurious events (foundriesio#557)
- c5bce8bd watch: fix a spurious error (foundriesio#344)
- c8a358a4 watch: try a slightly different ignore strategy (foundriesio#174)
- a6701652 watch: fix more data races on darwin (foundriesio#166)
- 4562b0bf watch: a new strategy for handling spurious events, hoping to fix race conditions (foundriesio#163)
- 4801d2b1 watch: fix a flaky test by ignoring spurious events correctly (foundriesio#162)
- 3850a341 watch: fix a segfault on linux (foundriesio#148)
- 664e6f6f watch: stop skipping tests (foundriesio#145)
- d4f074b3 watch: simplify the fileEvent interface to only contain paths (foundriesio#144)
- a3b012d8 add errcheck (foundriesio#93)
- a755c84e tilt: copy watch code from tesseract
- ef34a38a Add remote buildx driver
- f24d3458 Merge pull request #10217 from glours/dry-run-pause-support
- 41e05634 rename `convert` to `config` to align with compose v1 UX
- a54d4883 Merge pull request #10215 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.12.0
- c0b4dd86 build(deps): bump go.opentelemetry.io/otel from 1.11.2 to 1.12.0
- 6754c6b6 add dry-run support of pause and unpause commands
- a93f09ef Merge pull request #10210 from glours/dry-run-kill-support
- bbf3ec19 Merge pull request #10216 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.16
- 51bcfa37 build(deps): bump github.com/containerd/containerd from 1.6.15 to 1.6.16
- 982a8ccb support dry-run for kill command
- 790712fa update tty and plain text writers to support dry run mode
- 97752b23 refresh Maintainers list
- 69c0a583 Merge pull request #10208 from laurazard/add-scale-create
- 8bb9a333 Merge pull request #10148 from maxcleme/feat/support_multiarch_push
- 634a7d2a Support for docker compose build --push when using multiple platforms
- cf122395 Merge pull request #10207 from ndeloof/tail_n
- a288332f Update docs to add `--scale` argument to `compose create`
- 9d53ed8f Add `--scale` to `compose create`, refactor scale option
- df707352 Fix: Handle concurrent threads using mutex on the rainbowColor function
- d8bf175c Remove unecessary files
- 4816f40b Fix: remove the infinite goroutine
- ed5a2e83 Remove unecessary files
- fa8d075d Fix: remove the infinite goroutine
- 33c3f4df alias -n for --tail to align with docker CLI
- aa313873 cleanup TUI lines after switching to "compact" mode
- d47f0f31 Update docs to mention `COMPOSE_PARALLEL_LIMITS` and ways to configure parallelism
- ac8ab863 Merge pull request #10195 from ndeloof/ps_docs
- 4721c017 fix docs to reflect docker compose ps being aligned with docker ps
- 5919fcb4 Revert "Fix Goroutine leak in v2/command/formatter"
- 4671e69a Merge pull request #10192 from AhmedGrati/10157-fix-goroutine-leak
- 3a21e1e3 Fix Linting Issues
- b670aefb Feat: Clean inifinite Goroutine
- d5d9f675 Merge pull request #10173 from glours/dry-run
- a2899d5f Merge pull request #10181 from laurazard/fix-log-f
- 220626ec Only account running containers for logs
- 6c795d60 Merge pull request #10186 from glours/bump-compose-go-1.9.0
- 291e1bd6 bump compose-go to version v1.9.0
- e94eb056 allow a TTY to be allocated with -t
- c15bf195 debounce refresh requests with quietperiod
- 0b1c8672 Add tests for filtering containers not created by Compose
- 82ef9985 Ignore containers created outside compose
- fb36f7ff directly embed the orignal APIClient in the DryRunClient
- 3fac506a identify functions which need to be ovorridden for dry run feature
- eb59b0e2 add alpha command to test dry-run
- 5081ab05 create custom CLI when dry-run mode active update documentation
- 13ef440d add DryRun API Client with delagation pattern
- fbf845c5 add dry-run flag
- 5a2b7b83 use compose service methods when exist instead of directly service.dockerCli
- 8c07fa4d mark alpha command as experimental
- db267d86 Merge pull request #10169 from laurazard/fix-terminal-height
- 9daf4189 Adjust terminal height calc
- 2aa88b5c Merge pull request #10149 from TColl/typo-fix
- bb9cf322 introduce experimental watch command (skeletton)
- 7212aaff Merge pull request #10166 from matthewarmand/run-remove-orphans
- 69a09624 Skip child events when printer events > terminal height
- f2088bb9 fix typo
- dadad01e Update docs programatically like you're supposed to
- 1adc9f54 fix docs yaml
- 4cebce3a This option lives in the create options, not the run options
- bd8e5744 Add remove-orphans functionality to run, because it recommends that in error messages
- 4ad87463 Add 🥒 GHA workflow
- 62b3e740 Merge pull request #10124 from laurazard/fix-cucumber-tests
- cc912c62 introduce --remove-orphans in compose create command
- cc7e69c0 Merge pull request #10142 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.15
- 3e12a7cb pass proxy config as build args - same as docker/buildx#959
- 0c197997 Remove unused kube tag
- 00c60da3 Merge pull request #10151 from freeformz/ffz/NoShareMap
- 73ebbffb Don't share the options map
- fbbc0ded Merge pull request #10145 from ndeloof/ps_filter
- b326a9da don't filter by services if no filter was set
- f1313f3a use a simpler prompt implementation when we lack a terminal
- a226d014 fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability
- 7e2af3aa build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
- 96bbda98 add support for uts namespace
- f6f29a44 Merge pull request #10133 from ndeloof/build_concurrency
- aa5cdf2b add support for COMPOSE_PARALLEL_LIMIT (parity with Compose v1)
- d5e4f006 introduce --no-attach to ignore some service output
- 8b4ac37f introduce `--ignore-buildable` to ignore buildable images on pull
- b96e27e0 limit build concurrency according to --parallel
- dcbd68a1 Merge pull request #10136 from gtardif/fix_race_delete_orphan_containers
- 37d15d7e Ignore not only auto-removed containers but also "removal in progress" for orphan containers
- dde7eea2 Update expected Cucumber `compose ps` output to match changes
- a2247807 Set `pullChanged` when setting `--pull` on `compose up`
- ffce33ec Fix empty file when using compose config in case of smaller source files
- 1d9657ae Merge pull request #10127 from docker/dependabot/go_modules/github.com/docker/cli-docs-tool-0.5.1
- 8a3248d0 Update documentation
- 52e7f0fb build(deps): bump github.com/docker/cli-docs-tool from 0.5.0 to 0.5.1
- fd353ffa add support of privileged attribut in service.build section
- 0307c16d Merge pull request #10116 from glours/add-buildx-plugin-e2e
- adf8e753 cleanup framework.go from uncessary debug logs
- 6c537cc0 Merge pull request #10113 from glours/add-buildx-plugin-e2e
- 9f7ad18d reduce cyclomatic complexity
- 40ebcd62 fix security opts support (seccomp and unconfined)
- 9bd9f176 check service names based on project, not running containers
- 5dcadc05 debut output for CI
- c72f161a change the way finding the just built compose binary
- 86a648bd 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
- 27a32419 rely on CI timeout
- 935968fe add buildx plugin to e2e configuration directory
- 91371fef remove flaky TestLocalComposeLogsFollow
- 986bc445 service hash MUST exclude replicas
- 24f83271 don't assume os.Stdout and rely on dockerCLI.streams
- dacf2437 dump stdout to help diagnose flaky test
- bab30509 Merge pull request #10107 from ndeloof/logging_driver_none
- 22d2e838 don't fail `logs` when driver:none is set
- 9f5f0b6f Merge pull request #10106 from ndeloof/cgroupns
- b4b73199 introduce support for cgroup namespace
- ab791877 Merge pull request #10105 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.14
- aae5ddca build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14
- 7cf6d5ec Merge pull request #10104 from ndeloof/logs_race_condition
- 0ab5079c fix race condition on compose logs
- 89ef8198 update projectOptions to be public by renaming it to ProjectOptions
- b8bbdcd8 detect dependency failed to start
- 9d12eec1 Merge pull request #10100 from ndeloof/cpus
- d0e95cca set CPU quota
- 1e682a40 Merge pull request #10099 from laurazard/use-defaultplatform-create
- 7bc27d44 Use `DOCKER_DEFAULT_PLATFORM` to determine platform when creating container
- c1ce53c9 fix regression running pull --ignore-pull-failures
- e42673da only list running containers when --all=false
- c37182b2 Merge pull request #10090 from milas/fix-wcow-volume
- ffb95449 volume: fix WCOW volume mounts
- 0eaa2492 Merge pull request #10084 from ndeloof/secret_uid
- 5c1484ec apply uid/gid when creating secret from environment
- 0fedddb0 Merge pull request #10083 from ndeloof/nodeps
- aa0720f7 Merge pull request #10062 from ndeloof/9554
- 84984864 load project from explicit --files when set
- 8566daa9 use recently introduced `withSelectedServicesOnly` to reduce code duplication
- 1b1f783e Merge pull request #10076 from ndeloof/timestamp
- 84ea395d introduce --timestamp option on compose up
- 1cb5536a Address review comments
- e4850d9c Add --include-deps to push command
- 8c39b5b7 align `--format` flag and UX with docker cli
- bc568eeb align `compose ps` output with `docker ps`
- a501ab3a use StatusError from docker/cli, not "dockerd"
- d4a4dcf4 resolve --env-file as absolute path
- 05e987dd fix parsing of repository:tag
- 0368f190 distinguish stdout and stderr in `up` logs
- 3ee2ab87 ContainerStart must run sequentially for engine to assing distinct ports within configured range
- 8f991a20 Fix corner case when there's no container to attach to
- 0234e134 Don't stop pull for images that can be built
- c342891f Squashed commit of the following:
- 40fb42e0 Merge pull request #10055 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.12
- 8ef34947 build(deps): bump github.com/containerd/containerd from 1.6.10 to 1.6.12
- be74c90f Merge pull request #10059 from glours/remve-e2e-go.mod
- cc247fdb remove go.* from e2e tests directory
- a4ac6ab6 added table of contents inside readme
- a5823b12 Merge pull request #10048 from thaJeztah/update_go_1.19.4
- b27ace6c Merge pull request #10051 from ndeloof/9897
- a73dce44 fix race condition collecting pulled images IDs
- 804d7163 detect required service are gone to stop watching explicit API to stop the log printer
- cc60026c update to go1.19.4
- 6b4ad0d1 Merge pull request #10047 from thaJeztah/cleanup_output
- 87a0a57f Cleanup tips from output
- c80d52ad Merge pull request #10049 from glours/fix-flaky-tests
- 95bc6c58 check only running containers in after down tests of profiles e2e tests
- be30c676 Merge pull request #10045 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.11.2
- 57a1e1e0 Update `e2e` mod deps
- 02305756 build(deps): bump go.opentelemetry.io/otel from 1.11.1 to 1.11.2
- 12dad4f8 Merge pull request #10030 from ndeloof/max_concurrency
- a0acc20d introduce --parallel to limit concurrent engine calls
- 053f20ed port: improve error-handling if port not found (#10039)
- 6ed9a792 Merge pull request #10037 from milas/go-1.19.3
- 9b8d520b ci: upgrade to Go 1.19.3 & bump deps
- 113fb673 schema: add support for tmpfs.mode in mount definition (#10031)
- b9e5f9e9 test: speed up Cucumber stop test (#10032)
- c74a77e8 Make use of Containers.filter() and isService()
- 7f975fa4 Fix replacing "service:x" with "container:y"
- 7cf5940f Merge pull request #10035 from ndeloof/9323
- 73691276 use StringToBool to detect COMPOSE_IGNORE_ORPHANS
- 2e7644ff use api.Separator to print right image names
- 8f2b7471 use DistributionInspect to resolve image digest
- 9ac4f699 move image digests resolution to backend
- 2bef9769 Broken Link fixed in compose docs
- 707d55c7 add file header and cleanup profiles e2e tests
- 5edd7830 add e2e tests to check profile activation via targeted service
- 6fbef296 add e2e tests to check no profile usages
- 7fe43a8b add e2e tests using explicitly profiles
- 24ec0b2d pass services list to projectOrName function to add profiles for targeted services
- ed38fe0d only stop services started by `up` on interruption
- 06e71371 docs: fix grammatical issues (#9997)
- fb5b90ed implement support for oom_score_adj
- 10a5d998 useDockerDefaultOrServicePlatform fct should return service.platform if defined and present in the build.platforms list (or if the list is empty)
- c3e5e499 configure buildx for plain output if --ansi=never has been set
- 770281e9 Merge pull request #10016 from glours/fix-docs-pr-creation-workflow
- 4bf98c70 change the default branch of the doc repository
- 8c5d7baa Merge pull request #9995 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.10
- d7a24e9c Update `e2e` module deps
- 02818ba6 Merge pull request #9998 from glours/display-engine-warnings
- 481ae0aa Merge pull request #9999 from glours/pull-use-default-platform
- 88c3aaf1 Merge pull request #10007 from laurazard/add-build-run
- 19d6ca9c ignore error parsing container number label, just warn
- 6fe03e93 Update docs
- 35d31cc5 Add `--build` option to `compose run`
- 7c5675c3 use platform defined by DOCKER_DEFAULT_PLATFORM when pulling and no service platform defined
- ea32fc99 Merge pull request #9984 from glours/build-image-depends-on
- a077e8a2 display creation warnings from the engine
- c53539e1 Merge pull request #9906 from glours/profiles-priority
- 8c1e2af3 add e2e tests to check build dependency between services
- a9e07020 check if a missing image won't be build via a service declared in depends_on section
- 32f29b83 add --no-consistency flag to convert command
- 533fc616 use COMPOSE_PROFILES value only if no command line arg profiles used
- 386c3554 Merge pull request #9992 from glours/dont-stale-proposal-issues
- bfb9e11f build(deps): bump github.com/containerd/containerd from 1.6.9 to 1.6.10
- 09e742b3 exclude issues with the kind/feature label from stale bot process
- 75437691 Merge pull request #9982 from milas/bump-deps
- 306ae161 ci: upgrade to compose-go v1.7.0
- fd4aecef ci: update dependencies to latest
- 34e945a5 ci: remove uses of deprecated gotest.tools v2 (#9935)
- df9e605b Merge pull request #9947 from glours/manage-resources-reservations
- 6e2e19d6 Merge pull request #9949 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.9
- e1899421 Update `e2e` module dependencies
- 369e9125 build(deps): bump github.com/containerd/containerd from 1.6.8 to 1.6.9
- 71b4976e Merge pull request #9936 from thaJeztah/update_deps
- bd96d032 Merge branch 'v2' into update_deps
- 5a1f6453 Merge pull request #9944 from glours/map-spec-restart-policy-to-engine
- 7ba9aac5 add support of deploy.reservation.memory
- f7961cc7 Merge pull request #9945 from docker/dependabot/go_modules/github.com/stretchr/testify-1.8.1
- 6d64242f Update deps for `e2e` module
- eaf27d9d map deploy.restart_policy.condition to engine values
- 36a91839 build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1
- f472ce34 Merge pull request #9940 from thaJeztah/go1.18_compat
- 533abc3b go.mod: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev
- e8ea3ad2 Merge pull request #9934 from glours/bump-engine-version
- 197c1690 update docker engine API to apply fix of CVE-2022-39253
- c630c8d2 go.mod: update docker-credential-helpers v0.7.0
- 41cf5ee3 go.mod: remove replace for runc
- b7053cad go mod: tidy and group "require" blocks, update comments
- b37a6c7f Merge pull request #9937 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.11.1
- 717ace99 Update `e2e` module deps
- 8bdfc627 build(deps): bump go.opentelemetry.io/otel from 1.11.0 to 1.11.1
- 2978f1a0 Merge pull request #9933 from laurazard/skip-flaky-test
- dd13299e Skip flaky test in CI
- 32ae036f Merge pull request #9925 from glours/update-docker-dependencies
- 3f0550f8 log the error object instead of the string message only
- 18ce1f41 replace deprecated functions
- 3bf29d40 bump docker dependencies version
- c384905d Merge pull request #9926 from laurazard/fix-makefile-modules-target
- 7424a3d3 Fix Makefile target `validate-go-mod` to only run correct bakefile target
- 7c0b8a4c Merge pull request #9912 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.11.0
- 6b7e9466 Update `e2e` module deps
- a6dd9969 Merge pull request #9823 from ulyssessouza/add-codecov
- 91eae4f0 Add Codecov
- 8b897214 port: fix container name in error message (#9909)
- 3892e9cb Merge pull request #9887 from milas/issue-template
- f43a1e3e github: add feature request template
- fa1ae635 github: switch to issue template form
- afc0263f build(deps): bump go.opentelemetry.io/otel from 1.10.0 to 1.11.0
- b15df818 Merge pull request #9908 from docker/dependabot/go_modules/github.com/spf13/cobra-1.6.0
- bb002a76 Update e2e mod dependencies
- 2ccd57e0 build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0
- 1c14d307 Merge pull request #9168 from KoditkarVedant/9089-add-support-to-docker-compose-push-quiet-option
- 8bd487ac docs: update with result of `make docs`
- 1d4cb320 Add support to push images quietly via compose cli
- 19d1ab77 Merge pull request #9905 from docker/dependabot/go_modules/gotest.tools/v3-3.4.0
- a01f62f5 Bump e2e module deps
- 045f5ad7 build(deps): bump gotest.tools/v3 from 3.3.0 to 3.4.0
- b6b58d26 don't fail when trying to remove an orphan container during down command
- 55b1b997 Merge pull request #9894 from thaJeztah/bump_go_1.19.2
- 34441c8e Update to go 1.19.2 to address CVE-2022-2879, CVE-2022-2880, CVE-2022-41715
- 139a6945 Merge pull request #9886 from milas/ci-docs-repo
- 97a9d02d ci: update docs repo path
- 25c4bcef Merge pull request #9824 from laurazard/cucumber-test
- 4607dac1 Adjust modules sync validating script
- 616777eb deps: fix race condition during graph traversal (#9878)
- c1f475d7 Add `validate-modules` target to CI matrix
- c6109b2e Add Makefile, buildx target to ensure root and e2e go.mod are kept in sync
- fffe7fff Create new `e2e` module to separate out test dependencies, move cucumber tests
- 0a5f4e62 Removed tests that were replaced by Cucumber features
- d88f6805 Update go.mod replace
- 266ab22d Rename start cucumber feature
- a7476c8e Convert `cascade_stop_test.go` into a cucumber feature `stop.feature`
- 15ebff00 Cucumber test setup/fixtures
- f44ca01f ci: limit job permissions from default (#9874)
- 19a1454c Merge pull request #9868 from bkielbasa/v2
- aa297a99 remove unnecessary code
- 0d0a02cc add more information when service.platform isn't part of  service.build.platforms
- 3c641ed2 Merge pull request #9876 from milas/compose-go-1.6.0
- f41eec4e ci: upgrade to compose-go v1.6.0
- 140dc519 cli: add shell completion function (#9269)
- 27922589 run: clean service command if entrypoint is overridden (#9836)
- a95cc407 Remove support for `DOCKER_HOST` in `.env` files (#9871)
- b4420c37 Merge pull request #9866 from glours/issue-service-platform-on-up
- ce3700d3 keep the platform defined, in priority, via DOCKER_DEFAULT_PLATFORM or the service.plaform one if no build platforms provided
- e2a3fe94 Merge pull request #9862 from glours/use-docker-export-if-no-build-platforms
- 94465d57 Merge pull request #9863 from docker/gha-win-mac-runners
- 0dc64723 Restore `-s` in `uname` OS detection logic in `Makefile`
- 8891d9e2 Streamline GHA workflow
- 6cd68a4b Upgrade `actions/setup-go` to v3
- a1984ca1 Skip some tests in CI due to flakiness
- 118b4f07 Increase E2E test timeouts to reduce flakiness
- 8714f983 Temporarily disable broken E2E tests on Windows
- 6bc50cb4 Rework Makefile for better Windows support
- 937fa2dc Add GitHub Action workflow to run tests on Mac/Windows runners
- 71ab6c9e configure default builder export when no build.platforms defined
- db882416 Merge pull request #9854 from glours/fix-docker-default-platform--without-build-platform
- 723078c5 Remove `/rebase` GitHub Action since it's no longer necessary
- a1c50ef2 keep the platform defined via DOCKER_DEFAULT_PLATFORM during build if no build platforms provided
- 2977f4c8 Merge pull request #9849 from laurazard/fix-volumesfrom-overwriting
- cfdec21a Fix linting issues
- b564cc5a Don't overwrite existing dependency condition
- 43c444e8 Add unit tests for `PrepareVolumes`
- b25a66bb Merge pull request #9847 from glours/fix-service-platform--without-build-platform
- 0e975262 keep the platform defined at service level during build if no build platforms provided
- c4d79e60 Merge pull request #9840 from glours/bump-compose-go-v1.5.1
- ddc4896b update compose-go version to v1.5.1
- 9b863549 Merge pull request #9819 from milas/down-image-rm
- 80167868 add license to file
- 403d691a small cleanup + godoc
- b49b9ffe Merge remote-tracking branch 'upstream/v2' into down-image-rm
- 680763f8 down: refactor image pruning
- 1ed37ef7 Merge pull request #9812 from milas/go-1.19.1
- 42169db1 Merge remote-tracking branch 'upstream/v2' into go-1.19.1
- d05f5f5f pull: improve output for services with both image+build (#9829)
- 5cc2c27a Merge pull request #9828 from Taha-Chaudhry/v2
- 7b7189fe Merge pull request #9835 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.10.0
- de1d969c build(deps): bump go.opentelemetry.io/otel from 1.9.0 to 1.10.0
- ab984d91 build(deps): bump github.com/AlecAivazis/survey/v2 from 2.3.5 to 2.3.6 (#9830)
- e413c213 Update README.md
- 61845dd7 logs: filter to services from current Compose file (#9811)
- 7a8d1578 convert: do not escape $ into $$ when using the --no-interpolate option (#9703)
- 88df5ede Merge pull request #9797 from laurazard/start-only-services
- a7cc4061 Cleanup E2E tests
- 126cb988 Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars
- 4c474fe0 Add unit tests to graph building logic in `dependencies.go`
- 209293e4 Restrict compose project to selected services and dependencies on `compose start`
- 79af3cdd Apply newly loaded envvars to "DockerCli" and "APIClient"
- b80222fb Merge pull request #9821 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.9.0
- ff53411d build(deps): bump go.opentelemetry.io/otel from 1.4.1 to 1.9.0
- 0ac0e292 Merge pull request #9729 from glours/add-platforms-build
- bc806da7 build: label built images for reliable cleanup on `down`
- f72a604c ci: upgrade golangci-lint
- e8116819 ci: upgrade to Go 1.19.1
- 36119447 Cleanup E2E tests
- e7b488bb Merge pull request #9810 from RiskyFeryansyahP/patch-nil-custom-label
- 07eb8a59 patch: build.go access custom labels directly cause panic
- 8a9eae31 Merge pull request #9809 from docker/dependabot/go_modules/github.com/cnabio/cnab-to-oci-0.3.7
- 48744dbe build(deps): bump github.com/cnabio/cnab-to-oci from 0.3.6 to 0.3.7
- 44c55e89 always use 'docker' export entry when building with 'up' or 'run' commands
- e016faac don't push images at the end of multi-arch build (and simplify e2e tests) support DOCKER_DEFAULT_PLATFORM when 'compose up --build' add tests to check behaviour when DOCKER_DEFAULT_PLATFORM is defined
- 8ed2d8ad add a test with multiple service builds using platforms in the same compose file
- 537f023a fix panic when using 'compose up --build'
- 8b1b7083 add support of platforms in build section
- 06ae6d82 Merge pull request #9802 from docker/dependabot/go_modules/github.com/docker/go-units-0.5.0
- 84392d52 build(deps): bump github.com/docker/go-units from 0.4.0 to 0.5.0
- c87efed6 api: fix typo on Push godoc (#9798)
- cc4f1942 Add E2E tests for starting/stopping single services
- 6fae6a41 Update emacs ignore patterns (#5903)
- dd5ea044 ignore: add Go umask files to ephemeral set (#5740)
- 12de97b8 filewatch: use apiserver FileWatch model in EngineState (#4277)
- 62b5f78f Add .kate-swp files to ignore pattern (#3380)
- 3f526c5c change org name from windmilleng to tilt-dev (#3346)
- 12916b75 tilt: ignore a few more vim swap files (#2190)
- e3948f6b ignore: auto-ignore jetbrains .idea file (#2065)
- 91a2bdd6 model: move to pkg (#2024)
- ce61e7bf ignore: improve the ephemeral temp file patterns [ch2663] (#1925)

Signed-off-by: Ricardo Salveti <[email protected]>
  • Loading branch information
ricardosalveti committed Jun 2, 2023
1 parent 9640651 commit 0f8b235
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 15e560830117514adc825c80326e7db66192e717 Mon Sep 17 00:00:00 2001
From 6385df5e8c5c4f3eeff0962ce7a182e9aac68f2c Mon Sep 17 00:00:00 2001
From: Ricardo Salveti <[email protected]>
Date: Wed, 25 Sep 2019 17:08:35 -0300
Subject: [PATCH] cli/config: support default system config
Expand All @@ -7,26 +7,27 @@ Support reading configuration from system config when available. This
allows the OS to control and update a base config.

Signed-off-by: Ricardo Salveti <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
---
cli/cli/cli/config/config.go | 10 ++++++++++
cli/config/config.go | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/src/github.com/docker/cli/cli/config/config.go b/src/github.com/docker/cli/cli/config/config.go
index 703fa30f48..79c324bfb1 100644
--- a/src/github.com/docker/cli/cli/config/config.go
+++ b/src/github.com/docker/cli/cli/config/config.go
diff --git a/cli/config/config.go b/cli/config/config.go
index b7c05c3f86..1f56eb11ba 100644
--- a/cli/config/config.go
+++ b/cli/config/config.go
@@ -21,6 +21,7 @@ const (
configFileDir = ".docker"
oldConfigfile = ".dockercfg"
oldConfigfile = ".dockercfg" // Deprecated: remove once we stop printing deprecation warning
contextsDir = "contexts"
+ defaultSystemConfig = "/usr/lib/docker/config.json"
)

var (
@@ -94,6 +95,15 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
@@ -114,6 +115,15 @@ func load(configDir string) (*configfile.ConfigFile, bool, error) {
filename := filepath.Join(configDir, ConfigFileName)
configFile := configfile.New(filename)

+ // LmP: Load values from system config by default
+ if _, err := os.Stat(defaultSystemConfig); err == nil {
+ file, err := os.Open(defaultSystemConfig)
Expand All @@ -39,3 +40,6 @@ index 703fa30f48..79c324bfb1 100644
// Try happy path first - latest config file
if file, err := os.Open(filename); err == nil {
defer file.Close()
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=175792518e4ac015ab6696d1

SRC_URI = "\
git://github.com/docker/compose.git;branch=v2;protocol=https;name=compose \
git://github.com/docker/cli.git;branch=master;protocol=https;name=cli;destsuffix=${S}/src/github.com/docker/cli \
file://cli-config-support-default-system-config.patch \
git://github.com/docker/cli.git;branch=23.0;protocol=https;name=cli;destsuffix=${S}/src/github.com/docker/cli \
file://cli-config-support-default-system-config.patch;patchdir=src/github.com/docker/cli \
"

SRCREV_compose = "36926c41c6ff719b376a42f7aa6c1eae98f1ae7e"
SRCREV_cli = "2b52f62e962783ef39b53d1cb95e1d435b33f3cd"
SRCREV_compose = "cd0fc214a5a9b07cbe6e262398d0e9dc8603b81b"
SRCREV_cli = "ef23cbc4315ae76c744e02d687c09548ede461bd"
SRCREV_FORMAT = "compose_cli"

UPSTREAM_CHECK_COMMITS = "1"
Expand All @@ -28,7 +28,9 @@ go_do_compile() {
export TMPDIR="${GOTMPDIR}"
mkdir -p ${B}/cli-plugins/bin
${GO} mod download -modcacherw
cp -f ${S}/src/github.com/docker/cli/cli/config/config.go ${B}/pkg/mod/github.com/docker/cli@v20.10.3-0.20220309205733-2b52f62e9627+incompatible/cli/config/config.go
cp -f ${S}/src/github.com/docker/cli/cli/config/config.go ${B}/pkg/mod/github.com/docker/cli@v23.0.6+incompatible/cli/config/config.go
# remove godog staticcheck binary to avoid qa issues
rm -f ${B}/pkg/mod/github.com/laurazard/godog*/bin/staticcheck*
${GO} build ${GOBUILDFLAGS} -o ${B}/cli-plugins/bin/docker-compose ./cmd
}

Expand Down

0 comments on commit 0f8b235

Please sign in to comment.