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

4248 Commits

Author SHA1 Message Date
Milas Bowman c496c23071
ci: upgrade compose-go to v1.15.1 (#10757) 
* Fix for "`build.context` is required" errors

https://github.com/compose-spec/compose-go/releases/tag/v1.15.1

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-29 16:50:10 -04:00
Guillaume Lours 02284378bf
Merge pull request #10756 from milas/network-race 
up: fix race condition on network connect
 2023-06-29 22:47:29 +02:00
Milas Bowman 10b290e682 up: fix race condition on network connect 
Engine API only allows at most one network to be connected as
part of the ContainerCreate API request. Compose will pick the
highest priority network.

Afterwards, the remaining networks (if any) are connected before
the container is actually started.

The big change here is that, previously, the highest-priority
network was connected in the create, and then disconnected and
immediately reconnected along with all the others. This was
racy because evidently connecting the container to the network
as part of the create isn't synchronous, so sometimes when Compose
tried to disconnect it, the API would return an error like:
```
container <id> is not connected to the network <network>
```

To avoid needing to disconnect and immediately reconnect, the
network config logic has been refactored to ensure that it sets
up the network config correctly the first time.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-29 16:00:55 -04:00
aroramrinaal 3906a7a67c Updated documentation files for my contribution 
Ran 'make docs' to generate updated doc files from the reference.

Signed-off-by: aroramrinaal <aroramrinaal@gmail.com>
 2023-06-27 22:48:17 +02:00
aroramrinaal 83671db3dd Fix capitalization error in sentence by adding an uppercase letter at beginning 
Signed-off-by: aroramrinaal <aroramrinaal@gmail.com>
 2023-06-27 22:48:17 +02:00
Jes Cok 1a41678c58 fix typos 
Signed-off-by: Jes Cok <xigua67damn@gmail.com>
 2023-06-27 16:12:25 +02:00
Guillaume Lours 035276e027
watch: add warning when a path is already used by a bind mount volume (#10741) 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-26 18:56:04 -04:00
Guillaume Lours db24023884
Merge pull request #10720 from docker/dependabot/go_modules/google.golang.org/grpc-1.56.0 
build(deps): bump google.golang.org/grpc from 1.53.0 to 1.56.0
 2023-06-21 13:02:20 +02:00
dependabot[bot] c48f542962 build(deps): bump google.golang.org/grpc from 1.53.0 to 1.56.0 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.53.0 to 1.56.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.53.0...v1.56.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-21 12:08:40 +02:00
Guillaume Lours 42dc7a6a87
Merge pull request #10730 from glours/bump-compose-go-1.15.0 
bump compose-go to version v1.15.0
 2023-06-21 11:58:37 +02:00
Guillaume Lours 30b3b47383
bump compose-go to version v1.15.0 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-21 11:45:36 +02:00
Milas Bowman 061b52da9a ci: build fix for new buildx 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-21 11:17:39 +02:00
Milas Bowman 04aa155878 ci: upgrade to buildx v0.11 
https://github.com/docker/buildx/releases/tag/v0.11.0

Several `replace` directives have been removed and dependencies
aligned with buildx as needed.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-21 11:17:39 +02:00
Guillaume Lours 2d4f8d31fc
Merge pull request #10709 from ndeloof/secret_uid 
warn user build.secrets uid,gid,mode are not implemented
 2023-06-21 10:19:43 +02:00
Milas Bowman e1f8603a62 otel: refactor root command span reporting 
* Move all the initialization code out of `main.go`
* Ensure spans are reported when there's an error with the
  command
* Attach the Compose version & active Docker context to the
  resource instead of the span
* Name the root CLI span `cli/<cmd>` for clarity and grab
  the full subcommand path (e.g. `alpha-viz` instead of just
  `viz`)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-20 17:25:58 +02:00
Nicolas De Loof a2ce602f6c fix race condition, waiting for containers when one exit 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-20 16:17:15 +02:00
dependabot[bot] 401334e03f
build(deps): bump github.com/AlecAivazis/survey/v2 from 2.3.6 to 2.3.7 (#10699) 
Bumps [github.com/AlecAivazis/survey/v2](https://github.com/AlecAivazis/survey) from 2.3.6 to 2.3.7.
- [Release notes](https://github.com/AlecAivazis/survey/releases)
- [Commits](https://github.com/AlecAivazis/survey/compare/v2.3.6...v2.3.7)

---
updated-dependencies:
- dependency-name: github.com/AlecAivazis/survey/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-06-20 09:15:33 -04:00
Guillaume Lours 93cf2b921a use main branch of Docker Desktop repo to trigger remote workflow 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-20 12:14:08 +02:00
Guillaume Lours 83b2433a27
Merge pull request #10724 from glours/add-missing-comma-merge 
add missing comma in desktop-edge-test job
 2023-06-19 21:02:00 +02:00
Guillaume Lours c8d06137b5
add missing comma in desktop-edge-test job 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-19 20:01:52 +02:00
Nicolas De Loof c61b8aa5ac introduce run --cap-add to run maintenance commands using service image 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-19 14:20:20 +02:00
Milas Bowman ff3984e609
otel: fix initialization / error-handling (#10717) 
* If there's no `otel` key (or the value is `null`) in the config,
  don't return an error
* Propagate error from the exporter instead of panicking

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-15 12:43:15 -04:00
Guillaume Lours 2efea2e9f5
Merge pull request #10715 from docker/dependabot/go_modules/golang.org/x/sync-0.3.0 
build(deps): bump golang.org/x/sync from 0.2.0 to 0.3.0
 2023-06-15 18:03:23 +02:00
dependabot[bot] 6a3a95c4a8 build(deps): bump golang.org/x/sync from 0.2.0 to 0.3.0 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.2.0 to 0.3.0.
- [Commits](https://github.com/golang/sync/compare/v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-15 17:52:44 +02:00
Guillaume Lours fee8a1c6c6
Merge pull request #10703 from glours/add-repo-input-dd-token 
specify origin repo in generation token step of docker desktop edge testing
 2023-06-15 17:47:48 +02:00
Nicolas De Loof 7ffe83dc95 don't apply "rebuild" watch strategy by default 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-15 15:30:21 +02:00
Nicolas De Loof d20c2551f2 warn user build.secrets uid,gid,mode are not implemented 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-14 10:21:20 +02:00
Guillaume Lours 0e9a5b6b78
specify origin repo in generation token step of docker desktop edge testing 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-13 16:23:51 +02:00
Guillaume Lours 6887a3fc3e
Merge pull request #10702 from glours/fix-DD-APP-ID 
add vars. prefix to DOCKERDESKTOP_APP_ID
 2023-06-13 14:46:52 +02:00
Guillaume Lours 586fe87f98
add vars. prefix to DOCKERDESKTOP_APP_ID 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-13 14:45:26 +02:00
Guillaume Lours 6d66130266
Merge pull request #10701 from glours/fix-DD-APP-ID 
use directly DOCKERDESKTOP_APP_ID without env. prefix
 2023-06-13 14:21:01 +02:00
Guillaume Lours 0f83a8630e
use directly DOCKERDESKTOP_APP_ID without env. prefix 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-13 14:19:56 +02:00
Guillaume Lours 26cb941f79
Merge pull request #10698 from glours/fix-DD-APP-ID 
fix typo in merge workflow for DOCKERDESKTOP_APP_ID
 2023-06-13 10:23:28 +02:00
Guillaume Lours 43783d36e2
fix typo in merge workflow for DOCKERDESKTOP_APP_ID 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-13 10:18:58 +02:00
Guillaume Lours 08e6bfc859
Merge pull request #10691 from glours/fix-dd-workflow-json-parsing 
escape containerimage.digest attribute in merge.yml GHA worlflow
 2023-06-13 09:52:13 +02:00
Guillaume Lours 7a870e2449 Update .github/workflows/merge.yml 
Co-authored-by: CrazyMax <github@crazymax.dev>
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-12 16:54:21 +02:00
Guillaume Lours 8cd8f08d77 escape containerimage.digest attribut in merge.yml GHA worlflow 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-12 16:54:21 +02:00
Nicolas De Loof cfe91becc7 use `--progress` to configure progress UI stylet push 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-12 16:53:42 +02:00
Guillaume Lours 9384e5f4d7
Merge pull request #10694 from milas/dependabot-ignore-more 
ci: add more ignore rules to dependabot
 2023-06-12 16:32:17 +02:00
robbert-ef 68bd0eb523
cli: fix timeout behavior on up / restart / stop (#10672) 
Do not set a hardcoded default timeout of 10 seconds when restarting / stopping but use the container `StopTimeout` (defaults to 10 seconds).

Also fixed custom timeout not used when invoking `up`.

Signed-off-by: Robbert Segeren <robbert.segeren@easyflex.nl>
 2023-06-12 09:18:25 -04:00
Milas Bowman 3fe665b93d ci: add more ignore rules to dependabot 
Reduce PR spam for dependencies that we manually manage.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-12 09:06:21 -04:00
Guillaume Lours 508d71c5df
ci: fix merge workflow (#10685) 
use env instead of variables prefix to use `DOCKERDESKTOP_APPID`

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-09 15:35:47 -04:00
Guillaume Lours 58c5ea8217
Merge pull request #10625 from glours/compose-edge-desktop-integration 
add GitHub action to trigger Docker Desktop e2e tests with Compose edge version
 2023-06-09 21:18:37 +02:00
Guillaume Lours ec31d3c2ac add GitHub action to trigger Docker Desktop e2e tests with Compose edge version 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-06-09 21:07:03 +02:00
Laura Brehm 599723f890
Merge pull request #10677 from docker/dependabot/go_modules/github.com/Microsoft/go-winio-0.6.1 
build(deps): bump github.com/Microsoft/go-winio from 0.5.2 to 0.6.1
 2023-06-09 12:13:09 +02:00
dependabot[bot] 0a9b9fd8fe
build(deps): bump github.com/Microsoft/go-winio from 0.5.2 to 0.6.1 
Bumps [github.com/Microsoft/go-winio](https://github.com/Microsoft/go-winio) from 0.5.2 to 0.6.1.
- [Release notes](https://github.com/Microsoft/go-winio/releases)
- [Commits](https://github.com/Microsoft/go-winio/compare/v0.5.2...v0.6.1)

---
updated-dependencies:
- dependency-name: github.com/Microsoft/go-winio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-09 10:00:25 +00:00
Milas Bowman 3c8a56dbf3
trace: add OTEL initialization (#10526) 
This is a bunch of OTEL initialization code. It's all in
`internal/` because there are re-usable parts here, but Compose
isn't the right spot. Once we've stabilized the interfaces a bit
and the need arises, we can move it to a separate module.

Currently, a single span is produced to wrap the root Compose
command.

Compose will respect the standard OTEL environment variables
as well as OTEL metadata from the Docker context. Both can be
used simultaneously. The latter is intended for local system
integration and is restricted to Unix sockets / named pipes.

None of this is enabled by default. It requires setting the
`COMPOSE_EXPERIMENTAL_OTEL=1` environment variable to
gate it during development.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-08 16:46:07 -04:00
Milas Bowman e63ab14b1e
ci: merge Go coverage reports before upload (#10666) 
Attempting to fix the state of codecov action checks right now,
which are behaving very erratically.

Using the new functionality in Go 1.20 to merge multiple reports,
so now the unit & E2E coverage data reports are stored as artifacts
and then downloaded, merged, and finally uploaded to codecov as a
new job.

Additionally, add a `codecov.yml` config and try to turn down the
aggressiveness of it for CI checks.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-08 14:58:21 -04:00
Guillaume Lours 32cf776ecd
Merge pull request #10620 from ndeloof/Building 
do not render `Building` when no build is needed
 2023-06-08 12:16:46 +02:00
Guillaume Lours 955784c406
Merge pull request #10662 from milas/bump-deps 
ci: upgrade to Go 1.20.5 and Moby v24.x
 2023-06-08 12:03:23 +02:00