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

4700 Commits

Author SHA1 Message Date
Joffrey F cc3f3c182d Merge branch 'master' of github.com:docker/compose 2018-02-12 11:54:33 -08:00
Joffrey F 515ea20f25 Fix Dockerfile.run indentation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-12 11:54:08 -08:00
Joffrey F 56b2a80d50
Merge pull request #5670 from briandealwis/patch-1 
Fix bash completion on systems where extglob is not set
 2018-02-12 10:45:05 -08:00
Brian de Alwis bb8c2e1f45 Fix bash completion on systems where extglob is not set 
Signed-off-by: Brian de Alwis <bsd@mt.ca>
 2018-02-09 11:25:58 -05:00
Joffrey F 54afe3e1c0
Merge pull request #5665 from docker/5659-dockerfile.run-needs-cli 
Add `docker` CLI to the `docker/compose` image
 2018-02-08 14:25:28 -08:00
Joffrey F cd87d88882 Add `docker` CLI to the `docker/compose` image 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-08 13:59:27 -08:00
Joffrey F c3a5488d11 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-08 13:56:22 -08:00
Joffrey F 578edc41d9
Merge pull request #5657 from docker/garribas-4909-terminate-containers-on-sighup 
Terminate one-off run on SIGHUP
 2018-02-07 14:23:52 -08:00
Joffrey F 75572f3860 Immediately kill / force-rm one-off container when receiving SIGHUP 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 14:03:31 -08:00
Joffrey F a6459efcad Merge branch '4909-terminate-containers-on-sighup' of https://github.com/garribas/compose into garribas-4909-terminate-containers-on-sighup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 13:59:22 -08:00
Joffrey F c223c3fde9
Merge pull request #5625 from albers/option-consistency 
Add missing `-q|--quiet` options to increase consistency
 2018-02-07 13:54:05 -08:00
Joffrey F 8ea89efdd8 1.20.0-dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 12:21:41 -08:00
Joffrey F 522825e411 Merge branch 'release' 2018-02-07 12:18:28 -08:00
Joffrey F 4fa296e7e8
Merge pull request #5656 from docker/bump-1.19.0 
Bump 1.19.0
 2018-02-07 11:53:01 -08:00
Joffrey F 9e633ef35a Bump 1.19.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 10:59:31 -08:00
Joffrey F 84f7bef1b7 Modified options dict leads to a mismatched config hash for API < 1.30 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 10:57:40 -08:00
Daniel Schildt ea64baa8fe Improve spelling in the README.md 
Improve spelling of the brand names:
- GitHub instead of Github

Signed-off-by: Daniel Schildt <daniel.schildt@gmail.com>
 2018-02-07 10:54:41 -08:00
Joffrey F b099257926 Update dockerfile.run to compile the latest (2.27) version of glibc 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-07 10:54:41 -08:00
Joffrey F 9b1dcf2721 Merge remote-tracking branch 'origin/release' into bump-1.19.0 2018-02-07 10:51:50 -08:00
Joffrey F c6263f265f
Merge pull request #5652 from docker/use_latest_glibc 
Update dockerfile.run to compile the latest (2.27) version of glibc
 2018-02-07 10:46:03 -08:00
Joffrey F 56fe57fd77
Merge pull request #5653 from docker/5651-config_hash_bug 
Fix: Modified options dict leads to a mismatched config hash for API < 1.30
 2018-02-06 17:25:20 -08:00
Joffrey F 3a0ed8cbba Modified options dict leads to a mismatched config hash for API < 1.30 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-06 16:58:15 -08:00
Joffrey F df6e300081 Update dockerfile.run to compile the latest (2.27) version of glibc 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-06 14:50:52 -08:00
Joffrey F d2c87f7649
Merge pull request #5647 from docker/bump_sdk 
Bump Docker Python SDK version
 2018-02-05 15:10:50 -08:00
Joffrey F 649604d88d Bump Docker Python SDK version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-05 14:49:13 -08:00
Joffrey F d93caf96b9
Merge pull request #5640 from docker/faster_jenkins_tests 
Parallelize Docker versions
 2018-02-05 14:34:55 -08:00
Joffrey F ea0dac8ecb
Merge pull request #5641 from d2s/patch-1 
Improve spelling in the README.md
 2018-02-03 18:53:36 -08:00
Daniel Schildt 95005e6c03 Improve spelling in the README.md 
Improve spelling of the brand names:
- GitHub instead of Github

Signed-off-by: Daniel Schildt <daniel.schildt@gmail.com>
 2018-02-03 17:31:22 +02:00
Joffrey F 632abe94c0 Parallelize Docker versions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-02 17:38:33 -08:00
Joffrey F a3e1d54bf7
Merge pull request #5639 from docker/faster_jenkins_tests 
Remove obsolete code that slows down test execution
 2018-02-02 15:50:55 -08:00
Joffrey F dce62c81d5 Remove obsolete code that slows down test execution 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-02 15:18:55 -08:00
Joffrey F ee7422af0e
Merge pull request #5637 from docker/v3.6_schema_support 
Add support for 3.6 schema and tmpfs mount size
 2018-02-02 13:24:30 -08:00
Joffrey F 9dde4fff0e Add support for 3.6 schema and tmpfs mount size 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-02 12:01:41 -08:00
Joffrey F 4b6bfa47fc
Merge pull request #5588 from docker/python3-binaries 
Compile binaries on Python 3.6
 2018-02-01 16:59:09 -08:00
Joffrey F a0f78539b6 Test and build on 3.6 (replaces 3.4) ; dist 3.6-compiled binaries 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 16:05:32 -08:00
Joffrey F 7fad02e350
Merge pull request #5635 from docker/bump-1.19.0-rc3 
Bump 1.19.0 rc3
 2018-02-01 15:02:54 -08:00
Joffrey F 8725385813
Merge pull request #5631 from docker/bump_sdk 
Bump python SDK to 3.0.0
 2018-02-01 14:51:05 -08:00
Joffrey F cdd02822f5 Bump 1.19.0-rc3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 14:23:22 -08:00
Joffrey F ea0dc8a408 Fix DOCKER_TLS_VERIFY bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 14:23:22 -08:00
Joffrey F e0e0b22f07 Merge remote-tracking branch 'origin/release' into bump-1.19.0-rc3 2018-02-01 14:20:42 -08:00
Joffrey F 4ffe036f65
Merge pull request #5634 from docker/5632-tls-verify 
Fix DOCKER_TLS_VERIFY bug
 2018-02-01 13:44:17 -08:00
Joffrey F 4d4e066fbc Fix DOCKER_TLS_VERIFY bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-01 12:16:32 -08:00
Joffrey F d8d484e0e1 Bump python SDK to 3.0.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-31 18:54:58 -08:00
Harald Albers 6cfbb7ed8a Add missing `-q|--quiet` options to increase consistency 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-30 01:28:15 +01:00
Joffrey F dfcb02c60d
Merge pull request #5610 from docker/bump-1.19.0-rc2 
Bump 1.19.0 rc2
 2018-01-26 11:34:04 -08:00
Joffrey F a186c3142b Bump 1.19.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-25 18:25:51 -08:00
Joffrey F cc2f023747 Circle token 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-25 18:25:51 -08:00
Joffrey F 14485b306c Don't leak circle API auth info 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-25 18:25:51 -08:00
Joffrey F 70ad55cd88 Trigger remote build for OSX 10.11 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-25 18:25:51 -08:00
Harald Albers 0f41e07a5c Add bash completion for `up {--always-recreate-deps,--renew-anon-volumes}` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-25 18:25:51 -08:00