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
fd4aecefee
ci: update dependencies to latest
...
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2022-11-08 09:07:27 -05:00
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
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
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
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
533abc3b1d
go.mod: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev
...
This restores compatibility with go1.18, which was broken since commit;
c062238ea4f9cb47a052...5aac513617
2022-10-21 20:33:34 +02:00
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
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)
2022-10-21 15:48:25 +02:00
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
b7053cad8e
go mod: tidy and group "require" blocks, update comments
...
The file had multiple "requires" blocks, which made it harder to find which
dependencies were used. Some direct modules also were in the "indirect" block.
While updating, also updated some comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-10-21 15:48:19 +02:00
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
3bf29d401c
bump docker dependencies version
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-10-18 16:26:54 +02:00
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
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
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
25c4bcef85
Merge pull request #9824 from laurazard/cucumber-test
...
🥒 Cucumber PoC 🥒
2022-09-27 23:38:44 +02:00
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
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
d88f6805e7
Update go.mod replace
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-09-27 02:13:52 +02:00
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
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
a95cc4074a
Remove support for `DOCKER_HOST` in `.env` files ( #9871 )
...
Revert "Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars"
This reverts commit 126cb988c6b80222fb07
2022-09-26 09:26:01 -04:00
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
42169db166
Merge remote-tracking branch 'upstream/v2' into go-1.19.1
2022-09-13 14:46:15 +01:00
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
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
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
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
0ac0e29294
Merge pull request #9729 from glours/add-platforms-build
...
Add platforms build
2022-09-08 11:42:16 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
953cebcd3b
Bump compose-go -> 1.3.0
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-29 19:45:05 +02:00
e9c8cfcef3
Fix environment variables priority between environment and .env
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-28 12:57:44 +02:00
0e6adb2884
update cli-doc-tool and update the doc with this new version
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-07-26 14:58:08 +02:00
0b2281348b
Merge pull request #9664 from ulyssessouza/bump-compose-go-1.2.9
...
Bump compose-go -> v1.2.9
2022-07-19 17:15:48 +02:00
1d6f2a3dc3
Bump compose-go -> v1.2.9
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-07-19 17:05:23 +02:00
3ff744a7b0
build(deps): bump github.com/sirupsen/logrus from 1.8.1 to 1.9.0
...
Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus ) from 1.8.1 to 1.9.0.
- [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.8.1...v1.9.0 )
---
updated-dependencies:
- dependency-name: github.com/sirupsen/logrus
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-07-19 09:26:47 +00:00
Milas Bowman
Sebastiaan van Stijn
dependabot[bot]
Guillaume Lours
Sebastiaan van Stijn
Laura Brehm
Laura Brehm
Ulysses Souza
Guillaume Lours