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,772 Commits 23 Branches 268 Tags
Commit Graph

60 Commits

Author SHA1 Message Date
Nicolas De Loof
b8bbdcd872 detect dependency failed to start 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-19 16:26:39 +01:00
Nicolas De Loof
c1ce53c972 fix regression running pull --ignore-pull-failures 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-19 11:56:03 +01:00
Nicolas De Loof
5c1484ece6 apply uid/gid when creating secret from environment 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-15 15:54:04 +01:00
Nicolas De Loof
0368f19030 distinguish stdout and stderr in up logs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-13 14:42:42 +01:00
Nicolas De Loof
3ee2ab87bb ContainerStart must run sequentially for engine to assing distinct ports within configured range 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2022-12-12 16:08:50 +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
Guillaume Lours
707d55c77f add file header and cleanup profiles e2e tests 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-11-30 13:21:16 +01:00
Guillaume Lours
7fe43a8b4a add e2e tests using explicitly profiles 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-11-30 13:21:16 +01:00
Guillaume Lours
8c1e2af3e1 add e2e tests to check build dependency between services 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-11-15 14:43:53 +01:00
Laura Brehm
0a5f4e62e4
Removed tests that were replaced by Cucumber features 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:52 +02:00
Guillaume Lours
0e975262da
keep the platform defined at service level during build if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-15 08:30:52 +02: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
88df5ede42
Merge pull request #9797 from laurazard/start-only-services 
Only attempt to start specified services on `compose start [services]`
 2022-09-08 13:00:20 -04:00
Guillaume Lours
e016faac33 don't push images at the end of multi-arch build (and simplify e2e tests) 
support DOCKER_DEFAULT_PLATFORM when 'compose up --build'
add tests to check behaviour when DOCKER_DEFAULT_PLATFORM is defined

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-02 15:44:55 +02:00
Guillaume Lours
8ed2d8ad07 add a test with multiple service builds using platforms in the same compose file 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-02 15:44:55 +02:00
Guillaume Lours
537f023a3b fix panic when using 'compose up --build' 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-02 15:44:55 +02:00
Guillaume Lours
8b1b70833e add support of platforms in build section 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-09-02 15:44:55 +02:00
Laura Brehm
cc4f194295
Add E2E tests for starting/stopping single services 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-30 12:55:51 +02:00
Laura Brehm
0d2beddf20
Add E2E tests for up --exit-code-from 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-08-27 17:44:08 +02: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
b96b5449e5 Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-08-19 13:08:36 +05:30
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
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
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
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
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
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
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
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
6d613c8cb2
Merge pull request #9636 from ulyssessouza/dotenvfile-priority 
Environment variables priority
 2022-07-29 19:42:50 +02:00
Guillaume Lours
150fd4b8cf
use '-' as separator by default for image name 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-07-29 18:55:22 +02:00
Ulysses Souza
e9c8cfcef3 Fix environment variables priority between environment and .env 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-28 12:57:44 +02:00
Ulysses Souza
bac398aa9f Fix .env and --envfile priorities 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-28 12:13:37 +02:00
Guillaume Lours
966cbb59ac
add 2 named networks with close name in the networks test suite to guarantee the good distinction on network names 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-07-13 15:09:38 +02:00
Guillaume Lours
4debb133a7
add support of environment secret during build step 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2022-07-01 11:21:49 +02:00
Milas Bowman
26014d49a5 e2e: split out pause tests and add more cases 
Pause/unpause was being partially tested under the start/stop test.
This removes it from that test and adds dedicated pause + unpause
tests.

Note that the tests assert on current behavior, though it's been
noted where that is undesirable due to divergence from the Docker
CLI. Will change the behavior + update tests in a subsequent PR.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-28 15:06:17 -04:00
Laura Brehm
3ccf4349e7
Merge pull request #9572 from laurazard/dont-wait-for-oneshots 
Use appropriate dependency condition for one-shot containers when running `compose up --wait`
 2022-06-26 14:48:49 +02:00
Laura Brehm
74fd14ec65 Use alpine instead of ubuntu for E2E compose file, no need to include version 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-06-26 14:41:23 +02:00
Milas Bowman
ec0efec839 test: add copyright notice 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-24 16:16:53 -04:00
Milas Bowman
b2cd089bae build: respect dependency order for classic builder 
When using the "classic" (non-BuildKit) builder, ensure that
services are iterated in dependency order for a build so that
it's possible to guarantee the presence of a base image that's
been added as a dependency with `depends_on`. This is a very
common pattern when using base images with Compose.

A fix for BuildKit is blocked currently until we can rely on a
newer version of the engine (see docker/compose#9324)[^1].

[^1]: https://github.com/docker/compose/issues/9232#issuecomment-1060389808

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-22 16:24:30 -04:00
Laura Brehm
fd8538f780 Use appropriate dependency condition for one-shot containers when running compose up --wait 
Also add e2e tests to ensure `compose up --wait` does not get stuck forever waiting for one-shot containers

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-06-18 01:20:40 +02: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
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
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
c83133f73b
e2e: add test for ps 
Signed-off-by: Nick Sieger <nick@nicksieger.com>
 2022-06-08 14:05:20 -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
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
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