tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,736 Commits 25 Branches 264 Tags 67 MiB
Commit Graph

322 Commits

Author SHA1 Message Date
Guillaume Lours cc247fdb84 remove go.* from e2e tests directory 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-08 19:06:22 +01:00
dependabot[bot] 02305756b3
build(deps): bump go.opentelemetry.io/otel from 1.11.1 to 1.11.2 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.11.1 to 1.11.2.
- [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.11.1...v1.11.2)

---
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>
 2022-12-06 09:07:31 +00:00
Milas Bowman 9b8d520b7d ci: upgrade to Go 1.19.3 & bump deps 
Upgrade to Go 1.19.3 (from 1.19.2) and bump a couple dependencies.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-12-02 11:24:46 -05:00
Milas Bowman 113fb6732d
schema: add support for tmpfs.mode in mount definition (#10031) 
See compose-spec/compose-go#325 for the acutal spec change. This
propagates it to the Engine API object and adds an E2E test via
Cucumber 🥒

Fixes #9873.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-12-02 11:21:53 -05:00
Nicolas De Loof 8f2b747104 use DistributionInspect to resolve image digest 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-11-30 21:18:18 +01:00
dependabot[bot] bfb9e11fc2
build(deps): bump github.com/containerd/containerd from 1.6.9 to 1.6.10 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.9 to 1.6.10.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.6.9...v1.6.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-15 09:04:55 +00:00
Milas Bowman 306ae161e1 ci: upgrade to compose-go v1.7.0 
https://github.com/compose-spec/compose-go/releases/tag/v1.7.0

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-11-08 09:24:13 -05:00
Milas Bowman fd4aecefee ci: update dependencies to latest 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-11-08 09:07:27 -05:00
Sebastiaan van Stijn 34e945a598
ci: remove uses of deprecated gotest.tools v2 (#9935) 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-07 14:07:41 -05:00
dependabot[bot] 369e912586
build(deps): bump github.com/containerd/containerd from 1.6.8 to 1.6.9 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.8 to 1.6.9.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.6.8...v1.6.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-28 10:15:30 +00:00
Guillaume Lours bd96d032df
Merge branch 'v2' into update_deps 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-10-28 12:02:00 +02:00
dependabot[bot] 36a9183950
build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.8.0...v1.8.1)

---
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>
 2022-10-24 09:27:35 +00:00
Sebastiaan van Stijn 533abc3b1d
go.mod: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev 
This restores compatibility with go1.18, which was broken since commit;
c062238ea4

cmd.Environ() is new in go1.19, and not needed for this specific case.
Without this, trying to use this package in code that uses go1.18 will fail;

    builder/remotecontext/git/gitutils.go:216:23: cmd.Environ undefined (type *exec.Cmd has no field or method Environ)

Changing to use `os.Environ()` instead restores compatibility with go1.18

Full diff: f9cb47a052...5aac513617

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-21 20:33:34 +02:00
Guillaume Lours 197c16904a update docker engine API to apply fix of CVE-2022-39253 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-10-21 16:25:08 +02:00
Sebastiaan van Stijn c630c8d295
go.mod: update docker-credential-helpers v0.7.0 
to match the version used by the cli (the cli doesn't use go.mod, so go modules
doesn't automatically pick that up);

1d6c6e2367/vendor.mod (L14)

Used code doesn't change, but we want to keep the older github.com/danieljoos/wincred v1.1.0
out of the dependency tree :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-21 15:48:25 +02:00
Sebastiaan van Stijn 41cf5ee3dc
go.mod: remove replace for runc 
BuildKit and Buildx no longer require this replace rule (it probably only was
needed in buildkit, which used this version to compile).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-21 15:48:25 +02:00
dependabot[bot] 8bdfc62785
build(deps): bump go.opentelemetry.io/otel from 1.11.0 to 1.11.1 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.11.0 to 1.11.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.11.0...v1.11.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>
 2022-10-21 09:36:57 +00:00
Guillaume Lours 3bf29d401c bump docker dependencies version 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-10-18 16:26:54 +02:00
dependabot[bot] afc0263f5c
build(deps): bump go.opentelemetry.io/otel from 1.10.0 to 1.11.0 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.10.0 to 1.11.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.10.0...v1.11.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>
 2022-10-13 09:33:25 +00:00
dependabot[bot] 2ccd57e01a
build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0 
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](https://github.com/spf13/cobra/compare/v1.5.0...v1.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-12 10:00:55 +00:00
dependabot[bot] 045f5ad758
build(deps): bump gotest.tools/v3 from 3.3.0 to 3.4.0 
Bumps [gotest.tools/v3](https://github.com/gotestyourself/gotest.tools) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/gotestyourself/gotest.tools/releases)
- [Commits](https://github.com/gotestyourself/gotest.tools/compare/v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: gotest.tools/v3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-10 09:33:24 +00:00
Laura Brehm 25c4bcef85
Merge pull request #9824 from laurazard/cucumber-test 
🥒 Cucumber PoC 🥒
 2022-09-27 23:38:44 +02:00
Laura Brehm c6109b2e5c
Add Makefile, buildx target to ensure root and e2e go.mod are kept in sync 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:35:57 +02:00
Laura Brehm fffe7fff57
Create new `e2e` module to separate out test dependencies, move cucumber tests 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:52 +02:00
Laura Brehm d88f6805e7
Update go.mod replace 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:52 +02:00
Laura Brehm 15ebff00b1
Cucumber test setup/fixtures 
(run with `go test -v -run ^TestCucumberFeatures$ github.com/docker/compose/v2/pkg/e2e/cucumber`)

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:47 +02:00
Milas Bowman f41eec4e09 ci: upgrade to compose-go v1.6.0 
https://github.com/compose-spec/compose-go/releases/tag/v1.6.0

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-26 19:23:30 +02:00
Milas Bowman a95cc4074a
Remove support for `DOCKER_HOST` in `.env` files (#9871) 
Revert "Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars"

This reverts commit 126cb988c6, reversing
changes made to b80222fb07.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-26 09:26:01 -04:00
Guillaume Lours ddc4896b10
update compose-go version to v1.5.1 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-14 11:02:58 +02:00
Milas Bowman 42169db166 Merge remote-tracking branch 'upstream/v2' into go-1.19.1 2022-09-13 14:46:15 +01:00
dependabot[bot] de1d969c37
build(deps): bump go.opentelemetry.io/otel from 1.9.0 to 1.10.0 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.9.0 to 1.10.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.9.0...v1.10.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>
 2022-09-13 09:42:35 +00:00
dependabot[bot] ab984d91af
build(deps): bump github.com/AlecAivazis/survey/v2 from 2.3.5 to 2.3.6 (#9830) 
Bumps [github.com/AlecAivazis/survey/v2](https://github.com/AlecAivazis/survey) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/AlecAivazis/survey/releases)
- [Commits](https://github.com/AlecAivazis/survey/compare/v2.3.5...v2.3.6)

---
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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-13 10:27:14 +01:00
Ulysses Souza 79af3cdd85 Apply newly loaded envvars to "DockerCli" and "APIClient" 
Re-evaluate DockerCli and APIClient after reading the environment file.
I can contain DOCKER_HOST and/or DOCKER_CONTEXT so the DockerCli passed by docker/cli has to be re-evaluated.
Also checks for DOCKER_CERT_PATH and DOCKER_TLS_VERIFY.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-09-08 18:23:18 +02:00
dependabot[bot] ff53411d9d
build(deps): bump go.opentelemetry.io/otel from 1.4.1 to 1.9.0 
Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.4.1 to 1.9.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.4.1...v1.9.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>
 2022-09-08 10:09:55 +00:00
Guillaume Lours 0ac0e29294
Merge pull request #9729 from glours/add-platforms-build 
Add platforms build
 2022-09-08 11:42:16 +02:00
Milas Bowman e81168197a ci: upgrade to Go 1.19.1 
Go released 1.18.6 + 1.19.1 today which fix a couple
CVEs. (`golang.org/x/net` also has a related fix.)

This jumps from 1.18.5 -> 1.19.1 since it was on the
to-do list regardless :)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-06 17:46:07 -04:00
dependabot[bot] 48744dbe47
build(deps): bump github.com/cnabio/cnab-to-oci from 0.3.6 to 0.3.7 
Bumps [github.com/cnabio/cnab-to-oci](https://github.com/cnabio/cnab-to-oci) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/cnabio/cnab-to-oci/releases)
- [Commits](https://github.com/cnabio/cnab-to-oci/compare/v0.3.6...v0.3.7)

---
updated-dependencies:
- dependency-name: github.com/cnabio/cnab-to-oci
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-06 09:27:51 +00:00
Guillaume Lours 8b1b70833e add support of platforms in build section 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-09-02 15:44:55 +02:00
dependabot[bot] 84392d52c4
build(deps): bump github.com/docker/go-units from 0.4.0 to 0.5.0 
Bumps [github.com/docker/go-units](https://github.com/docker/go-units) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/docker/go-units/releases)
- [Commits](https://github.com/docker/go-units/compare/v0.4.0...v0.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 09:28:50 +00:00
dependabot[bot] 23deefd20c
build(deps): bump github.com/moby/buildkit from 0.10.3 to 0.10.4 (#9780) 
Bumps [github.com/moby/buildkit](https://github.com/moby/buildkit) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/moby/buildkit/releases)
- [Commits](https://github.com/moby/buildkit/compare/v0.10.3...v0.10.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-23 11:50:52 -04:00
Ulysses Souza 3f4f4e5975 Give environment variables precedence back to OS over .env 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-08-18 22:39:21 +02:00
dependabot[bot] 8ad63f7150
build(deps): bump github.com/mattn/go-isatty from 0.0.14 to 0.0.16 (#9754) 
Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.14 to 0.0.16.
- [Release notes](https://github.com/mattn/go-isatty/releases)
- [Commits](https://github.com/mattn/go-isatty/compare/v0.0.14...v0.0.16)

---
updated-dependencies:
- dependency-name: github.com/mattn/go-isatty
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-17 09:57:13 -04:00
dependabot[bot] 3fc020c20a build(deps): bump github.com/containerd/containerd from 1.6.7 to 1.6.8 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.7 to 1.6.8.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.6.7...v1.6.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-10 23:57:37 +02:00
dependabot[bot] ca990146e9
build(deps): bump github.com/containerd/containerd from 1.6.6 to 1.6.7 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.6 to 1.6.7.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.6.6...v1.6.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-05 09:27:47 +00:00
dependabot[bot] 7572bec674
build(deps): bump github.com/cnabio/cnab-to-oci from 0.3.5 to 0.3.6 
Bumps [github.com/cnabio/cnab-to-oci](https://github.com/cnabio/cnab-to-oci) from 0.3.5 to 0.3.6.
- [Release notes](https://github.com/cnabio/cnab-to-oci/releases)
- [Commits](https://github.com/cnabio/cnab-to-oci/compare/v0.3.5...v0.3.6)

---
updated-dependencies:
- dependency-name: github.com/cnabio/cnab-to-oci
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-04 09:34:56 +00:00
Milas Bowman 1ee44a0acb
config: use correct YAML marshal func (#9712) 
The `compose-spec/compose-go` lib is written with `gopkg.in/yaml.v2`
as a target.

When marshalling via CLI (`compose convert` / `compose config`), we
were using a _different_ YAML lib, which was a fork of `go-yaml`,
which is what `gopkg.in/yaml.v2` is based off of.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-03 20:41:43 +00:00
Milas Bowman ddd9d4b6e4 build: upgrade BuildKit & docker/distribution 
Housekeeping - bumping dependencies to latest version
available.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-02 14:52:08 -04:00
Guillaume Lours bff44ff466
update to compose-go v1.4.0 as previous version introduced breaking changes 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-08-01 16:57:57 +02:00
Ulysses Souza c98e8ac3e1 Fix go.mod on replace for compose-go 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-29 20:49:10 +02:00
Ulysses Souza 953cebcd3b Bump compose-go -> 1.3.0 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-29 19:45:05 +02:00