tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-05-03 06:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,939 Commits 21 Branches 270 Tags
Commit Graph

45 Commits

Author SHA1 Message Date
Nathan Baulch
524a97e553 Fix typos 
Signed-off-by: Nathan Baulch <nathan.baulch@gmail.com>
 2024-09-11 11:21:24 +02:00
Nicolas De Loof
25f85938bb exclude unnecessary resources after services have been selected 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-07-09 15:12:27 +02:00
Joana Hrotko
da434013e3 Remove COMPOSE_MENU env from e2e tests 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
 2024-07-01 16:31:12 +01:00
Nicolas De Loof
10531f6302 Fix dot env file to define COMPOSE_* variables 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-06-08 14:55:36 +02:00
Nicolas De Loof
9e8c8caa2b allow a local .env file to override compose.yaml sibling .env 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-05-21 16:01:29 +02:00
Nicolas De Loof
5a1ba0efcf only use ToModel when --no-interpolate is set 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-03-13 06:48:24 +01:00
Nicolas De Loof
1680f9a874 restore support for config --no-interpolate 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-02-28 18:54:43 +01:00
Nicolas De Loof
a8bd3b7af1
Fix load .env from project directory when project file is set by COMPOSE_FILE 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2024-01-25 09:26:22 +01:00
Nicolas De Loof
8e1b32365e fix --remove-orphans not to consider disabled services as orphaned 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-20 21:35:13 +01:00
Ulysses Souza
493f6c8055 skips flaky e2e tests on watch and attach 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2023-11-10 18:31:25 +01:00
Milas Bowman
3bc871e64b test: speed up the e2e test suite 
Lots of our phony Compose files launch pointless long-lived processes
so we can assert on state. However, this means they often don't respond
well to signals on their own, requiring Compose to timeout and kill
them when doing a `down`.

Add in lots of `init: true` where appropriate so that we don't block
for no reason while running E2E tests all over the place.

Additionally, a couple tests have gotten a cleanup so they don't leave
behind containers. I still want to build this into the framework in
the future, but this is easier for the moment and won't cause any
trouble in the future.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-07-18 11:08:06 +02:00
Jes Cok
1a41678c58 fix typos 
Signed-off-by: Jes Cok <xigua67damn@gmail.com>
 2023-06-27 16:12:25 +02:00
Nicolas De Loof
93bd27a0cc introduce ability to select service to be stopped by compose down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-24 17:32:32 +02:00
Nicolas De Loof
c5317496ac
workaround race condition in ContainerList 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-28 12:28:41 +02:00
Nicolas De Loof
8c39b5b7fd align --format flag and UX with docker cli 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-14 22:53:43 +01:00
Nicolas De Loof
804d7163a7 detect required service are gone to stop watching 
explicit API to stop the log printer

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-07 21:07:27 +01:00
Laura Brehm
a1984ca1de
Skip some tests in CI due to flakiness 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:31 -04:00
Laura Brehm
118b4f07e5
Increase E2E test timeouts to reduce flakiness 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:31 -04:00
Laura Brehm
8714f983ac
Temporarily disable broken E2E tests on Windows 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:31 -04:00
Lucas Berg
7a8d157871
convert: do not escape $ into $$ when using the --no-interpolate option (#9703) 
Signed-off-by: Lucas Berg <root.lucasberg@gmail.com>
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
Co-authored-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-09-08 16:25:23 -04:00
Laura Brehm
235734823e
Pull image regardless of whether it exists locally if tag=latest 
... and pull policy is `missing` or `if_not_present`

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-23 16:57:40 +02:00
Nick Sieger
5723dee316
pull: only skip pull when policy is missing/if_not_present 
Fixes #9773.

Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-08-22 09:22:20 -05: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
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
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
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
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
Ulysses Souza
c98e8ac3e1 Fix go.mod on replace for compose-go 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-29 20:49:10 +02:00
Ulysses Souza
fc723acb3b Fix nolint issues 
Reference -> https://golangci-lint.run/usage/false-positives/#nolint-directive

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Vedant Koditkar
960453fa22 Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-07-04 22:00:04 +05:30
Abhinav Nair
11f2f2dbc4
Replace deprecated ioutil pkg with os & io 
As of Go 1.16, the same functionality is now provided by package io or
package os, and those implementations should be preferred in new code.

So replacing all usage of ioutil pkg with io & os.

Signed-off-by: Abhinav Nair <11939846+abhinavnair@users.noreply.github.com>
 2022-06-25 14:06:10 +08:00
Milas Bowman
9622395c8a e2e: ensure all Compose cmds standalone compatible 
The E2E tests can be run in plugin (`docker compose`) or standalone
(`docker-compose`) mode. Existing logic was in place to ensure that
the helper method is always used, which will invoke the right one
based on how tests are being executed.

However, this logic was too easy to (unintentionally) bypass given
the myriad of ways that commands can be run. The check has been
made stricter and pushed to a lower-level to more aggressively
catch instances.

As a result, a bunch of calls to `RunDockerCmd` are now updated
to be `RunDockerComposeCmd`, which will ensure that the invocation
is correct based on test mode.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-16 15:51:54 -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
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
Nicolas De Loof
5e8040ea18
don't fail trying to remove container with no candidate 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-03-09 16:24:16 +01:00
Vedant Koditkar
e24d274bbc Fix breaking TestComposePull test case 
Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
 2022-03-05 23:46:08 +05:30
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
Ulysses Souza
94379769e3 Make service>build>dockerfile a simple filename 
- It makes it keep a simple filename instead of an absolute path

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-10-20 10:24:08 +02:00
Nicolas De Loof
99e75639d6 define compose container names with a valid hostname 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-09-22 19:06:34 +02:00
Ulysses Souza
682c7d74b9 Lower project name for "compose down" 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-08-18 14:21:16 -03:00
Hironao OTSUBO
1a0efdd413 Fix issue docker compose rm -s not removing containers 
Signed-off-by: Hironao OTSUBO <motemen@gmail.com>
 2021-07-29 23:37:48 +09:00
Nicolas De Loof
fb73dd58d9 Move compose e2e tests into pkg 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-28 08:47:58 +02:00