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

4156 Commits

Author SHA1 Message Date
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
Guillaume Lours 312f0d1d61 Update dry-run documentation 
Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com>
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-15 09:39:46 +02:00
Guillaume Lours e8caad1903 move dry-run support from alpha to main command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-15 09:39:46 +02:00
Nicolas De Loof fca454b41f
introduce COMPOSE_ANSI to define --ansi default value 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-12 12:52:20 +02:00
Mateus Esdras 77dc9b54f3
rm: remove debugging output (#10554) 
For example, when no container was being removed,
this would print `[]`.

Signed-off-by: Mateus Esdras <linux.esdras@gmail.com>
 2023-05-11 16:32:29 -04:00
Nicolas De loof bceb3c1876
detect active endpoint trying to remove network and skip with a warning (#10555) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-11 16:31:29 -04:00
Nicolas De loof a14abb9044
cli: option to write status messages on stdout (#10549) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-11 12:45:00 -04:00
Nicolas De loof 0363d9260a
fix local image removal when `compose down` is ran with `--project-name` (#10558) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-11 12:41:14 -04:00
Nicolas De loof 0e375a8c61
restore long description to be included in `docker compose help` (#10504) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-11 12:33:45 -04:00
Nicolas De Loof b776826d92 check local image matches the required platform 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-10 16:57:21 +02:00
Guillaume Lours 3b32a264c7
Merge pull request #10544 from ndeloof/parallel_race 
fix race condition when --parallel is used with a large number of dependent services
 2023-05-10 11:50:59 +02:00
Nicolas De Loof e92c5d1392 fix race condition running `compose up` with --parallel < number of services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-10 11:39:07 +02:00
Nicolas De loof 0c1a691fa5
fix container being recreated while config has not changed (#10540) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-09 15:15:40 -04:00
Laura Brehm f72d5d6099
Merge pull request #10508 from laurazard/tests-inline-dockerfile 
Update 🥒 tests to use `dockerfile_inline`
 2023-05-09 17:38:05 +01:00
Laura Brehm ee70085fba tests: inline dockerfile 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-05-09 17:27:47 +01:00
dependabot[bot] 90bcf610b3
build(deps): bump github.com/moby/term from 0.0.0-20221205130635-1aeaba878587 to 0.5.0 (#10523) 
build(deps): bump github.com/moby/term

Bumps [github.com/moby/term](https://github.com/moby/term) from 0.0.0-20221205130635-1aeaba878587 to 0.5.0.
- [Release notes](https://github.com/moby/term/releases)
- [Commits](https://github.com/moby/term/commits/v0.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-09 10:07:14 -04:00
Laura Brehm 2d25019fe9
Merge pull request #10521 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.15.1 
build(deps): bump go.opentelemetry.io/otel from 1.15.0 to 1.15.1
 2023-05-09 11:38:30 +01:00
Laura Brehm fb16e49cb2
Merge pull request #10542 from docker/dependabot/go_modules/github.com/docker/cli-23.0.6incompatible 
build(deps): bump github.com/docker/cli from 23.0.5+incompatible to 23.0.6+incompatible
 2023-05-09 11:34:27 +01:00
Laura Brehm 109ce190c4
deps: update related modules 
(see https://github.com/docker/compose/pull/10542/files#r1188432369)

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-05-09 11:18:09 +01:00
dependabot[bot] ef03c906b9
build(deps): bump github.com/docker/cli 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 23.0.5+incompatible to 23.0.6+incompatible.
- [Commits](https://github.com/docker/cli/compare/v23.0.5...v23.0.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-09 09:59:44 +00:00
dependabot[bot] 865a0867a4
build(deps): bump go.opentelemetry.io/otel from 1.15.0 to 1.15.1 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.15.0...v1.15.1)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 13:23:13 +00:00
dependabot[bot] 6ee0376bb6
build(deps): bump golang.org/x/sync from 0.1.0 to 0.2.0 (#10534) 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.2.0.
- [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.2.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-08 09:22:03 -04:00
Nicolas De loof 67455e9f33
fix builkit progressui integration (#10535) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-08 09:21:41 -04:00
Guillaume Lours 5fdcaa0fe1
Merge pull request #10529 from glours/dry-run-up-support 
add dry-run support to up command
 2023-05-05 09:41:18 +02:00
Guillaume Lours 01afe5265e
Merge pull request #10527 from ndeloof/build_secret_id 
let user declare build secret target
 2023-05-04 15:17:30 +02:00
Guillaume Lours 2e4faf80f5 add dry-run support to up command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-04 15:11:11 +02:00
Guillaume Lours e88836ffbd
Merge pull request #10525 from thaJeztah/update_go1.20.4 
update go to go1.20.4
 2023-05-04 11:52:37 +02:00
Nicolas De Loof b45ca82791
let user declare build secret target (id) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-04 10:01:10 +02:00
Sebastiaan van Stijn d1c36c6e6b
update go to go1.20.4 
go1.20.4 (released 2023-05-02) includes three security fixes to the html/template
package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle,
crypto/tls, net/http, and syscall packages. See the Go 1.20.4 milestone on our
issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved

release notes: https://go.dev/doc/devel/release#go1.20.4
full diff: https://github.com/golang/go/compare/go1.20.3...go1.20.4

from the announcement:

> These minor releases include 3 security fixes following the security policy:
>
> - html/template: improper sanitization of CSS values
>
>   Angle brackets (`<>`) were not considered dangerous characters when inserted
>   into CSS contexts. Templates containing multiple actions separated by a '/'
>   character could result in unexpectedly closing the CSS context and allowing
>   for injection of unexpected HMTL, if executed with untrusted input.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-24539 and Go issue https://go.dev/issue/59720.
>
> - html/template: improper handling of JavaScript whitespace
>
>   Not all valid JavaScript whitespace characters were considered to be
>   whitespace. Templates containing whitespace characters outside of the character
>   set "\t\n\f\r\u0020\u2028\u2029" in JavaScript contexts that also contain
>   actions may not be properly sanitized during execution.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-24540 and Go issue https://go.dev/issue/59721.
>
> - html/template: improper handling of empty HTML attributes
>
>   Templates containing actions in unquoted HTML attributes (e.g. "attr={{.}}")
>   executed with empty input could result in output that would have unexpected
>   results when parsed due to HTML normalization rules. This may allow injection
>   of arbitrary attributes into tags.
>
>   Thanks to Juho Nurminen of Mattermost for reporting this issue.
>
>   This is CVE-2023-29400 and Go issue https://go.dev/issue/59722.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-05-03 21:38:19 +02:00
TP-O b304c4e154 stop containers after termination 
Signed-off-by: TP-O <letranphong2k1@gmail.com>
 2023-05-03 11:47:56 +02:00
Guillaume Lours eca1365d42
cli: dry run support for `build` (#10502) 
* add dry-run support for classic builder
* add dry-run support for buildkit

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-02 14:23:26 -04:00
Guillaume Lours 03f4c0e631
progress: make title configurable (#10507) 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-02 14:15:35 -04:00
Guillaume Lours 2a0e83ad9a
Merge pull request #10519 from glours/revert-image-spec-upgrade 
Revert "build(deps): bump github.com/opencontainers/image-spec"
 2023-05-02 13:13:13 +02:00
Guillaume Lours 2df9919ece
Revert "build(deps): bump github.com/opencontainers/image-spec" 
This reverts commit d54a95fed7.

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-05-02 12:31:27 +02:00
Guillaume Lours 74fc40d895
Merge pull request #10518 from docker/dependabot/go_modules/github.com/opencontainers/image-spec-1.1.0-rc.3 
build(deps): bump github.com/opencontainers/image-spec from 1.1.0-rc2.0.20221005185240-3a7f492d3f1b to 1.1.0-rc.3
 2023-05-02 12:11:16 +02:00
dependabot[bot] d54a95fed7
build(deps): bump github.com/opencontainers/image-spec 
Bumps [github.com/opencontainers/image-spec](https://github.com/opencontainers/image-spec) from 1.1.0-rc2.0.20221005185240-3a7f492d3f1b to 1.1.0-rc.3.
- [Release notes](https://github.com/opencontainers/image-spec/releases)
- [Changelog](https://github.com/opencontainers/image-spec/blob/main/RELEASES.md)
- [Commits](https://github.com/opencontainers/image-spec/commits/v1.1.0-rc3)

---
updated-dependencies:
- dependency-name: github.com/opencontainers/image-spec
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-02 09:58:57 +00:00
Guillaume Lours c1369869f5
Merge pull request #10515 from docker/dependabot/go_modules/go.opentelemetry.io/otel-1.15.0 
build(deps): bump go.opentelemetry.io/otel from 1.14.0 to 1.15.0
 2023-05-02 11:32:07 +02:00
dependabot[bot] f5ff40a2f3 build(deps): bump go.opentelemetry.io/otel from 1.14.0 to 1.15.0 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.14.0...v1.15.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-02 10:51:17 +02:00