Commit Graph

132 Commits

Author SHA1 Message Date
Guillaume Tardif ac1696e47b Removed race in e2e test
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-30 17:00:10 +02:00
Guillaume Tardif 435a51f9e4 Add scan message after docker build, add e2e tests
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-29 19:12:06 +02:00
aiordache baeede2c6c Add IPC support
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-25 10:27:15 +01:00
Guillaume Tardif a86a4737da
Merge pull request #1438 from docker/port
introduce `port` command for parity with docker-compose
2021-03-19 15:08:09 +01:00
Guillaume Tardif e0344ea7b4
Merge pull request #1415 from ulyssessouza/add-restart
Add restart command
2021-03-19 15:04:57 +01:00
Nicolas De Loof 8b38874aba
introduce `port` command for parity with docker-compose
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-19 13:31:42 +01:00
Guillaume Tardif 34d03cce57 Cleanup remaining containers after compose e2e tests
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-18 17:03:53 +01:00
Ulysses Souza 1926820daa Add e2e tests
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-18 09:51:28 -03:00
Nicolas De Loof 949e8bb090
use "container name witout project" for both logs and events
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-17 11:38:43 +01:00
Guillaume Tardif e2d92ece50 Fix log expectation with random exec order
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-15 11:12:25 +01:00
Guillaume Tardif f4c68428bd Add remote engine context e2e
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-10 13:51:28 +01:00
Nicolas De loof 3999eea066
Merge pull request #1400 from docker/tls_flags 2021-03-09 14:48:53 +01:00
Nicolas De Loof 9c4d8ab158
(re)attach to container after restart
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-08 14:11:15 +01:00
aiordache 29cc59cf42 Return exit code 1 if engine error on version query
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-08 11:54:52 +01:00
Nicolas De loof f08c58f903
Merge pull request #1398 from aiordache/compose_top 2021-03-08 11:25:46 +01:00
aiordache a7ed600bde Add containers.filter and e2e test
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-08 10:27:24 +01:00
aiordache fef479ad1f update test
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 16:30:52 +01:00
aiordache 34df3caaaf Update error message for Windows
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 15:44:01 +01:00
aiordache 6458b97089 test fix
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:48:18 +01:00
aiordache 6f1d88e3bc Fix test and load dockerconfig in the backend
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:34:49 +01:00
Nicolas De Loof d08255c4ff
implement -v, -p, --service-ports and --use-aliases on compose run
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-05 14:25:29 +01:00
Guillaume Tardif 91b39d0772
Merge pull request #1380 from docker/build_args
introduce --build-args option
2021-03-03 18:27:41 +01:00
Nicolas De Loof 08e4222fbb
introduce --build-args option
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-03 16:44:53 +01:00
Nicolas De loof 12ffdd1405
Merge pull request #1381 from gtardif/fix_up_build
Fix compose up --build not forcing rebuild of present image
2021-03-02 18:57:34 +01:00
Guillaume Tardif 8b6e356af4 Fix compose up --build not forcing rebuild of present image
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-02 18:12:51 +01:00
Ulysses Souza bc234bdcdf Fix --project-directory mix with --workdir
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-25 17:48:44 -03:00
Nicolas De loof c53398a422
Merge pull request #1348 from gtardif/compose_ls_all
Add —all option to compose ls, listing non running projects.
2021-02-24 15:17:34 +01:00
Guillaume Tardif cba4f140ae Add —all option to compose ls, listing non running projects.
Added e2e tests to stop, start, pause, unpause, ls —all, ps —all

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-24 13:11:12 +01:00
Guillaume Tardif bc9bd9f880 Moving compose e2e tests in their own files
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-24 10:53:06 +01:00
Ulysses Souza 83cc63c8ae Add service based network_mode
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-23 10:13:31 -03:00
Ulysses Souza 6b79a6c096 Add cascade test cleanup with `down`
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-15 20:04:59 -03:00
Guillaume Tardif f52bdc54d8
Merge pull request #1281 from gtardif/compose_unittests
More Local Compose unit tests
2021-02-12 12:12:57 +01:00
Guillaume Tardif fbe1ebc054 Fix test name and avoid project name collision between parallel tests,
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-12 09:52:04 +01:00
Guillaume Tardif ac5c422d77 Better debug info if test fail
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-12 09:45:00 +01:00
Guillaume Tardif bf26d056e5 Fix orphans warning when `docker compose run`
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-11 15:34:38 +01:00
Nicolas De Loof 8b90814de6
e2e test
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-11 13:26:58 +01:00
Nicolas De Loof d9fe745cc0
avoid use of channels in API for gRPC compatibility
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-11 09:34:08 +01:00
Nicolas De Loof a4b003ecfa
pull logs and events better than aggregate events from multiple channels
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-09 17:27:36 +01:00
Nicolas De Loof 27d640dd41 e2e test and alignment with docker-compose output
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-09 17:07:24 +01:00
Ulysses Souza b9f34a168b Add content based e2e tests for configs and secrets
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-08 02:57:02 -03:00
Guillaume Tardif a5b148bda1
Merge pull request #1251 from gtardif/compose_health_display
Remove the HEALTH column in `docker compose ps`
2021-02-05 17:55:04 +01:00
Guillaume Tardif 24d40ba6ac
Merge pull request #1226 from docker/loglevel
Add support for --log-level
2021-02-05 12:38:13 +01:00
Guillaume Tardif ad140697fc Remove the HEALTH status in `docker compose ps` and combine values from fields “state” and “health”. Rename column STATE => STATUS.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-05 12:19:45 +01:00
Ulysses Souza 8d8934e449 Add configs bind mount support
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-02-04 19:24:34 -03:00
Nicolas De Loof 9f80214dc2
Make -l -D -H non-persistent to avoid conflict with subcommands
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-04 17:13:44 +01:00
Guillaume Tardif bf56815251 Adding e2e test for local compose healthcheck in compose ps
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-03 12:54:22 +01:00
Nicolas De Loof 4cbb33e20d
Add support for --log-level
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-03 11:49:21 +01:00
Ulysses Souza bf17797070 Adapt tests to use absolute paths
- This also includes IDE linter formating

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-01-30 17:31:56 -03:00
Dominik Braun effc126237
Make `--file` and `--project-name` global compose options
Signed-off-by: Dominik Braun <mail@dominikbraun.io>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-20 14:40:08 +01:00
Guillaume Tardif 6859413a5d Moving last things from /tests, removing dead code
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-19 15:48:48 +01:00
Guillaume Tardif 46935b0300 Move tests to each backend folder
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-19 15:25:26 +01:00
Djordje Lukic f6c4c4e590 Move compose e2e tests to own folder
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-08 11:30:25 +01:00
Guillaume Tardif d0728d94f2 Fix compose volume creation and check this in volume e2e test
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:57:55 +01:00
Guillaume Tardif fe363fd146 Fix compose volume creation and check this in volume e2e test
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:42:43 +01:00
Guillaume Tardif ec5afcfd4d `compose up` and other compose commands running on “Moby” context type.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:41:27 +01:00
Guillaume Tardif ff1808644c Remove flakyness in compose e2e test : can’t count networks as we have several compose stacks start in //
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 09:31:32 +01:00
Guillaume Tardif d0b840bcd1 Fix compose up build when no image name in compose file.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 18:19:34 +01:00
Guillaume Tardif aacd881358 Add -d flag in e2e tests now that `docker compose up` attaches to logs by default
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 15:19:12 +01:00
Guillaume Tardif 814536c0bd Fixing bind mount with relative path when specifying relative working dir. Added first local compose volume e2e test
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-04 13:49:43 +01:00
Nicolas De Loof 136d09e1ac
split `Up` into `Create`+`Start` so logs don't collide with progress
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-04 08:16:50 +01:00
Guillaume Tardif 5258e3d56e Add compose build flags for file and working dir
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-02 10:35:28 +01:00
Guillame Tardif 8b60c76684 Remove project network on compose down
Signed-off-by: Guillame Tardif <guillaume.tardif@gmail.com>
2020-11-27 17:42:29 +01:00
Guillaume Tardif de3b6cb450 Add compose labels for composefiles
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-26 17:13:24 +00:00
Guillaume Tardif e441fbba5a Add compose labels for network
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-26 15:45:25 +01:00
Ulysses Souza 794a182bdd Avoid port collision with compose up test
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-11-24 11:10:17 -03:00
Guillaume Tardif aa534979bc First local compose e2e tests
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-20 18:06:11 +01:00
Chris Crone 74a27541e4 backend.local: Add volume e2e test
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-11-04 15:50:28 +01:00
Chris Crone 25e6a18fef backend: Add --rm support to local backend
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-10-30 18:19:02 +01:00
Chris Crone d154c41586 Update copyright
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-09-22 12:13:00 +02:00
Guillaume Tardif ad5c465bd1
Merge pull request #485 from docker/repo-rename
Rename docker/api -> docker/compose-cli
2020-08-25 15:58:51 +02:00
Guillaume Tardif 981665b02c Better renaming
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-08-24 16:09:20 +02:00
Guillaume Tardif 2bac8cf94e Fix linter
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-08-21 21:28:15 +02:00
Guillaume Tardif da6334f415 Renaming, expect commands to succeed by default (removed a bunch of res.Assert(success) )
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-08-21 18:45:38 +02:00
Chris Crone 4c6280b0e9 Rename docker/api -> docker/compose-cli
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-08-21 17:28:39 +02:00
Chris Crone 017053e19a tests.e2e: Refactor
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-08-10 14:12:46 +02:00
Guillaume Tardif 5eea111ecf Run containers and attach to logs by default, detach with -d option 2020-07-02 16:45:04 +02:00
Djordje Lukic ad72c866cc Add license headers 2020-06-18 16:48:03 +02:00
Guillaume Tardif 34d01012e4 Relax constraints on flaky tests (due to // runs) 2020-06-17 08:58:24 +02:00
Guillaume Tardif 9257d0ff49
Merge pull request #205 from ulyssessouza/inspect
Add inspect command
2020-06-16 09:33:33 +02:00
Ulysses Souza 1039c5ed94 Add tests on inspect
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-15 17:20:37 +02:00
Guillaume Tardif eb505ecd75 Add -f option to force remove current context and switch to default if required 2020-06-15 16:28:43 +02:00
Guillaume Tardif 0de2522079 Renamed Moby backend to “local” backend. This will leave “moby” available for default type contexts 2020-06-15 12:20:03 +02:00