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

564 Commits

Author SHA1 Message Date
Guillaume Tardif 7fac6bf766 Avoid running build/tests/lint twice on master with master.yml 2020-06-30 11:52:44 +02:00
Guillaume Tardif f0ab42e109
Merge pull request #300 from docker/aci_ci 
Run ACI e2e tests in the CI with basic support for service principal login
 2020-06-30 10:29:13 +02:00
Guillaume Tardif f3cbbc48b8 Aci e2e tests moved to master build only 2020-06-30 10:14:19 +02:00
Guillaume Tardif 2268f0c598 Renamed Login method specific to tests, to make things more explicit 2020-06-30 10:11:06 +02:00
Guillaume Tardif 82ff8dcd7d Fix resource limit defaults and make aci e2e tests pass 2020-06-30 10:10:23 +02:00
Guillaume Tardif 5d29124498
Merge pull request #298 from docker/fix-aci-tail 
Send the `tail` parameter to ACI if present
 2020-06-30 09:45:48 +02:00
Guillaume Tardif 88ccad0449
Merge pull request #297 from docker/aci_exec_it 
Let -it go through for aci exec, same as -t flag for the moment.
 2020-06-30 09:45:34 +02:00
Guillaume Tardif eda438aaed Added basic support for service principal login, run ACI e2e tests with it 2020-06-29 20:35:23 +02:00
Djordje Lukic 6a5973597d Send the `tail` parameter to ACI if present 2020-06-29 15:40:58 +02:00
Djordje Lukic 169e3a9b1f
Merge pull request #296 from docker/chore-logrus 
Use logrus for logging, not containerd's log
 2020-06-29 15:10:41 +02:00
Djordje Lukic 37f4c36c32 Use logrus for logging, not containerd's log 2020-06-29 15:02:05 +02:00
Guillaume Tardif 2b5e6f0038
Merge pull request #278 from docker/limits 
Limits for CPU and Memory
 2020-06-29 13:32:25 +02:00
Guillaume Tardif d71ae04936 Let -it flag go through for aci exec, same as -t for the moment. 
Will need to check how we can implement -I specifically on ACI
 2020-06-29 10:50:04 +02:00
Guillaume Tardif c1b0dd2e31
Merge pull request #284 from docker/aci_e2e_compose_multiport_update 
Uses compose update e2e test to also test compose exposing multiple ports
 2020-06-29 10:37:50 +02:00
Ulysses Souza 1deb2b8b09 Integrate limits on inspect 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:32:28 +02:00
Ulysses Souza 0a57fd7d5c Add cpu and memory limits 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:28:43 +02:00
Djordje Lukic b84be73ce7
Merge pull request #295 from docker/dependabot/go_modules/github.com/containerd/containerd-1.3.5 
Bump github.com/containerd/containerd from 1.3.4 to 1.3.5
 2020-06-29 10:22:24 +02:00
dependabot-preview[bot] d2178c4219
Bump github.com/containerd/containerd from 1.3.4 to 1.3.5 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/master/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.3.4...v1.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 21:25:58 +00:00
Djordje Lukic 878b7a3823
Merge pull request #292 from docker/chore-update-protos 
Update protobuf tp 1.25.0
 2020-06-26 17:21:47 +02:00
Djordje Lukic d5b674fba9
Merge pull request #291 from docker/chore-cleanup 
Cleanup entrypoint
 2020-06-26 17:21:39 +02:00
Djordje Lukic e3b6a470fa
Merge pull request #293 from docker/version_f_shorthand 
Add missing f shorthand for version command
 2020-06-26 15:38:50 +02:00
Guillaume Tardif d97f9d68fd Add missing f shorthand for version command 2020-06-26 12:35:51 +02:00
Djordje Lukic 4262a8f719 Update protobuf tp 1.25.0 2020-06-26 10:58:31 +02:00
Djordje Lukic bd33101a96
Merge pull request #277 from docker/dependabot/go_modules/github.com/Azure/go-autorest/autorest/to-0.4.0 
Bump github.com/Azure/go-autorest/autorest/to from 0.3.0 to 0.4.0
 2020-06-26 10:44:57 +02:00
