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

4318 Commits

Author SHA1 Message Date
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
Guillaume Lours 2d22c2b5ce
Merge pull request #10652 from ndeloof/watch_mkdir 
create directory in container using `mkdir -p`
 2023-06-08 11:39:21 +02:00
Nicolas De Loof 852c9e80b4 create directory in container using `mkdir -p` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-08 11:28:22 +02:00
Milas Bowman 37850f7955 ci: upgrade to Go 1.20.5 and Moby v24.x 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-07 10:41:49 -04:00
Nicolas De Loof 4bf2fe9fed assume we receive logs by lines and don't ignore those without EOL 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-07 10:40:37 +02:00
Guillaume Lours e21a8d6293
Merge pull request #10657 from ndeloof/compose_project_name 
don't skip `compose` used as project name
 2023-06-07 08:26:21 +02:00
dependabot[bot] f8b6459403
build(deps): bump github.com/sirupsen/logrus from 1.9.2 to 1.9.3 (#10653) 
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/sirupsen/logrus/releases)
- [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sirupsen/logrus/compare/v1.9.2...v1.9.3)

---
updated-dependencies:
- dependency-name: github.com/sirupsen/logrus
  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-06 16:44:25 -04:00
Milas Bowman be6c9565e3
ci: bump golangci-lint to v1.53.x (#10659) 
Requires some changes for depguard config

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-06 16:31:41 -04:00
Nicolas De Loof 60fe97416c don't skip `compose` used as project name 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-06 10:24:59 +02:00
Nicolas De Loof 629c9f62e9 better diagnostic message on network label mismatch 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-05 16:54:58 +02:00
Guillaume Lours 7c3fe359b7
Merge pull request #10622 from ndeloof/logs_follow 
fix `compose -p x logs -f` detect new services started after command
 2023-06-02 09:39:20 +02:00
Nicolas De Loof d2aa15c06e bump buildx and use confutil.ConfigDir 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-06-01 12:09:13 +02:00
Guillaume Lours 6530880361
Merge pull request #10623 from jfly/jfly/tweak-warning-message 
Fix typo in warning about existing volume
 2023-06-01 08:50:33 +02:00
Nicolas De loof 1bd8a773a7
detect network conflict as name is not guaranteed to be unique (#10612) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-31 14:46:23 -04:00
Nicolas De Loof fed8ef6b79 forward signal to container 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-31 15:10:11 +02:00
Guillaume Lours 419fcdd6c8
Merge pull request #10604 from aevesdocker/ENGDOCS-1373 
update docs to reflect dry run mode is feature complete
 2023-05-31 12:49:14 +02:00
Allie Sadler 65b714c108 fix build issue 
Signed-off-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
 2023-05-31 10:24:49 +01:00
Allie Sadler 44dd232e97
Merge branch 'v2' into ENGDOCS-1373 2023-05-31 10:18:45 +01:00
Guillaume Lours 83ad5e97b7 add Windows drive prefix to temp dir usage in the doc generation task 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-31 10:18:23 +02:00
Guillaume Lours b0a35ccc98
Merge pull request #10632 from docker/dependabot/go_modules/github.com/stretchr/testify-1.8.4 
build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4
 2023-05-30 12:15:51 +02:00
dependabot[bot] f5480ee3ed
build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.3...v1.8.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-30 10:00:07 +00:00
Nick Sieger b4924dee83
Merge pull request #10627 from nicksieger/test-cucumber-port-conflict 2023-05-27 08:34:50 -05:00
Nick Sieger 2ca8ab914a
e2e: make test re-runnable on the same machine 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2023-05-26 15:54:39 -05:00
Nick Sieger 3ec8c60657
e2e: add a cuke feature to test compose errors with port conflicts 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2023-05-26 15:54:35 -05:00
Nicolas De Loof 06ec06472f up should not silently ignore missing depends_on service 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-26 21:59:29 +02:00
Nicolas De Loof 466e1d3197
prevent buildkt's progress to render `Building` when no built is needed 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-26 15:04:37 +02:00
Nicolas De Loof 0d6b99e6f9
e2e test to cover logs -f managing service being added/scaled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-26 14:51:23 +02:00
Nicolas De Loof 01d91c490c detect new container from project have started when running `compose logs` with no explicit services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-26 14:15:48 +02:00
Nicolas De Loof 6f6e1635fd compute service hash with a default DeployConfig 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-26 14:15:33 +02:00
Jeremy Fleischman 3d05a1becf
Fix typo in warning about existing volume 
Previously, this was telling us "but was not created for project
[project-it-was-created-for]", which is wrong. I opted to make the
message super explicit and print both the actual project and the
expected project.

Signed-off-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
 2023-05-25 17:16:47 -07:00
Laura Brehm 42cd961d58
Merge pull request #10582 from docker/dependabot/go_modules/github.com/stretchr/testify-1.8.3 2023-05-25 14:16:17 +02:00