tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-08-28 21:18:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,377 Commits 23 Branches 283 Tags
Commit Graph

366 Commits

Author SHA1 Message Date
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
Ulysses Souza
3f4f4e5975 Give environment variables precedence back to OS over .env 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-08-18 22:39:21 +02:00
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
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
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
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
Vedant Koditkar
e623b5ca1e Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-08-06 17:58:10 +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
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
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
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
75bbd245c7
Merge pull request #9647 from glours/add-test-named-networks 
add 2 named networks with close name in the networks test suite to gu…
 2022-07-19 16:55:26 +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
Ulysses Souza
d42adf6efb Add "opinionated" tag to gocritic 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Ulysses Souza
a81f23a199 Add "diagnostic" tag to gocritic 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:06 +02:00
Ulysses Souza
2e96829607 Add gocritic to linters 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-07-13 19:33:03 +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
Vedant Koditkar
960453fa22 Merge branch 'v2' into 8768-avoid-pulling-same-image-multiple-times 2022-07-04 22:00:04 +05:30
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
4aa8c4a1e5 e2e: add more start/stop test cases 
* Starting a service that's already running
* Stopping a service that's already stopped
* Starting/stopping multiple services (by name) at once

Also renamed a test that was about `up` behavior but was
misleadingly labeled start/stop.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-06-30 09:52:14 -04:00
Milas Bowman
06649442eb
Merge pull request #9609 from milas/e2e-pause 
e2e: split out `pause` tests and add more cases
 2022-06-30 08:42:59 -04:00
Guillaume Lours
cd940693aa
Merge pull request #9049 from ndeloof/9044 
(re)start should not impact one-off containers
 2022-06-29 10:43:10 +02:00
Laura Brehm
96b152f705 Update logic to keep compose stop and restart from affecting one-offs 
Also add e2e tests.

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-06-29 00:58:02 +02:00
Milas Bowman
8e7b6582d4
Merge pull request #9595 from abhinavnair/replace-ioutil 
Replace deprecated ioutil pkg with os & io
 2022-06-28 15:08:57 -04: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
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
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