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

3268 Commits

Author SHA1 Message Date
Ulysses Souza 02f78d2893
Merge pull request #9183 from ndeloof/golangci-lint-action 
use golangci-lint-action
 2022-02-17 18:17:06 +01:00
Nicolas De Loof d47dcef1a6
use golangci-lint-action 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-02-17 18:10:28 +01:00
Nicolas De Loof fb9310caf2 use CustomLabels for composeV2 metadata and not impact service hash 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-02-17 09:05:54 +01:00
Mehrad Dadar ced9eba940 refactor: removed redundant code 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-17 07:55:11 +03:30
Ulysses Souza 2eeed8481d Fix pause/unpause by only applying to running containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-02-16 15:13:12 +01:00
Ulysses Souza 10ca0314bc
Merge pull request #9164 from danBamikiya/compose-up-typo-fix 
Fix typo in `reference/compose_up.md`
 2022-02-11 15:18:59 +01:00
Dan Bámíkíyá 336b825fdd Fix the typo in the corresponding Yaml file also 
Signed-off-by: Dan Bámíkíyá <dudeawesome732@gmail.com>
 2022-02-11 15:10:08 +01:00
Dan Bámíkíyá 213d9166dc Fix typo in reference/compose_up 
Signed-off-by: Dan Bámíkíyá <dudeawesome732@gmail.com>
 2022-02-11 15:08:33 +01:00
Guillaume Lours 598b59f8bf
Merge pull request #9142 from thaJeztah/update_goterm 
go.mod: github.com/buger/goterm v1.0.4
 2022-02-08 12:28:18 +01:00
Mehrad Dadar 65ed8cf4c2 Implemented #9147 
Signed-off-by: Mehrad Dadar <mehrad.dadar@gmail.com>
 2022-02-05 10:27:52 +03:30
Ulysses Souza a23cbb580e
Merge pull request #9146 from ulyssessouza/bump-compose-go-1.0.9 
Bump compose-go 1.0.9
 2022-02-05 02:59:23 +01:00
Ulysses Souza a89e194558 Bump compose-go 1.0.9 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-02-04 14:47:16 +01:00
Sebastiaan van Stijn b31695a66e
go.mod: github.com/buger/goterm v1.0.4 
Version v1.0.4 was released, containing a fix for a regression in
v1.0.3, so the previous downgrade can be reverted, and we can go
back to the latest version:
https://github.com/buger/goterm/compare/v1.0.3...v1.0.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-02-03 21:33:39 +01:00
Ulysses Souza 5262d3bbf5
Merge pull request #9130 from laurazard/fix_mac_address_network_priority 
Set NetworkMode correctly according to network priorities
 2022-02-01 14:53:25 +01:00
Laura Brehm a4836391a5 Set NetworkMode correctly according to network priorities 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-02-01 12:59:05 +00:00
Ulysses Souza bfd7428619
Merge pull request #9074 from ndeloof/down_volumes 
only remove volumes set by compose file
 2022-01-21 13:09:10 +01:00
Nicolas De Loof feba34e406
only remove volumes set by compose file 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-01-20 14:32:45 +01:00
Yuri Kanivetsky 37f763f009 Don't SetRawTerminal() when exec is run with -T 
Signed-off-by: Yuri Kanivetsky <yuri.kanivetsky@gmail.com>
 2022-01-19 09:11:35 +01:00
Guillaume Rose 99cd90a4b2 Return only numbers in short version 
Python version of docker compose removes the v prefix in the version.

```
$ docker-compose version --short
1.25.5
```

Signed-off-by: Guillaume Rose <gurose@redhat.com>
 2022-01-17 07:30:27 +01:00
Ulysses Souza a279c3a934 Discard env_file section on convert/config 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-01-15 11:45:08 +01:00
Nikhil Benesch ee586e7f1e Introduce ergonomic API for handling multiple container events 
Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 21:22:57 +01:00
Nikhil Benesch 5eb314a4ca Add progress output while waiting for dependencies 
This commit adds progress output while waiting for `depends_on`
conditions to resolve. The initial output looks like so:

     ⠿ Container chbench-zookeeper-1        Waiting      0s
     ⠿ Container chbench-kafka-1            Waiting      0s
     ⠿ Container chbench-one-off            Waiting      0s