dependabot-preview[bot] 952b0aae19
Bump github.com/Azure/go-autorest/autorest/to from 0.3.0 to 0.4.0 
Bumps [github.com/Azure/go-autorest/autorest/to](https://github.com/Azure/go-autorest) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Azure/go-autorest/compare/tracing/v0.3.0...tracing/v0.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 08:42:59 +00:00
Djordje Lukic a052ab9c32
Merge pull request #275 from docker/dependabot/go_modules/github.com/Azure/go-autorest/autorest/azure/cli-0.4.0 
Bump github.com/Azure/go-autorest/autorest/azure/cli from 0.3.1 to 0.4.0
 2020-06-26 10:39:16 +02:00
dependabot-preview[bot] 5e1957db65
Bump github.com/Azure/go-autorest/autorest/azure/cli from 0.3.1 to 0.4.0 
Bumps [github.com/Azure/go-autorest/autorest/azure/cli](https://github.com/Azure/go-autorest) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Azure/go-autorest/compare/autorest/azure/cli/v0.3.1...tracing/v0.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 08:37:01 +00:00
Djordje Lukic 5e983d09c6
Merge pull request #274 from docker/dependabot/go_modules/github.com/Azure/go-autorest/autorest-0.11.0 
Bump github.com/Azure/go-autorest/autorest from 0.10.2 to 0.11.0
 2020-06-26 10:33:20 +02:00
dependabot-preview[bot] 4b53950979
Bump github.com/Azure/go-autorest/autorest from 0.10.2 to 0.11.0 
Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest) from 0.10.2 to 0.11.0.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Azure/go-autorest/compare/autorest/v0.10.2...autorest/v0.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 08:31:09 +00:00
Djordje Lukic 1853ed58fb
Merge pull request #273 from docker/dependabot/go_modules/github.com/Azure/go-autorest/autorest/adal-0.9.0 
Bump github.com/Azure/go-autorest/autorest/adal from 0.8.3 to 0.9.0
 2020-06-26 10:27:11 +02:00
Djordje Lukic 18fbf67dcf
Merge pull request #261 from docker/dependabot/go_modules/google.golang.org/grpc-1.30.0 
Bump google.golang.org/grpc from 1.29.1 to 1.30.0
 2020-06-26 10:26:58 +02:00
Djordje Lukic 98976e4cb4 Cleanup entrypoint 
* use the `fatal` function when we can
* rename moby.ExecRegardlessContext to Exec
 2020-06-26 10:23:37 +02:00
Guillaume Tardif 4fb039164d
Merge pull request #289 from gtardif/automate_version_from_tag 
Automate version from tag
 2020-06-25 15:58:00 +02:00
Guillaume Tardif 53505cc44e
Merge pull request #287 from docker/ecs_delegate_moby 
Delegate to Moby CLI, to allow executing ecs CLI plugin if user has switched to the AWS context (created by the plugin)
 2020-06-25 14:04:06 +02:00
Guillaume Tardif 0bcba8d1d2 Set LD_FLAG version from git tag. Displayed version will be (default behaviour of git describe —tags): 
* release version : if tag `v0.1.2` is exactly on the built commit : `0.1.2` (strip v when displaying `docker version`)
* dev version : if tag `v0.1.2` is 3 commits before, and we are on commit `xyz` : `0.1.2-3-xyz` 
* will only match tags starting with `v[0-9]`
 2020-06-25 13:50:16 +02:00
Djordje Lukic 908212a947 Add version in the main package 
This way, when we release goreleaser will inject the right version in
the ldflags
 2020-06-25 12:00:37 +02:00
Guillaume Tardif 839b1b0b44 Delegate to Moby CLI, to allow executing ecs CLI plugin if user has switched to the AWS context (created by the plugin) 2020-06-25 11:49:28 +02:00
Guillaume Tardif 2df807abca Uses compose update e2e test to also test compose exposing multiple ports 2020-06-24 18:20:27 +02:00
Chris Crone 0173956d4f
Merge pull request #197 from chris-crone/docs-linux-install 
Add Linux install instructions
 2020-06-24 17:53:14 +02:00
Christopher Crone 6e6ed0648f docs: Add Linux install instructions 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-06-24 17:51:36 +02:00
Guillaume Tardif c65c32cba2
Merge pull request #280 from gtardif/changelog_0.1.4 
Changelog updates
 2020-06-24 17:22:40 +02:00
Guillaume Tardif d40acb3146 Changelog updates 2020-06-24 16:49:11 +02:00
Guillaume Tardif 4a9f65a29a
Merge pull request #279 from docker/version_0.1.4 
Bump version 0.1.4
 2020-06-24 11:43:04 +02:00
Guillaume Tardif 0d75d58089 Bump version 0.1.4 2020-06-24 11:38:34 +02:00
Guillaume Tardif e904ac86ad
Merge pull request #272 from docker/fix_port_convert_panic 
Trying to fix defensively a panic @nebuk89 encountered on ACI,
 2020-06-24 11:17:32 +02:00
dependabot-preview[bot] 8881eca3ce
Bump github.com/Azure/go-autorest/autorest/adal from 0.8.3 to 0.9.0 
Bumps [github.com/Azure/go-autorest/autorest/adal](https://github.com/Azure/go-autorest) from 0.8.3 to 0.9.0.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Azure/go-autorest/compare/autorest/adal/v0.8.3...autorest/v0.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-23 21:25:28 +00:00
Guillaume Tardif 70f9613dab Trying to fix defensively a panic @nebuk89 encountered on ACI, but could not reproduce it. 2020-06-23 17:52:14 +02:00
Guillaume Tardif 6b31b91f18
Merge pull request #270 from docker/version_0.1.3 
Bump version to 0.1.3
 2020-06-23 17:07:39 +02:00
Guillaume Tardif bf76fe2f32 Bump version to 0.1.3 2020-06-23 17:05:07 +02:00
Guillaume Tardif c673b3256b
Merge pull request #267 from rumpl/feat-metrics 
Usage metrics
 2020-06-23 17:03:06 +02:00