tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
858 Commits 24 Branches 262 Tags 66 MiB
Commit Graph

858 Commits

Author SHA1 Message Date
Guillaume Tardif a2ea2347ba Remove It() in e2e tests, simplified step declaration. Nicer test output for all tests 2020-07-08 16:54:45 +02:00
Djordje Lukic b146b2f391 Add the platform when returning a container over GRPC 2020-07-08 16:41:25 +02:00
Ulysses Souza f62ab26714
Merge pull request #371 from docker/azure-volume-errors 
Clean up volume parsing functions
 2020-07-08 15:13:33 +02:00
Djordje Lukic f5f01a8729 Update guava version to remove security warning 2020-07-08 15:07:12 +02:00
Christopher Crone 42a756f7d3 azure: Clean up volume parsing functions 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-08 13:40:40 +02:00
Chris Crone b881f16085
Merge pull request #364 from chris-crone/set-version-docker 
Set version when building with Docker
 2020-07-08 11:51:00 +02:00
Chris Crone 33cbee03b8
Merge pull request #363 from chris-crone/bump-tools 
Update Go and linter
 2020-07-07 15:51:04 +02:00
Christopher Crone 539464ed3d build: Set version when building with Docker 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-07 15:48:09 +02:00
Guillaume Tardif 1e3b90f4f8
Merge pull request #362 from docker/fix_aci_tests 
Fix ACI e2e tests : do not use console if no tty option set in exec
 2020-07-07 15:42:11 +02:00
Christopher Crone 878783d271 tools: Update Go and linter 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-07 15:29:48 +02:00
Guillaume Tardif c5cd0f44f8 Fix ACI e2e tests : do not use console if no tty option set in exec 2020-07-07 14:05:25 +02:00
Guillaume Tardif 16acc36033
Merge pull request #356 from docker/fix-non-interactive 
Add check on exec looking for arguments
 2020-07-07 12:41:44 +02:00
Guillaume Tardif de4ba33c60
Merge pull request #358 from docker/aci_env_variable 
Aci env variable
 2020-07-07 12:40:27 +02:00
Guillaume Tardif f7daa70c87 Add ACI e2e test starting mysql with typical env vars 2020-07-07 12:22:56 +02:00
Guillaume Tardif cb3ac513cc Add run env variables support (KEY=AVLUE or KEY, will grab the process env value). 
No support yet for env files
 2020-07-07 11:39:35 +02:00
Guillaume Tardif 0c27fd6236 Support environment variables defined in compose file: 
* KEY=VALUE
* KEY (no =VALUE) will fetch the process environment variable

envFile list is already parsed by compose-go and resolved to Environment key values no need to do anything for this.
 2020-07-07 11:39:35 +02:00
Guillaume Tardif 2e867f40d7
Merge pull request #355 from docker/fix_windows_login 
Fix windows login
 2020-07-07 11:29:39 +02:00
Guillaume Tardif d7f8724dba
Merge pull request #354 from docker/aci_fix_compose_working_dir 
Fix `docker compose up` with default project name being derived from current working dir
 2020-07-07 11:27:49 +02:00
Guillaume Tardif efea5c8c83
Merge pull request #352 from docker/fix_error_cancel_logs 
Exit without error message if user canceled command
 2020-07-07 11:27:33 +02:00
guillaume.tardif 2d73f180ed return error if pb opening browser for login 2020-07-07 10:28:04 +02:00
Ulysses Souza 35cbb621fb Add check on exec looking for arguments 
In the case where the command has arguments
it fails because ACI implementation does not
support commands with arguments

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-07-07 09:32:52 +02:00
guillaume.tardif 1d8e0ef9e6 Revert "Return an error if unable to open the browser" 
This reverts commit e22b0ba676.
 2020-07-07 09:19:06 +02:00
Chris Crone 43d8f2fa18
Merge pull request #351 from chris-crone/error-progress-fix 
Set progress event endTime on error
 2020-07-06 17:55:51 +02:00
Guillaume Tardif 0776e79e8e Exit without error message if user canceled command (typical scenario : ACI `logs — follow` and ctrl-C while querying ACI) 2020-07-06 17:28:02 +02:00
Guillaume Tardif b1d923d5a0
Merge pull request #347 from docker/inspect_platform 
Add ”Platform” in docker inspect result, showing container OS
 2020-07-06 17:13:08 +02:00