Once all conditions have been resolved, the ouput looks like this:

     ⠿ Container chbench-zookeeper-1        Healthy      1.2s
     ⠿ Container chbench-kafka-1            Healthy      3.2s
     ⠿ Container chbench-schema-registry-1  Exited       4s

As shown above, `service_healthy` conditions result in a terminal status
of "Healthy" while `service_exited_successfully` conditions result in a
terminal status of "Exited".

Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 21:22:57 +01:00
Nikhil Benesch c5cdce0b60 Don't wait forever for unhealthy dependencies 
The previous code would wait for dependencies to become healthy forever,
even if they'd become unhealthy in the meantime. I can't find an issue
report for this bug, but it was described in a comment on the PR that
introduced the `--wait` flag [0].

[0]: https://github.com/docker/compose/pull/8777#issuecomment-965643839

Signed-off-by: Nikhil Benesch <nikhil.benesch@gmail.com>
 2022-01-07 19:13:43 +01:00
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 9f06a02eb5 Moved bind mode creation to getBindMode function 
Added unit tests for all uses cases.

Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
 2022-01-03 08:04:34 +01:00
Tymoteusz Blazejczyk 9d0421a929 Removed the replace directive in the go.mod file 
Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
 2022-01-03 08:04:34 +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
Lance Chen 1191023fb6 Propagate GroupAdd from ServiceConfig to HostConfig 
The `group_add` key is parsed correctly from a compose file, but it is not
passed into the `ContainerCreate` API call, thus the configuration does
not take effect. This commit fixes the issue by propagating the
configuration from Docker compose's ServiceConfig to Docker container's
HostConfig.

Signed-off-by: Lance Chen <hello@lancechen.tw>
 2021-12-17 15:08:14 +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 7b6439997d Fix output redirection on command run 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-15 15:10:22 +01:00
Ulysses Souza d37b3fe413
Merge pull request #9036 from ulyssessouza/add-dependabot 
Add dependabot
 2021-12-15 10:38:28 +01:00
Ulysses Souza ce7a2412b1 Add dependabot 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-14 16:19:41 +01:00
Ulysses Souza 9e52e9fbe3
Merge pull request #9004 from ndeloof/cp_stopped 
compose cp doesn't need a full project and can copy from stopped containers
 2021-12-14 14:27:51 +01:00
Nicolas De Loof c5b7624d10
compose cp doesn't need a full project and can copy from stopped container 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-12 16:15:56 +01:00
Ulysses Souza cf7319fc6e Only kill running containers 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-10 08:48:38 +01:00
Nicolas De Loof 740276f550 handle "stop" event 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-09 13:57:52 +01:00
Ulysses Souza 40bca10250
Merge pull request #9007 from ulyssessouza/add-test-modes 
Add 2 modes test mechanism
 2021-12-09 11:16:37 +01:00
Ulysses Souza 8ae8d99528 Use build tags for selecting e2e test mode 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-09 10:52:18 +01:00
Jon Cram f03b7085c3 compose ps: fix typo "unknow" -> "unknown" 
Signed-off-by: Jon Cram <webignition@gmail.com>
 2021-12-09 08:56:35 +01:00
Ulysses Souza 36c2947e4d
Merge pull request #9012 from notok/rm_containers_when_build_succeed 
Remove intermediate containers when build succeeded in classic build
 2021-12-08 12:39:10 +01:00
notok 3bbcc3d4d0 Fix lint error 
Signed-off-by: notok <noto.kazufumi@gmail.com>
 2021-12-08 18:42:00 +09:00
notok b47d8ea868 Remove intermediate containers when build succeeded 
Intermediate containers remain even when build succeeded
when building with classic way (i.e. not with buildkit).
Remove them when build succeeded like default behavior of docker build.

Signed-off-by: notok <noto.kazufumi@gmail.com>
 2021-12-08 04:18:05 +09:00
Ulysses Souza a97a73600e Add 2 modes test mechanism 
This should test on plugin and standalone mode

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-12-07 10:25:50 +01:00
Nicolas De Loof 6735220557 ignore missing (swarm) overlay networks 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-12-06 14:06:34 +01:00