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

3761 Commits

Author SHA1 Message Date
Laura Brehm 832eee0e8f
Merge pull request #9764 from laurazard/apply-model-kill 
Apply compose model on `compose kill`, add `--remove-orphans`
 2022-08-19 16:15:45 +02:00
Vedant Koditkar a1d19119d2 Fix breaking test 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-19 15:25:22 +05:30
Vedant Koditkar b96b5449e5 Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-08-19 13:08:36 +05:30
Laura Brehm a226fe9daf
Update docs for new `compose kill` `--remove-orphans` option 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-19 04:29:51 +02:00
Laura Brehm fcfcc1524e
Apply compose model on `compose kill`, add `--remove-orphans` 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-19 04:26:08 +02:00
Ulysses Souza 6fe34c45ca
Merge pull request #9745 from ulyssessouza/apply-newly-loaded-envvars 
Apply newly loaded envvars to "DockerCli" and "APIClient"
 2022-08-18 22:49:21 +02:00
Ulysses Souza 10cfd551e3
Merge pull request #9761 from ulyssessouza/refactor-osenv-precedence 
Give environment variables precedence back to OS over .env
 2022-08-18 22:48:36 +02:00
Ulysses Souza 0b4cb85c84 Code formatting 
Just moving it up to make clearer

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-08-18 22:41:02 +02: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
Ulysses Souza 86c925fbd3 Reset the DockerCli and APIClient after loading the environment file 
This forces a re-evaluation of the environment variables.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-08-18 16:42:56 +02:00
Nick Sieger a64a5a61a7
Merge pull request #9759 from nicksieger/issue-9591 
Don't wait for disabled dependency
 2022-08-17 13:21:12 -05:00
Nick Sieger 09e6b0292a
up/start/run: don't wait for disabled service 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-08-17 12:32:10 -05:00
Nick Sieger 3c561e7017
create: pull all services logic out of loop; add DependsOn deps 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-08-17 11:48:45 -05: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
Guillaume Lours 10532201a2
Merge pull request #9751 from crazy-max/new-archs 
build windows/arm64 and linux/riscv64 binaries
 2022-08-15 09:32:52 +02:00
CrazyMax 3022b6479f build windows/arm64 and linux/riscv64 binaries 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-15 09:24:14 +02:00
Guillaume Lours abc73ed3d6
Merge pull request #9750 from crazy-max/fix-checksums 
ci: fix checksums file
 2022-08-15 09:23:50 +02:00
CrazyMax 0ec04058cd
ci: fix checksums file 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-14 22:29:57 +02:00
Vedant Koditkar 293cf21c58 Merge branch '8768-avoid-pulling-same-image-multiple-times' of github.com:KoditkarVedant/compose into 8768-avoid-pulling-same-image-multiple-times 2022-08-14 16:52:17 +05:30
Vedant Koditkar 25f4cb2ee6 Use compose to pull image twice 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-14 16:51:29 +05:30
Vedant Koditkar 817e875cbf
Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-08-13 12:19:49 +05:30
Guillaume Lours 8d12042f39
Merge pull request #9748 from crazy-max/log-filter 
root: filter out commandConn.Close* warning message
 2022-08-13 07:33:42 +02:00
CrazyMax f5a1bb875d
root: filter out commandConn.Close* warning message 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-12 23:49:02 +02:00
Guillaume Lours 3e5b8659eb
Merge pull request #9747 from crazy-max/fix-readme 
readme: fix badges
 2022-08-12 23:39:55 +02:00
Vedant Koditkar 79ed1290a6 Use alpine:3.13.12 to be unique across the test cases 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-13 02:59:44 +05:30
CrazyMax 51ef754387
readme: fix badges 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-12 23:29:13 +02:00
Guillaume Lours 58c477f916
Merge pull request #9744 from crazy-max/cross 
Better sandboxed workflow and enhanced cross compilation
 2022-08-12 22:38:14 +02:00
Vedant Koditkar 4853ace155 Fix package name 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-13 02:06:28 +05:30
Vedant Koditkar de49bea774 Try changing package used to avoid any race condition in tests 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-12 23:06:51 +05:30
CrazyMax 5ec20296e4
Better sandboxed workflow and enhanced cross compilation 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-12 15:05:58 +02:00
Guillaume Lours e8389306ae
Merge pull request #9736 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.8 
build(deps): bump github.com/containerd/containerd from 1.6.7 to 1.6.8
 2022-08-11 00:09:33 +02: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
Vedant Koditkar 0db6dfee03 make compose pull tests more expressive 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-08-10 21:48:27 +05:30
Milas Bowman 27227a8824
lint: add `nolintlint` and clean up `nolint` directives (#9738) 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-09 16:43:58 -04:00
Milas Bowman 12ad0fddab
lint: run gofmt from Go 1.19 (#9728) 
Fix comment formatting.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-08 11:36:57 -04:00
Vedant Koditkar e623b5ca1e Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-08-06 17:58:10 +05:30
Guillaume Lours 359133b800
Merge pull request #9720 from glours/respect-pull-policy-build 
don't apply default pull policy from command line if one is define in service configuration
 2022-08-05 16:50:24 +02:00
Guillaume Lours c47079e795 don't apply default pull policy from command line if one is define in service configuration 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-08-05 12:01:32 +02:00
Guillaume Lours bf4ca6219a
Merge pull request #9721 from glours/update-docker-cli 
update Docker CLI version use in CI to v20.10.17
 2022-08-05 12:00:51 +02:00
Guillaume Lours ae08f57928
Merge pull request #9723 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.7 
build(deps): bump github.com/containerd/containerd from 1.6.6 to 1.6.7
 2022-08-05 11:37:29 +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
Guillaume Lours 143a40a618 update Docker CLI version use in CI to v20.10.17 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-08-05 10:46:36 +02:00
Guillaume Lours 7c405706b4
Merge pull request #9722 from glours/fix-linting-ci-task 
fix version of golangci-lint to v1.47.3, issue with v1.48.0 for now
 2022-08-05 10:46:21 +02:00
Guillaume Lours e65ada3984
fix version of golangci-lint to v1.47.3, issue with v1.48.0 for now 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-08-05 10:37:11 +02:00
Laura Brehm bb04677b0f
Merge pull request #9714 from docker/dependabot/go_modules/github.com/cnabio/cnab-to-oci-0.3.6 
build(deps): bump github.com/cnabio/cnab-to-oci from 0.3.5 to 0.3.6
 2022-08-04 13:17:35 +02: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
Khoa Le 8d4846f210
docs: remove extra whitespaces in help text (#9710) 
Remove superfluous whitespaces

Signed-off-by: Khoa Le <ltkhoa2711@gmail.com>
 2022-08-03 16:37:15 -04:00
Sebastiaan van Stijn 92f32b5c79
ci: use latest stable dockerfile syntax & rename docs Dockerfile (#9711) 
* update dockerfiles to use latest stable syntax

Some Dockerfiles were pinned to a minor release, which meant they
wouldn't be updated to get the latest stable syntax (and fixes),
and one Dockerfile used the "labs" variant to use the HEREDOC syntax,
which has now been promoted to the stable syntax.

* docs: rename Dockerfile

There's no other Dockerfiles in the same path, so the "docs"
prefix was redundant.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-08-03 16:36:13 -04:00
Laura Brehm ca05ffe36e
Merge pull request #9375 from ndeloof/project_or_name 
if command is ran with a compose file, apply the compose model
 2022-08-03 18:47:49 +02:00