Commit Graph

220 Commits

Author SHA1 Message Date
Ulysses Souza 6dc6bedb60 Downgrade goterm to 1.0.1
This is to avoid a release error:
https://github.com/docker/compose/runs/4701103662?check_suite_focus=true

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-01-04 14:54:16 +01:00
Tymoteusz Blazejczyk 340b5482b0 Changed to the official compose-spec/compose-go
Changes were merged. Updated the `replace` directive in the `go.mod`
file to the latest official package.

Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
2022-01-03 08:04:34 +01:00
Tymoteusz Blazejczyk faaa93bf12 Added volume bind option SELinux label :z :Z
Added unsupported volume bind option SELinux label `:z` and `:Z` in v2.

It is a regression compared to v1 written in Python.

The v2 uses the compose-spec/compose-go to parse Compose YAML
specification files but there was missing support for volume bind option
SELinux label `:z` and `:Z` in parser. It is fixed in:

- https://github.com/compose-spec/compose-go/pull/213

It fixes #9072

References:

- https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label

Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
2022-01-03 08:04:34 +01:00
dependabot[bot] 381df20010 Bump github.com/AlecAivazis/survey/v2 from 2.2.3 to 2.3.2
Bumps [github.com/AlecAivazis/survey/v2](https://github.com/AlecAivazis/survey) from 2.2.3 to 2.3.2.
- [Release notes](https://github.com/AlecAivazis/survey/releases)
- [Commits](https://github.com/AlecAivazis/survey/compare/v2.2.3...v2.3.2)

---
updated-dependencies:
- dependency-name: github.com/AlecAivazis/survey/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 15:19:03 +01:00
dependabot[bot] a9e8164a8d Bump github.com/containerd/console from 1.0.2 to 1.0.3
Bumps [github.com/containerd/console](https://github.com/containerd/console) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/containerd/console/releases)
- [Commits](https://github.com/containerd/console/compare/v1.0.2...v1.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 15:09:03 +01:00
dependabot[bot] a108690ac2 Bump github.com/buger/goterm from 1.0.0 to 1.0.3
Bumps [github.com/buger/goterm](https://github.com/buger/goterm) from 1.0.0 to 1.0.3.
- [Release notes](https://github.com/buger/goterm/releases)
- [Commits](https://github.com/buger/goterm/compare/v1.0.0...v1.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 14:59:02 +01:00
dependabot[bot] 0e81d1c88e Bump github.com/hashicorp/go-multierror from 1.1.0 to 1.1.1
Bumps [github.com/hashicorp/go-multierror](https://github.com/hashicorp/go-multierror) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/hashicorp/go-multierror/releases)
- [Commits](https://github.com/hashicorp/go-multierror/compare/v1.1.0...v1.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 07:39:21 +01:00
dependabot[bot] 22002531d8 Bump github.com/spf13/cobra from 1.2.1 to 1.3.0
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spf13/cobra/compare/v1.2.1...v1.3.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>
2021-12-17 06:24:57 +01:00
dependabot[bot] b66ff0c3d8 Bump github.com/golang/mock from 1.5.0 to 1.6.0
Bumps [github.com/golang/mock](https://github.com/golang/mock) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/golang/mock/releases)
- [Changelog](https://github.com/golang/mock/blob/master/.goreleaser.yml)
- [Commits](https://github.com/golang/mock/compare/v1.5.0...v1.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-17 06:24:35 +01:00
Ulysses Souza e2f33af831 Merge and fix Convert function from `docker/compose-switch`
This also removes the vendoring of the repo
Note that it fixes the problem of double "compose" on calling
the compose plugin with "docker" root flags.
Like in "docker --context default compose version"

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-12-03 12:17:17 +01:00
Guillaume Lours 19b9fdf536 upgrade version of opencontainers/image-spec (security issue)
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2021-12-03 12:16:14 +01:00
Mathieu Champlon 28a00571ef Bump compose-go to v1.0.8
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2021-11-23 11:05:26 +01:00
Mathieu Champlon 5754d6084c Bump compose-go to v1.0.7
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2021-11-22 18:13:07 +01:00
Guillaume Lours ba724576a1
upgrade containerd version - security fix
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2021-11-17 23:45:06 +01:00
Ulysses Souza c756ff3d3e Bump compose-go to v1.0.5
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-11-03 00:38:05 +01:00
Ulysses Souza 058c779378 Add support for classic builder
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-11-02 10:56:03 +01:00
Nicolas De Loof d38f278f68
add support for EnableIPv6
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-10-28 19:32:04 +02:00
Ulysses Souza 94379769e3 Make service>build>dockerfile a simple filename
- It makes it keep a simple filename instead of an absolute path

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-10-20 10:24:08 +02:00
Ulysses Souza 8bba863935 Bump compose-go 1.0.2
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-09-30 17:23:37 +02:00
Nicolas De Loof 1faa76ee4e
use compose-switch Convert
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-30 09:15:56 +02:00
Ulysses Souza 436c588793 Bump containerd 1.5.5
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-09-28 20:10:38 +02:00
Nicolas De Loof 7c47673d4a
bump compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-28 12:16:19 +02:00
Nicolas De Loof a2947457b9
get scale from deploy.replicas. Require scale normalization
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-15 14:02:01 +02:00
Sebastiaan van Stijn 3678deed14 [v2] use "docker/cli-docs-tool" to generate docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-13 21:54:26 +02:00
Nicolas De Loof 010776f6db introduce --resolve-paths and restore compose v1 behavior
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-06 17:05:13 +02:00
Nicolas De Loof 1bd21aede5
bump compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-09-01 11:06:23 +02:00
Nicolas De Loof 1ae9b3cb5d
move compose-cli code into docker/compose/v2
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-08-31 19:09:19 +02:00
Ulysses Souza fedd20bab3 Bump compose-go
This fixes https://github.com/docker/compose-cli/issues/2017

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-08-26 10:10:18 -03:00
Ulysses Souza 4b642a494a Bump compose-go
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-08-24 16:38:48 -03:00
Lorena Rangel 2094c6784c Bump compose-go
Signed-off-by: Lorena Rangel <lorena.rangel@docker.com>
2021-08-09 20:03:24 +02:00
Ulysses Souza 28fe228fb6
Merge pull request #1954 from docker/dependabot/go_modules/github.com/containerd/containerd-1.5.4
Bump github.com/containerd/containerd from 1.5.0 to 1.5.4
2021-08-02 08:45:07 -07:00
dependabot[bot] 8b8e5218c3
Bump github.com/containerd/containerd from 1.5.0 to 1.5.4
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.5.0 to 1.5.4.
- [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.5.0...v1.5.4)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-26 21:40:35 +00:00
Nicolas De Loof 12c2b470bc
stop using helm fork for oras dependency conflict
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-22 17:48:49 +02:00
Nicolas De Loof afc9cf8018
update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-22 17:22:51 +02:00
Ulysses Souza 43c4db439e Fix dotEnv load path precedence by compose-go bump
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-16 11:03:14 -03:00
Ulysses Souza f4947b68e5 Bump compose-go
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-07-08 18:37:25 -03:00
Nicolas De Loof 41d5eb45b1
update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-02 15:02:41 +02:00
Nicolas De Loof fc087a9e1d update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-07-02 13:34:27 +02:00
Nicolas De Loof d8d739307e test
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-24 10:11:01 +02:00
Sebastiaan van Stijn 5dbfcfd820
go.mod: update moby/term and Azure/go-ansiterm
Fixes an integer overflow when building on 32 bit windows/arm

- 9d4ed18562...3f7ff695ad
- 43e1dd70ce...59db8d763f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:24:52 +02:00
Nicolas De Loof 37b62309af
update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-17 12:22:41 +02:00
Nicolas De Loof df9fa2d2d8
better interoperability with docker-compose on version label
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-16 14:40:33 +02:00
Nicolas De Loof 07357928d0
update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-10 16:40:36 +02:00
Sebastiaan van Stijn c6c3e7111a
go.mod: update moby/term to fix Invalid Standard Handle Panic on Windows
Changes:

- winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
- winterm: fix GetStdFile() falltrough
- update deprecation message to refer to the correct replacement

full diff:

- bea5bbe245...9d4ed18562
- d6e3b3328b...2377c96fe7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-10 14:54:23 +02:00
Nicolas De Loof cb144ab09a
update compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-06-07 15:42:24 +02:00
Sebastiaan van Stijn abffcdd082
go.mod: update docker and cli to v20.10.7
- diff: https://github.com/docker/docker/compare/v20.10.5...v20.10.7
- diff: https://github.com/docker/cli/compare/v20.10.6...v20.10.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-07 12:28:23 +02:00
Nicolas De Loof 17113dfcd3
update compose-go dependency
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-05-31 18:09:34 +02:00
Nicolas De Loof de85b0624b
support compose file set by COMPOSE_FILE env var
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-05-20 15:41:41 +02:00
Nicolas De Loof e0ae9d21b4
pass authprovider to buildkit session in addition to driver's Auth parameter
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-05-07 11:49:20 +02:00
Guillaume Tardif 416af599aa Fix building compose files with absolute build context / Dockerfile
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-05-05 16:58:50 +02:00