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

3608 Commits

Author SHA1 Message Date
Guillaume Lours c2533e2341
Merge pull request #9546 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.6 
Bump github.com/containerd/containerd from 1.6.2 to 1.6.6
 2022-06-08 22:44:37 +02:00
dependabot[bot] 08d8fddb8d
Bump github.com/containerd/containerd from 1.6.2 to 1.6.6 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.2 to 1.6.6.
- [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.2...v1.6.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-08 20:15:39 +00:00
Guillaume Lours 5bd1a9bda3
Merge pull request #9545 from docker/nicksieger/ps-e2e-test 
e2e: add test for ps
 2022-06-08 22:13:37 +02:00
Nick Sieger ebb45b400c
e2e: unmarshal json into container summaries 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-08 15:13:31 -05:00
Guillaume Lours 78605e58b2
Merge pull request #9541 from docker/dependabot/go_modules/github.com/AlecAivazis/survey/v2-2.3.5 
Bump github.com/AlecAivazis/survey/v2 from 2.3.2 to 2.3.5
 2022-06-08 21:09:27 +02:00
Guillaume Lours 0ea3504fd5
Merge pull request #9544 from docker/dependabot/go_modules/github.com/docker/buildx-0.8.2 
Bump github.com/docker/buildx from 0.8.1 to 0.8.2
 2022-06-08 21:07:42 +02:00
Nick Sieger c83133f73b
e2e: add test for ps 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-08 14:05:20 -05:00
Guillaume Lours 0f6366afac
Merge pull request #9539 from docker/nicksieger/9527 
Fix ps ports output; includes unit test
 2022-06-08 21:02:32 +02:00
dependabot[bot] 26554884db
Bump github.com/docker/buildx from 0.8.1 to 0.8.2 
Bumps [github.com/docker/buildx](https://github.com/docker/buildx) from 0.8.1 to 0.8.2.
- [Release notes](https://github.com/docker/buildx/releases)
- [Commits](https://github.com/docker/buildx/compare/v0.8.1...v0.8.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-08 19:00:51 +00:00
dependabot[bot] a9d3bfdacd
Bump github.com/AlecAivazis/survey/v2 from 2.3.2 to 2.3.5 
Bumps [github.com/AlecAivazis/survey/v2](https://github.com/AlecAivazis/survey) from 2.3.2 to 2.3.5.
- [Release notes](https://github.com/AlecAivazis/survey/releases)
- [Commits](https://github.com/AlecAivazis/survey/compare/v2.3.2...v2.3.5)

---
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>
 2022-06-08 19:00:49 +00:00
Guillaume Lours 0275fac355
Merge pull request #9538 from docker/dependabot/go_modules/github.com/stretchr/testify-1.7.2 
Bump github.com/stretchr/testify from 1.7.0 to 1.7.2
 2022-06-08 20:59:59 +02:00
Guillaume Lours fc5d7a45e0
Merge pull request #9485 from docker/dependabot/go_modules/github.com/hashicorp/go-version-1.5.0 
Bump github.com/hashicorp/go-version from 1.3.0 to 1.5.0
 2022-06-08 20:59:21 +02:00
Guillaume Lours 9465e433fc
Merge pull request #9307 from docker/dependabot/go_modules/github.com/cnabio/cnab-to-oci-0.3.3 
Bump github.com/cnabio/cnab-to-oci from 0.3.1-beta1 to 0.3.3
 2022-06-08 20:59:13 +02:00
dependabot[bot] 5b02eadb74
Bump github.com/cnabio/cnab-to-oci from 0.3.1-beta1 to 0.3.3 
Bumps [github.com/cnabio/cnab-to-oci](https://github.com/cnabio/cnab-to-oci) from 0.3.1-beta1 to 0.3.3.
- [Release notes](https://github.com/cnabio/cnab-to-oci/releases)
- [Commits](https://github.com/cnabio/cnab-to-oci/compare/v0.3.1-beta1...v0.3.3)

---
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-06-08 18:52:18 +00:00
dependabot[bot] 331930c37d
Bump github.com/stretchr/testify from 1.7.0 to 1.7.2 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.0 to 1.7.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.0...v1.7.2)

---
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-06-08 18:52:16 +00:00
Guillaume Lours 6e15989ec8
Merge pull request #9262 from docker/dependabot/go_modules/github.com/theupdateframework/notary-0.7.0 
Bump github.com/theupdateframework/notary from 0.6.1 to 0.7.0
 2022-06-08 20:51:10 +02:00
Nick Sieger b2c0d25005
ps: use DisplayablePorts from docker/cli 
Fixes #9527.

Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-07 17:11:16 -05:00
Nick Sieger 3599fc8533
mocks: create mocks for compose api.Service 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-07 17:09:06 -05:00
Ulysses Souza 919f351b4b Fix bind mounts when in project volumes definition 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-06-02 16:37:24 +02:00
Guillaume Lours d5528f3a54
Merge pull request #9520 from milas/bugfix-network-ambiguity 
fix: prevent network name ambiguity
 2022-06-02 12:44:12 +02:00
Guillaume Lours c64dbbca6c
Merge pull request #9523 from laurazard/add-links-container-create 
Add links to container create request.
 2022-06-02 12:38:41 +02:00
Guillaume Lours e90c6ba332
Merge pull request #9522 from ulyssessouza/bump-runc-1.1.2 
Bump runc -> 1.1.2
 2022-06-02 12:27:08 +02:00
Guillaume Lours 51b4651ea9
Merge pull request #9525 from thaJeztah/update_golang_1.18.3 
update golang to 1.18.3
 2022-06-02 10:03:29 +02:00
Sebastiaan van Stijn d2639a8638
update golang to 1.18.3 
go1.18.3 (released 2022-06-01) includes security fixes to the crypto/rand,
crypto/tls, os/exec, and path/filepath packages, as well as bug fixes to the
compiler, and the crypto/tls and text/template/parse packages. See the Go
1.18.3 milestone on our issue tracker for details:

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

Hello gophers,

We have just released Go versions 1.18.3 and 1.17.11, minor point releases.

These minor releases include 4 security fixes following the security policy:

- crypto/rand: rand.Read hangs with extremely large buffers
  On Windows, rand.Read will hang indefinitely if passed a buffer larger than
  1 << 32 - 1 bytes.

  Thanks to Davis Goodin and Quim Muntal, working at Microsoft on the Go toolset,
  for reporting this issue.

  This is [CVE-2022-30634][CVE-2022-30634] and Go issue https://go.dev/issue/52561.
- crypto/tls: session tickets lack random ticket_age_add
  Session tickets generated by crypto/tls did not contain a randomly generated
  ticket_age_add. This allows an attacker that can observe TLS handshakes to
  correlate successive connections by comparing ticket ages during session
  resumption.

  Thanks to GitHub user nervuri for reporting this.

  This is [CVE-2022-30629][CVE-2022-30629] and Go issue https://go.dev/issue/52814.
- `os/exec`: empty `Cmd.Path` can result in running unintended binary on Windows

  If, on Windows, `Cmd.Run`, `cmd.Start`, `cmd.Output`, or `cmd.CombinedOutput`
  are executed when Cmd.Path is unset and, in the working directory, there are
  binaries named either "..com" or "..exe", they will be executed.

  Thanks to Chris Darroch, brian m. carlson, and Mikhail Shcherbakov for reporting
  this.

  This is [CVE-2022-30580][CVE-2022-30580] and Go issue https://go.dev/issue/52574.
- `path/filepath`: Clean(`.\c:`) returns `c:` on Windows

  On Windows, the `filepath.Clean` function could convert an invalid path to a
  valid, absolute path. For example, Clean(`.\c:`) returned `c:`.

  Thanks to Unrud for reporting this issue.

  This is [CVE-2022-29804][CVE-2022-29804] and Go issue https://go.dev/issue/52476.

[CVE-2022-30634]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30634
[CVE-2022-30629]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30629
[CVE-2022-30580]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30580
[CVE-2022-29804]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29804

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-06-02 09:56:16 +02:00
Laura Brehm 81182fca53 Add links to container create request. 
In v1, links were sent alongside the rest of the container create request, as part of `HostConfig`. In v2, links are usually set on the connect container to network request that happens after the create. However, this only happens if the service has one or more networks defined for it. If the services are configured to use the default bridge network, this request is not made and so links are never configured.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-06-02 02:51:25 +02:00
Ulysses Souza 6e7c949787 Bump runc -> 1.1.2 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-06-02 00:08:58 +02:00
Milas Bowman 7f32f02817 fix: prevent network name ambiguity 
`NetworkInspect` will match a network ID by prefix. While rare,
it's possible that users might use a network name that is also
a valid network ID prefix for a pre-existing Docker network.
(In the reported case, the network was named `db`, for example.)

Fixes #9496.

Signed-off-by: Milas Bowman <milas@tilt.dev>
 2022-06-01 15:28:42 -04:00
Guillaume Lours 335decceda
Merge pull request #9504 from docker/nicksieger/9427 
fix: bring up services with deps with --no-deps
 2022-05-31 23:39:19 +02:00
Nick Sieger 28c0fbfdc0
e2e: reproduce bug with links 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-05-31 16:32:29 -05:00
Nick Sieger cacff89cef
fix: bring up services with deps with --no-deps 
Don't fail on not finding dependent services because they were put in the
disabled slice.

Fixes #9427.

Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-05-31 16:19:21 -05:00
Guillaume Lours 6756732fe4
Merge pull request #9512 from ulyssessouza/import-dotenv-to-osenv 
Import dotenv file to os environment
 2022-05-30 18:00:45 +02:00
Ulysses Souza 67c13cf821 Import dotenv file to os environment 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-05-30 17:36:41 +02:00
Guillaume Lours dbafb02377
Merge pull request #9499 from glours/add-envs-e2e-tests 
add e2e tests to verify env variables priority
 2022-05-30 17:19:46 +02:00
Guillaume Lours a1b3f95709
add e2e tests to verify env variables priority 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-30 17:11:49 +02:00
Guillaume Lours 5b6b674da9
Merge pull request #9495 from maxcleme/chore/bump_compose_go 
bump compose-go to 1.2.6
 2022-05-23 15:01:05 +02:00
Maxime CLEMENT 31d9490a0b bump compose-go to 1.2.6 
Signed-off-by: Maxime CLEMENT <maxime.clement@docker.com>
 2022-05-23 14:51:09 +02:00
Guillaume Lours 6b71073ae2
Merge pull request #9453 from glours/go-18 
update golang version to 1.18
 2022-05-23 10:41:03 +02:00
Guillaume Lours e806acce88
Merge pull request #9481 from glours/add-tags-to-build 
add tags property to build section
 2022-05-23 10:23:40 +02:00
Guillaume Lours 71600a52bf
update golang version to 1.18 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-20 22:13:55 +02:00
Guillaume Lours 285a9c94f7
Merge pull request #9476 from maxcleme/9469-fix-flickering-prompt 
fix: prevent flickering prompt when pulling same image from N services
 2022-05-20 22:09:02 +02:00
Guillaume Lours 22194f6ef7
Merge pull request #9493 from ulyssessouza/fix-local-e2e-compose-standalone 
Fix local run of `make e2e-compose-standalone`
 2022-05-20 21:41:42 +02:00
Ulysses Souza e51fd0a844 Fix local run of `make e2e-compose-standalone` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-05-20 21:31:16 +02:00
Ulysses Souza b961d49859
Merge pull request #9033 from ulyssessouza/add-e2e-ddev 
Add ddev's e2e test
 2022-05-20 20:02:58 +02:00
Guillaume Lours 9cae9eb0fe
Merge pull request #9488 from ndeloof/attach_profiles 
attach _only_ to services declared by project applying profiles
 2022-05-20 14:38:08 +02:00
Nicolas De Loof 8d03e29994
attach _only_ to services declared by project applying profiles 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-05-20 10:36:06 +02:00
Guillaume Lours 7ee7becd01 fix TestLocalComposeUp which fail locally 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-20 07:36:34 +02:00
Randy Fay 97d46a14ef Fix problems with ddev e2e test and minor cleanup, add tmate (#27) 
* Add tmate for debugging
* Use -parallel=1 for standaone tests

Signed-off-by: Randy Fay <randy@randyfay.com>
 2022-05-19 14:14:03 +02:00
Ulysses Souza a5a1c5f2f1 Add ddev's e2e test 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-05-19 14:14:03 +02:00
dependabot[bot] 9db90b35bb
Bump github.com/hashicorp/go-version from 1.3.0 to 1.5.0 
Bumps [github.com/hashicorp/go-version](https://github.com/hashicorp/go-version) from 1.3.0 to 1.5.0.
- [Release notes](https://github.com/hashicorp/go-version/releases)
- [Changelog](https://github.com/hashicorp/go-version/blob/main/CHANGELOG.md)
- [Commits](https://github.com/hashicorp/go-version/compare/v1.3.0...v1.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-19 09:30:59 +00:00
Guillaume Lours a2770b66ff
add tags property to build section 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-18 14:43:54 +02:00