62b3e7409e
Merge pull request #10124 from laurazard/fix-cucumber-tests
...
Fix Cucumber 🥒 tests
2023-01-11 13:00:04 +01:00
cc912c625d
introduce --remove-orphans in compose create command
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-11 07:16:50 +01:00
cc7e69c02d
Merge pull request #10142 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.15
...
build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
2023-01-10 12:44:46 +00:00
3e12a7cb23
pass proxy config as build args - same as docker/buildx#959
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-10 12:15:13 +01:00
0c1979979f
Remove unused kube tag
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2023-01-09 14:52:11 +01:00
00c60da331
Merge pull request #10151 from freeformz/ffz/NoShareMap
...
Don't share the options map
2023-01-09 12:13:48 +01:00
73ebbffb08
Don't share the options map
...
Without this I get an exception when building multiple images in a
compose run.
```
fatal error: concurrent map writes
goroutine 16 [running]:
github.com/docker/compose/v2/pkg/compose.(*composeService).build.func1({0x2cba4e0, 0xc00019b2c0}, {0xc000233150?, 0xd?})
github.com/docker/compose/v2/pkg/compose/build.go:95 +0x652
github.com/docker/compose/v2/pkg/compose.(*graphTraversal).run.func1()
github.com/docker/compose/v2/pkg/compose/dependencies.go:127 +0x63
golang.org/x/sync/errgroup.(*Group).Go.func1()
golang.org/x/sync@v0.1.0/errgroup/errgroup.go:75 +0x64
created by golang.org/x/sync/errgroup.(*Group).Go
golang.org/x/sync@v0.1.0/errgroup/errgroup.go:72 +0xa5
...
```
I'm not sure why the map is currently shared, but with this patch
applied my docker-compose build run works.
Signed-off-by: Edward Muller <emuller@fastly.com>
2023-01-09 12:01:57 +01:00
fbbc0dedcf
Merge pull request #10145 from ndeloof/ps_filter
...
don't filter by services if no filter was set
2023-01-09 12:01:28 +01:00
b326a9da1d
don't filter by services if no filter was set
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-09 11:49:08 +01:00
f1313f3a09
use a simpler prompt implementation when we lack a terminal
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-09 10:28:16 +01:00
a226d014b8
fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability
...
Signed-off-by: fsl <1171313930@qq.com>
2023-01-06 19:32:12 +01:00
7e2af3aa81
build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
...
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd ) from 1.6.14 to 1.6.15.
- [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.14...v1.6.15 )
---
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>
2023-01-06 09:06:22 +00:00
96bbda98f8
add support for uts namespace
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-06 08:15:52 +01:00
f6f29a4438
Merge pull request #10133 from ndeloof/build_concurrency
...
limit build concurrency according to --parallel
2023-01-05 09:57:13 +01:00
aa5cdf2bf9
add support for COMPOSE_PARALLEL_LIMIT (parity with Compose v1)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-04 12:42:49 +01:00
d5e4f00644
introduce --no-attach to ignore some service output
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-03 18:43:40 +01:00
8b4ac37f9c
introduce `--ignore-buildable` to ignore buildable images on pull
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-03 18:43:23 +01:00
b96e27e0e7
limit build concurrency according to --parallel
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-01-03 12:01:30 +01:00
dcbd68a102
Merge pull request #10136 from gtardif/fix_race_delete_orphan_containers
...
Ignore not only auto-removed containers but also "removal in progress" for orphan containers
2023-01-03 11:30:04 +01:00
37d15d7e6b
Ignore not only auto-removed containers but also "removal in progress" for orphan containers
...
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2023-01-03 11:09:41 +01:00
dde7eea212
Update expected Cucumber `compose ps` output to match changes
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-12-30 15:07:58 +00:00
a224780795
Set `pullChanged` when setting `--pull` on `compose up`
...
Add e2e tests
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-12-30 13:56:06 +01:00
ffce33ec11
Fix empty file when using compose config in case of smaller source files
...
"docker compose config --output out.yml" resulted an empty file
when the generated output was smaller than 4097 bytes.
bufio.Writer doesn't seem necessary since only one write operation will happen.
This way there is no need for a new bufio.Writer that could be flushed.
Thanks for @thaJeztah for the idea of using os.WriteFile
Issue https://github.com/docker/compose/issues/10121
Signed-off-by: Ákos Takács <takacs.akos@it-sziget.hu>
2022-12-30 13:51:36 +01:00
1d9657aee2
Merge pull request #10127 from docker/dependabot/go_modules/github.com/docker/cli-docs-tool-0.5.1
...
build(deps): bump github.com/docker/cli-docs-tool from 0.5.0 to 0.5.1
2022-12-29 13:42:43 +00:00
8a3248d0cd
Update documentation
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2022-12-29 13:32:16 +00:00
52e7f0fb3e
build(deps): bump github.com/docker/cli-docs-tool from 0.5.0 to 0.5.1
...
Bumps [github.com/docker/cli-docs-tool](https://github.com/docker/cli-docs-tool ) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/docker/cli-docs-tool/releases )
- [Commits](https://github.com/docker/cli-docs-tool/compare/v0.5.0...v0.5.1 )
---
updated-dependencies:
- dependency-name: github.com/docker/cli-docs-tool
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-29 09:06:01 +00:00
fd353ffa94
add support of privileged attribut in service.build section
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-23 09:32:48 +01:00
0307c16daf
Merge pull request #10116 from glours/add-buildx-plugin-e2e
...
cleanup framework.go from uncessary debug logs
2022-12-21 21:39:23 +01:00
adf8e75317
cleanup framework.go from uncessary debug logs
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 21:28:06 +01:00
6c537cc0f4
Merge pull request #10113 from glours/add-buildx-plugin-e2e
...
add buildx plugin to e2e configuration directory
2022-12-21 21:21:01 +01:00
9f7ad18d62
reduce cyclomatic complexity
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-21 21:12:06 +01:00
40ebcd6203
fix security opts support (seccomp and unconfined)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-21 21:12:06 +01:00
9bd9f1765c
check service names based on project, not running containers
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-21 21:11:44 +01:00
5dcadc05d9
debut output for CI
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 21:09:49 +01:00
c72f161afb
change the way finding the just built compose binary
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 19:47:39 +01:00
86a648bd51
e2e tests display Compose version used to run the test
...
currently the version displayed is the one installed and not the one use for the tests
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 18:38:24 +01:00
27a3241934
rely on CI timeout
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 16:11:56 +01:00
935968fe2c
add buildx plugin to e2e configuration directory
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2022-12-21 15:27:34 +01:00
91371fef7a
remove flaky TestLocalComposeLogsFollow
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-21 08:45:41 +01:00
986bc44549
service hash MUST exclude replicas
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-21 08:45:41 +01:00
24f83271f2
don't assume os.Stdout and rely on dockerCLI.streams
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-20 23:52:25 +01:00
dacf24374d
dump stdout to help diagnose flaky test
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-20 23:50:58 +01:00
bab3050984
Merge pull request #10107 from ndeloof/logging_driver_none
...
don't fail `logs` when driver:none is set
2022-12-20 16:42:52 +01:00
22d2e83896
don't fail `logs` when driver:none is set
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-20 16:23:47 +01:00
9f5f0b6f03
Merge pull request #10106 from ndeloof/cgroupns
...
update compose-go
2022-12-20 14:18:15 +01:00
b4b7319901
introduce support for cgroup namespace
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-20 14:06:33 +01:00
ab791877ef
Merge pull request #10105 from docker/dependabot/go_modules/github.com/containerd/containerd-1.6.14
...
build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14
2022-12-20 10:17:46 +01:00
aae5ddca27
build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14
...
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd ) from 1.6.12 to 1.6.14.
- [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.12...v1.6.14 )
---
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-12-20 09:06:44 +00:00
7cf6d5ec4e
Merge pull request #10104 from ndeloof/logs_race_condition
...
fix race condition on compose logs
2022-12-20 09:54:57 +01:00
0ab5079c1a
fix race condition on compose logs
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2022-12-20 09:21:31 +01:00
Laura Brehm
Nicolas De Loof
Ulysses Souza
Guillaume Lours
Edward Muller
fsl
dependabot[bot]
Guillaume Tardif
Laura Brehm
Ákos Takács