Guillaume Tardif e4c1a1f945 Fix `docker compose up` with default project name being derived from current working dir. has been fixed upstream in compose-go (see https://github.com/compose-spec/compose-go/pull/56) 2020-07-06 16:56:30 +02:00
Christopher Crone 50d932195d progress: Rename variable to clarify logic 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-06 14:03:48 +02:00
Christopher Crone fac4c60077 progress: Add test for error event 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-06 13:52:36 +02:00
Christopher Crone 9cc04472fb progress: Stop event on error 
Ensures that we set an `endTime` when an error event is published.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-06 13:26:39 +02:00
Guillaume Tardif 8ad53088a3
Merge pull request #344 from gtardif/doc_release 
Update doc for release
 2020-07-06 13:10:13 +02:00
Guillaume Tardif 2c981f14b3
Merge pull request #342 from docker/feat-aci-metrics 
Metrics for azure commands
 2020-07-06 13:07:01 +02:00
Guillaume Tardif 7296290408 Add ”Platform” in docker inspect result, showing container OS (this field is used by VSCode) 2020-07-06 12:16:02 +02:00
Djordje Lukic 188dc1b06c Metrics for azure commands 
* docker context create aci
* docker login azure
 2020-07-06 11:51:11 +02:00
Guillaume Tardif fc8132167e Update doc for release 2020-07-06 09:40:35 +02:00
Guillaume Tardif f2ff8ab669
Merge pull request #341 from docker/better_error_message 
Better error message when trying to remove a container from a compose application
 2020-07-03 16:03:22 +02:00
Guillaume Tardif dbc109808d Better error message when trying to remove a container from a compose application 2020-07-03 15:58:17 +02:00
Guillaume Tardif aeb446ef4f
Merge pull request #334 from docker/fix_rm_compose_container 
Fix rm compose container
 2020-07-03 15:42:48 +02:00
Guillaume Tardif da3c3dab1c
@gtardif @rumpl Use %q instead of \"%s\" 
Co-authored-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-07-03 15:40:25 +02:00
Guillaume Tardif 0dcab4004d
Use %q instead of \"%s\" 
Co-authored-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-07-03 15:39:44 +02:00
Djordje Lukic c4c0c24dca
Merge pull request #335 from docker/fix-metrics-goroutine 
Make sure the metrics goroutine is scheduled
 2020-07-03 15:01:14 +02:00
Djordje Lukic 159b9d0cfb Make sure the metrics goroutine is scheduled 
Wait for the goroutine to be scheduled before exiting. We don't wait for
the metrics event to be sent, we only make sure the goroutine is called.
 2020-07-03 14:58:47 +02:00
Djordje Lukic 1b9dd7ac27
Merge pull request #332 from docker/feat-sleep-ctx 
Sleep cancel sleep on log follow if the user cancels
 2020-07-03 14:34:18 +02:00
Djordje Lukic c903362d02
Merge pull request #333 from docker/feat-scan-metrics 
Implement metrics for `docker scan`
 2020-07-03 14:31:16 +02:00
Guillaume Tardif 568dc6de23 Do not allow ACI single containers with name that includes separator used for compose services (this would breaks docker logs, docker exec, docker rm using <CONTAINER_ID>) 2020-07-03 13:39:45 +02:00
Djordje Lukic a97a26bfc3 Implement metrics for `docker scan` 2020-07-03 11:24:00 +02:00
Djordje Lukic 0057093897 Sleep cancel sleep on log follow if the user cancels 2020-07-03 10:51:23 +02:00
Guillaume Tardif 76cb73c5c2 ACI : allow `docker compose down —project-name xxx` without requiring the compose file 2020-07-03 10:24:06 +02:00
Guillaume Tardif 6b74716490 Specific error message when user tries to remove one container from an ACI compose application, mentioning the name of the compose application and that user should use compose down 2020-07-03 10:03:46 +02:00
Guillaume Tardif ae76e0cf27
Merge pull request #325 from docker/error_status_context_needs_login 
Specific exit code when command fails because azure login is required
 2020-07-02 17:02:57 +02:00
Guillaume Tardif 4a1b50a9cd
Merge pull request #326 from docker/run_follow_logs 
Run containers and attach to logs by default, detach with -d option
 2020-07-02 17:02:33 +02:00