tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 23 Branches 268 Tags
Commit Graph

306 Commits

Author SHA1 Message Date
Milas Bowman
3ae6c52e8a e2e: add extra tools needed for ddev test 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-16 09:38:25 -04:00
Milas Bowman
1c41df8f56 e2e: robustness changes for ddev test 
The most important change here is to ensure that the correct Compose
standalone binary is used by `ddev`. Since it invokes Compose itself,
we need to ensure that `PATH` is set appropriately such that it finds
the binary we want to test rather than something from the system.

As part of this, the rest of the environment has been isolated, which
should make the test more reliable, and avoids polluting `~/.ddev`
with test artifacts by using a tmpdir as `HOME` for the test instead
of the user's real home folder.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-16 08:59:02 -04:00
Milas Bowman
ea8341865d e2e: isolate test command env from system env 
When running Docker / Compose commands, do NOT inherit the system
environment to ensure that the tests are reproducible regardless
of host settings.

Additionally, per-command environment overrides are provided to
the command instead of using `os.SetEnv`, as this is not safe when
running tests in parallel (`testing.T::SetEnv` will actually error
if used in this way!)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-16 08:30:57 -04:00
Milas Bowman
d9065050fd e2e: fix subtests and block parallel unsafe tests 
The big mechanical change here is to NOT store `t` as a field on
the `CLI` object (which has been renamed as well to fix the odd
capitalization). The way the tests are structured meant that the
"subtests" were using the _parent_ `*testing.T` instance, which
causes various oddities including confusing messages on failure
about a child test causing a panic in the parent.

Additionally, a few tests have been blocked from running in
parallel because they are sharing `compose.yaml` fixtures and
can fail as a result (e.g. due to a port conflict on the host).
I'll fix these in follow-up PRs but want to focus on correctness
for the tests before optimizing them.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-15 16:27:30 -04:00
Nicolas De Loof
005fc25823 add support for setting secret from env variable 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-06-15 17:06:48 +02:00
Bastian Venthur
8a5d555de7 fixed some spelling mistakes 
that's all :)

Signed-off-by: Bastian Venthur <venthur@debian.org>
 2022-06-14 21:33:36 +02:00
Nick Sieger
a48f1e8c13
Merge pull request #9547 from docker/nicksieger/e2e-ps-unmarshal 
e2e: unmarshal json into container summaries
 2022-06-14 10:33:53 -05:00
Guillaume Lours
57975094cc
Merge pull request #9552 from glours/fix-deploy-cpus-issue 
Fix deploy cpus issue and support pids limit
 2022-06-14 11:41:35 +02:00
Laura Brehm
80b7a8d274 Only start direct dependencies of service on compose run ... 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-06-14 07:32:15 +02:00
Guillaume Lours
e111b651b3 add deploy.resourses.limits.pids to the managed resources 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-06-13 17:21:48 +02:00
Guillaume Lours
638d78516a parse deploy.resources.limit.cpus as float before converting 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-06-13 17:21:48 +02:00
Guillaume Lours
8862f95858
Merge pull request #9514 from ulyssessouza/fix-bindmounts 
Fix bind mounts when in project volumes definition
 2022-06-09 11:15:24 +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
Nick Sieger
c83133f73b
e2e: add test for ps 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-08 14:05:20 -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
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
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
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
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
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
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
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
Maxime CLEMENT
48b150beff fix: prevent flickering prompt when pulling same image from N services 
Signed-off-by: Maxime CLEMENT <maxime.clement@docker.com>
 2022-05-18 08:58:06 +02:00
Nicolas De Loof
65b827d08f
bump compose-go to 1.2.5 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-05-17 17:11:32 +02:00
Guillaume Lours
a603e27117 cp command from service to host: use the first container found to copy source on the host 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-10 10:50:40 +02:00
Guillaume Lours
a964d5587b align cp command index management with exec command 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-10 10:50:40 +02:00
Guillaume Lours
a983cf551d cp command: copy to all containers of a service as default behaviour 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-05-10 10:50:40 +02:00
Nicolas De Loof
78b06764a1
compose down exit=0 if nothing to remove 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-05-04 13:51:21 +02:00
Eric Fan
41b3967cb5 Fix cannot setup IPAM gateway 
Signed-off-by: Eric Fan <ericfan@qnap.com>
 2022-04-24 17:30:27 +02:00
Nicolas De Loof
00fd1c1530 inspect image ID after pull to se com.docker.compose.image 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-21 22:42:29 +02:00
Nicolas De Loof
0dffd5ba9f add support for build.secrets 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-13 22:45:53 +02:00
Nicolas De Loof
e01687430e when using bind API, use compose-go to (re)build volume string 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-13 22:45:53 +02:00
Nicolas De Loof
9668f600d1
project name MUST be lowercase 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-13 09:49:01 +02:00
Nicolas De Loof
672e2367fb don't ignore error 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-12 16:00:36 +02:00
Nicolas De Loof
625a48dcf7 pull to respect pull_policy 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-12 07:59:58 +02:00
Nicolas De Loof
500555b834
linter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-08 11:41:46 +02:00
Nicolas De Loof
e766352d81
include services declared by links as implicit dependencies 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-08 10:32:36 +02:00
Nicolas De Loof
db698562a9 use project we just created to start services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-07 13:38:30 +02:00
Guillaume Lours
7fea9f7e8b use project instead of DownOptions.project to list service images in pkg.compose.down 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-04-05 08:24:25 +02:00
Nicolas De Loof
c9fbb9ba9c
inspect container before attachment to use the adequate logic regarding TTY 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-04-04 14:39:38 +02:00