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

4193 Commits

Author SHA1 Message Date
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 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
dependabot[bot] d15fcc6444
build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.2 to 1.8.3.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.2...v1.8.3)

---
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-25 12:03:43 +00:00
Laura Brehm 22c2471a08
Merge pull request #10572 from docker/dependabot/go_modules/github.com/cloudflare/cfssl-1.6.4 2023-05-25 13:53:07 +02:00
dependabot[bot] 29a1cc452d
build(deps): bump github.com/cloudflare/cfssl from 1.4.1 to 1.6.4 
Bumps [github.com/cloudflare/cfssl](https://github.com/cloudflare/cfssl) from 1.4.1 to 1.6.4.
- [Release notes](https://github.com/cloudflare/cfssl/releases)
- [Changelog](https://github.com/cloudflare/cfssl/blob/master/CHANGELOG)
- [Commits](https://github.com/cloudflare/cfssl/compare/v1.4.1...v1.6.4)

---
updated-dependencies:
- dependency-name: github.com/cloudflare/cfssl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 21:10:49 +00:00
Milas Bowman b05a94fd66
progress: remove errant import (#10614) 
Write the warning using `logrus.Warn`. The function being used was
coming from `cfssl`'s log package, which was presumably the result
of auto-import being _slightly_ too aggressive.

(Note: `cfssl` is still an indirect dependency after this.)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-05-24 17:08:46 -04:00
Guillaume Lours 15cad92b61 fix display of volumes flag in down help command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-24 22:11:58 +02:00
Nicolas De Loof c7afc6188b detect conflict removing volume/image and warn user 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-24 17:32:32 +02:00
Nicolas De Loof ca19b7fcc9 introduce WithRootNodesAndDown to walk the graph from specified nodes and down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-24 17:32:32 +02:00
Nicolas De Loof 93bd27a0cc introduce ability to select service to be stopped by `compose down` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-24 17:32:32 +02:00
Nicolas De loof 68c462e607
scale: sort containers by creation date to remove older ones first (#10571) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-23 13:58:32 -04:00
Nicolas De loof 916aac6c27
watch: only monitor configured paths (#10599) 
For performance, don't watch the entire build context.

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-23 13:35:50 -04:00
Nicolas De loof eafcd1b35e
secrets: only set CopyUIDGID when required (#10598) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-23 13:34:24 -04:00
Allie Sadler 1e399c271a update docs to reflect dry run mode is feature complete 
Signed-off-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
 2023-05-23 15:53:48 +01:00
Guillaume Lours 544b579cb0
Merge pull request #10597 from ndeloof/ComposeProjectName 
fix support for project name set by COMPOSE_PROJECT_NAME env var
 2023-05-22 20:24:13 +02:00
Nicolas De Loof daa6bec80a
fix support for project name set by COMPOSE_PROJECT_NAME env var 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-22 19:14:57 +02:00
Sebastiaan van Stijn 34bd41cc0c go.mod: golang.org/x/oauth2 v0.1.0 
docker/docker already depends on oauth2 v0.1.0, which differs only in
dependencies;

https://github.com/golang/oauth2/compare/6fdb5e3db783...v0.1.0

The replace rule is still needed to help with some dependency hell when
resolving the version to use;

    go mod tidy
    go: downloading cloud.google.com/go v0.75.0
    github.com/docker/compose/v2/pkg/compose imports
        github.com/moby/buildkit/client imports
        go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc tested by
        go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc.test imports
        google.golang.org/grpc/interop imports
        golang.org/x/oauth2/google imports
        cloud.google.com/go/compute/metadata: ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
        cloud.google.com/go v0.75.0 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go@v0.75.0/compute/metadata)
        cloud.google.com/go/compute/metadata v0.2.1 (/Users/thajeztah/go/pkg/mod/cloud.google.com/go/compute/metadata@v0.2.1)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-05-22 15:01:38 +02:00
Guillaume Lours 70953b18c0
Merge pull request #10591 from ndeloof/fix_detect_swarm_enabled 
fix detection of swarm mode
 2023-05-22 09:25:56 +02:00
Nicolas De Loof cfe1a860ff
fix detection of swarm mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-22 08:26:22 +02:00
Laura Brehm 4dcda432cf
Merge pull request #10578 from docker/dependabot/go_modules/github.com/sirupsen/logrus-1.9.2 
build(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2
 2023-05-18 11:14:10 +01:00
dependabot[bot] 5c2a885647
build(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2 
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.9.0 to 1.9.2.
- [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.0...v1.9.2)

---
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>
 2023-05-18 09:59:38 +00:00
Guillaume Lours cd0fc214a5 only check the platform of cached image if image found 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-17 08:04:54 +02:00
Nicolas De Loof 9b5a4588f9 introduce --no-path-resolution to skip relative path to be resolved 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-16 13:02:56 +02:00
Nicolas De Loof 00f72cb553 report external network not found when swarm is disabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-15 20:57:19 +02:00
Nicolas De Loof fd7847f2ac `parallel` flag belong do top-level "compose" cobra command, not the current one 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-15 20:57:09 +02:00
Nicolas De Loof 18a112e88c detect terminal is not a `console.File` to avoid a panic 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-15 20:56:33 +02:00
Guillaume Lours dc01b98aa6
Merge pull request #10559 from ndeloof/COMPOSE_ANSI 
introduce COMPOSE_ANSI to define --ansi default value
 2023-05-15 10:42:06 +02:00