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

3596 Commits

Author SHA1 Message Date
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
Laura Brehm c586ca4d0e Change `projectOrName()` to check COMPOSE_PROJECT_NAME env var 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-03 18:39:39 +02:00
Laura Brehm be495ab8e6 Filter `compose ps` output by provided compose model 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-02 22:33:26 +02:00
Laura Brehm d2a6c2c200 Add E2E tests for `compose stop` with compose file 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-02 22:33:26 +02:00
Nicolas De Loof f6e96dd783 if command is ran with a compose file, apply the compose model, not just project name 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-08-02 22:33:26 +02:00
Milas Bowman 765c071c89
up: do not stop dependency containers (#9701) 
This keeps parity with v1, where only the containers explicitly
passed to `up` are torn down when `Ctrl-C` is hit, so any
dependencies that got launched (or orphan containers hanging
around) should not be touched.

Fixes #9696.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-02 15:25:59 -04:00
Guillaume Lours 3dfdad61df
Merge pull request #9709 from milas/bump-deps 
build: upgrade BuildKit & docker/distribution
 2022-08-02 21:02:02 +02:00
ikedam bbaaa6a9de
config: case-insensitive env vars on Windows (#9438) 
Signed-off-by: IKEDA Yasuyuki <devld@ikedam.jp>
 2022-08-02 14:56:09 -04:00
Milas Bowman 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
Guillaume Lours d0d06d414d
Merge pull request #9708 from milas/golang-1.18.5 
build: bump to Go 1.18.5
 2022-08-02 19:49:15 +02:00
Milas Bowman b1e4cde2da build: bump to Go 1.18.5 
Can give 1.19 a bit of time before we upgrade ;)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-08-02 13:40:37 -04:00
Guillaume Lours 9e48afb830
Merge pull request #9706 from thaJeztah/improve_usage_consistency 
update usage strings for consistency
 2022-08-02 17:54:49 +02:00
Sebastiaan van Stijn 9db79856be
update usage strings for consistency 
This updates the format of various usage strings to be more consistent
with other parts of the CLI.

- Use `[OPTIONS]` to indicate where command-specific options should be added
- Use `[SERVICE...]` to indicate zero-or-more services
- Remove some usage strings for specific options (e.g. `-e NAME=VAL`), as that
  option is part of the already mentioned `[OPTIONS]` and we don't provide usage
  for each possible option that can be passed.
- Remove `[--]`, which (I think) was needed for the Python implementation, but is
  a general feature to stop processing flag-options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-08-02 13:32:29 +02:00
Laura Brehm 5ead5d1cd6
Merge pull request #9689 from glours/remove-close-workflow 
remove unused workflows, especially the pr-closed which always failed
 2022-08-02 11:38:00 +02:00
Guillaume Lours 7289e87a38
Merge pull request #9700 from glours/bump-compose-go-1.4.0 
update to compose-go v1.4.0 as previous version introduced breaking changes
 2022-08-01 17:57:02 +02:00
Guillaume Lours 052469104f
switch tests back to '_' separator for networks and volumes 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-08-01 17:25:43 +02:00