tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,620 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

3620 Commits

Author SHA1 Message Date
Guillaume Lours 139a6945cb
Merge pull request #9886 from milas/ci-docs-repo 
ci: update docs repo path
 2022-09-29 19:20:49 +02:00
Milas Bowman 97a9d02dda ci: update docs repo path 
The Docker docs now live at `docker/docs` instead of
`docker/docker.github.io`.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-29 13:09:25 -04:00
Laura Brehm 25c4bcef85
Merge pull request #9824 from laurazard/cucumber-test 
🥒 Cucumber PoC 🥒
 2022-09-27 23:38:44 +02:00
Laura Brehm 4607dac19c
Adjust modules sync validating script 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 15:47:00 +02:00
Milas Bowman 616777eb4a
deps: fix race condition during graph traversal (#9878) 
Keep track of visited nodes to prevent visiting a service multiple
times. This is possible when a service depends on multiple others,
as an attempt could be made to visit it from multiple parents.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-27 09:01:13 -04:00
Laura Brehm c1f475d7bd
Add `validate-modules` target to CI matrix 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:36:15 +02:00
Laura Brehm c6109b2e5c
Add Makefile, buildx target to ensure root and e2e go.mod are kept in sync 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:35:57 +02:00
Laura Brehm fffe7fff57
Create new `e2e` module to separate out test dependencies, move cucumber tests 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:52 +02: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
Laura Brehm d88f6805e7
Update go.mod replace 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:52 +02:00
Laura Brehm 266ab22d53
Rename start cucumber feature 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:51 +02:00
Laura Brehm a7476c8eeb
Convert `cascade_stop_test.go` into a cucumber feature `stop.feature` 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:51 +02:00
Laura Brehm 15ebff00b1
Cucumber test setup/fixtures 
(run with `go test -v -run ^TestCucumberFeatures$ github.com/docker/compose/v2/pkg/e2e/cucumber`)

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-27 02:13:47 +02:00
Alex f44ca01fcf
ci: limit job permissions from default (#9874) 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-26 15:41:24 -04:00
Guillaume Lours 19a1454c2d
Merge pull request #9868 from bkielbasa/v2 
add more information when `service.platform` isn't part of `service.build.platforms`
 2022-09-26 21:12:45 +02:00
Bartłomiej Klimczak aa297a9969
remove unnecessary code 
Signed-off-by: Bartłomiej Klimczak <bartlomiej.klimczak88@gmail.com>
 2022-09-26 20:54:33 +02:00
Bartłomiej Klimczak 0d0a02cc6b
add more information when service.platform isn't part of service.build.platforms 
Signed-off-by: Bartłomiej Klimczak <bartlomiej.klimczak88@gmail.com>
 2022-09-26 20:44:59 +02:00
Guillaume Lours 3c641ed265
Merge pull request #9876 from milas/compose-go-1.6.0 
ci: upgrade to compose-go v1.6.0
 2022-09-26 19:42:19 +02:00
Milas Bowman f41eec4e09 ci: upgrade to compose-go v1.6.0 
https://github.com/compose-spec/compose-go/releases/tag/v1.6.0

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-26 19:23:30 +02:00
Ulysses Souza 140dc519d3
cli: add shell completion function (#9269) 
Integrates PR #9462 with additional fixes/changes.

Additional changes will be required to utilize this.

Co-authored-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2022-09-26 13:21:45 -04:00
Guillaume Lours 279225896a
run: clean service command if entrypoint is overridden (#9836) 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-26 12:08:14 -04:00
Milas Bowman a95cc4074a
Remove support for `DOCKER_HOST` in `.env` files (#9871) 
Revert "Merge pull request #9817 from ulyssessouza/apply-newly-loaded-envvars"

This reverts commit 126cb988c6, reversing
changes made to b80222fb07.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-26 09:26:01 -04:00
Guillaume Lours b4420c372b
Merge pull request #9866 from glours/issue-service-platform-on-up 
keep the platform defined, in priority, via DOCKER_DEFAULT_PLATFORM o…
 2022-09-26 10:32:43 +02:00
Guillaume Lours ce3700d334 keep the platform defined, in priority, via DOCKER_DEFAULT_PLATFORM or the service.plaform one if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-22 13:46:24 +02:00
Guillaume Lours e2a3fe9427
Merge pull request #9862 from glours/use-docker-export-if-no-build-platforms 
configure default builder export when no build.platforms defined
 2022-09-22 13:46:00 +02:00
Laura Brehm 94465d57cc
Merge pull request #9863 from docker/gha-win-mac-runners 
Add `merge` GitHub Actions workflow to run tests on Windows and macOS runners
 2022-09-21 16:39:27 +02:00
Laura Brehm 0dc64723c9
Restore `-s` in `uname` OS detection logic in `Makefile` 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-21 10:19:00 -04:00
Laura Brehm 8891d9e2b5
Streamline GHA workflow 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-21 08:59:09 -04:00
Laura Brehm 6cd68a4bf2
Upgrade `actions/setup-go` to v3 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:31 -04: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
Laura Brehm 6bc50cb457
Rework Makefile for better Windows support 
Fixes error when attempting to run `uname` on Windows, and add `.exe` to built binary on `make` if on Windows

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:31 -04:00
Laura Brehm 937fa2dc8f
Add GitHub Action workflow to run tests on Mac/Windows runners 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-20 11:33:28 -04:00
Guillaume Lours 71ab6c9eef
configure default builder export when no build.platforms defined 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-20 15:27:41 +02:00
Guillaume Lours db88241698
Merge pull request #9854 from glours/fix-docker-default-platform--without-build-platform 
keep the platform defined via DOCKER_DEFAULT_PLATFORM during build if no build platforms provided
 2022-09-20 10:00:10 +02:00
Laura Brehm 723078c593
Remove `/rebase` GitHub Action since it's no longer necessary 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-19 17:50:41 -04:00
Guillaume Lours a1c50ef2c9
keep the platform defined via DOCKER_DEFAULT_PLATFORM during build if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-16 22:19:31 +02:00
Laura Brehm 2977f4c897
Merge pull request #9849 from laurazard/fix-volumesfrom-overwriting 
Keep `depends_on` condition when service has `volumes_from`
 2022-09-15 10:45:48 -04:00
Laura Brehm cfdec21a7f
Fix linting issues 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-15 10:04:06 -04:00
Laura Brehm b564cc5a17
Don't overwrite existing dependency condition 
(when service has `volumes_from` another service with dependency condition)

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-15 09:53:52 -04:00
Laura Brehm 43c444e890
Add unit tests for `PrepareVolumes` 
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2022-09-15 09:53:14 -04:00
Guillaume Lours b25a66bbd7
Merge pull request #9847 from glours/fix-service-platform--without-build-platform 
keep the platform defined at service level during build if no build patforms provided
 2022-09-15 10:49:42 +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
Guillaume Lours c4d79e60b6
Merge pull request #9840 from glours/bump-compose-go-v1.5.1 
update compose-go version to v1.5.1
 2022-09-14 11:45:30 +02:00
Guillaume Lours ddc4896b10
update compose-go version to v1.5.1 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-14 11:02:58 +02:00
Guillaume Lours 9b863549ee
Merge pull request #9819 from milas/down-image-rm 
build: label built images for reliable cleanup on `down`
 2022-09-14 10:52:45 +02:00
Milas Bowman 801678686c add license to file 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-13 18:29:42 +01:00
Milas Bowman 403d691abf small cleanup + godoc 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2022-09-13 18:29:33 +01:00
Milas Bowman b49b9ffe7e Merge remote-tracking branch 'upstream/v2' into down-image-rm 2022-09-13 18:00:41 +01:00