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

5216 Commits

Author SHA1 Message Date
Joffrey F 2038bb5cf7
Merge pull request #6145 from deivid-rodriguez/bug/broken_url 
Fix broken url
 2018-08-20 14:34:00 -07:00
David Rodríguez 3a93e85762
Fix broken url 
As per https://github.com/sgerrand/alpine-pkg-glibc#please-note.

Signed-off-by: David Rodríguez <deivid.rodriguez@riseup.net>
 2018-08-17 14:08:41 -03:00
Joffrey F 901ee4e77b
Merge pull request #6134 from docker/4841-fix-project-dir 
Fix --project-directory handling to apply to .env files as well
 2018-08-13 16:03:47 -07:00
Joffrey F eb63e9f3c7 Fix --project-directory handling to apply to .env files as well 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-10 17:02:56 -07:00
Joffrey F ed245474c2
Merge pull request #6130 from docker/bump_sdk 
Bump Python SDK -> 3.5.0
 2018-08-10 14:08:36 -07:00
Joffrey F 5ad50dc0b3 Bump Python SDK -> 3.5.0 
Add support for Python 3.7

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-09 18:31:08 -07:00
Joffrey F f207d94b3c
Merge pull request #6126 from docker/wfender-2013-expose-config-hash 
Add --hash opt for config command
 2018-08-07 21:12:48 -07:00
Joffrey F ee878aee4c Handle missing (not built) service image in config --hash 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 20:23:21 -07:00
Joffrey F 861031b9b7 Reduce config --hash code complexity and add test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 17:25:35 -07:00
Joffrey F 707e21183f Fix config hash consistency with unprioritized networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-08-07 16:51:01 -07:00
Fender William 541fb65259 Add --hash opt for config command 
Signed-off-by: Fender William <fender.william@gmail.com>
 2018-08-07 16:51:01 -07:00
Joffrey F 473703d0d9
Merge pull request #6115 from graphaelli/parallel-build 
add --parallel option to build
 2018-08-02 15:23:06 -07:00
Joffrey F 6e95eb7437
Merge pull request #6104 from glorpen/fix-pipes 
Fixes pipe handling in container mode.
 2018-07-31 15:39:07 -07:00
Gil Raphaelli 89f2bfe4f3 add --parallel option to build 
Signed-off-by: Gil Raphaelli <g@raphaelli.com>
 2018-07-31 12:06:59 -04:00
Joffrey F 635c77db6c
Merge pull request #6071 from nickhiggs/6060-reattach-logger-on-restart 
Attach logger to containers after crashing.
 2018-07-25 15:20:43 -07:00
Joffrey F c956785cdc Add progress messages to parallel pull 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-25 14:39:18 -07:00
Arkadiusz Dzięgiel 7f9c042300 Fixes pipe handling in container mode. 
Closes #4599, #4460

- adds a way to provide options from env in both cases (tty & non tty)
- allocates TTY only if both stdin & stdout are TTYs
- enables interactive mode if stdin is not TTY

Signed-off-by: Arkadiusz Dzięgiel <arkadiusz.dziegiel@glorpen.pl>
 2018-07-24 12:23:31 +02:00
Joffrey F ebad981bcc
Merge pull request #6092 from ofek/support-newer-requests 
support newer minor version of requests
 2018-07-23 13:30:07 -07:00
Joffrey F 5d0fe7bcd3
Merge pull request #6080 from chris-crone/macos-rework-build 
Rework build on macOS
 2018-07-23 13:26:21 -07:00
Christopher Crone 450efd557a macOS: Rework build scripts 
Allows us to build for older versions of macOS by downloading an
older SDK and building OpenSSL and Python against it.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2018-07-23 11:41:32 +02:00
Ofek Lev 88d88d1998 support newer minor version of requests 
Signed-off-by: Ofek Lev <ofekmeister@gmail.com>
 2018-07-18 22:25:01 -04:00
Joffrey F 6cb17b90ef 1.23.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 11:11:34 -07:00
Joffrey F bb00352c34 Fix up_with_networks test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 11:09:25 -07:00
Joffrey F 1396cdb4be
Merge pull request #6088 from docker/release 
Resync master with release
 2018-07-18 11:00:56 -07:00
Joffrey F e20d808ed2
Merge pull request #6087 from docker/bump-1.22.0 
Bump 1.22.0
 2018-07-17 16:01:56 -07:00
Joffrey F f46880fe9a "Bump 1.22.0" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:48:24 +00:00
Joffrey F cda827cbfc Improve finalize robustness and allow resume using special --finalize-resume flag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F 8c0411910d Avoid unrelated file uploads with twine 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F d9545a5909 Add distclean to remove old build files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F cb1b88c4f8 s/release.py/release.sh/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-17 22:47:23 +00:00
Joffrey F 9271f9f46f
Merge pull request #6077 from docker/5966-exitcode-from-sigkill 
Fix --exit-code-from to reflect exit code after termination by Compose
 2018-07-16 20:04:35 -04:00
Joffrey F e6d18b1881 Fix --exit-code-from to reflect exit code after termination by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-10 15:28:55 -04:00
Joffrey F 8c4fc4bc2e
Merge pull request #6073 from docker/release-tool-improve 
Misc improvements to release script
 2018-07-10 15:04:31 -04:00
Joffrey F 64918235d2
Merge pull request #6072 from docker/6037-external-false 
Avoid overriding external = False in serializer
 2018-07-09 13:55:59 -07:00
Joffrey F d7f5220292 Improve finalize robustness and allow resume using special --finalize-resume flag 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:51:01 -04:00
Joffrey F 0b5f68098c Avoid unrelated file uploads with twine 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:25:06 -04:00
Joffrey F 8a7ee5a7d5 Add distclean to remove old build files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 16:19:17 -04:00
Joffrey F e9aaece40d s/release.py/release.sh/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:46:56 -04:00
Joffrey F 9c2ffe6384 Avoid overriding external = False in serializer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-09 15:28:32 -04:00
Nicholas Higgins 28085ebee2 Attach logger to containers after crashing. 
Fixes #6060

Signed-off-by: Nicholas Higgins <nickhiggins42@gmail.com>
 2018-07-09 08:47:20 +10:00
Matthieu Nottale 5985d046e3
Merge pull request #6065 from docker/bump-1.22.0-rc2 
Bump 1.22.0-rc2
 2018-07-05 17:24:31 +02:00
Matthieu Nottale 6817b533a8 "Bump 1.22.0-rc2" 
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
 2018-07-05 15:10:31 +00:00
Joffrey F 15718810c0 Prevent attempts to create image names starting with - or _ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-05 15:07:35 +00:00
Joffrey F 969525c190 Docker SDK -> 3.4.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-05 15:07:34 +00:00
Joffrey F 40631f9a01
Merge pull request #6051 from docker/bump_sdk 
Docker SDK -> 3.4.1
 2018-06-29 13:32:51 -07:00
Joffrey F e8713d7cef Docker SDK -> 3.4.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-29 13:05:20 -07:00
Joffrey F 7ae632a9ee
Merge pull request #6041 from docker/5929-underscore-projname-2 
Don't create image names starting with - or _
 2018-06-22 16:25:08 -07:00
Joffrey F b00db08aa9 Prevent attempts to create image names starting with - or _ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-22 15:56:53 -07:00
Joffrey F 6e30c130d5
Merge pull request #6035 from docker/fix-api-version-typo 
Fix API version typo
 2018-06-21 14:40:10 -07:00
Joffrey F bdd7d47640
Merge pull request #6034 from docker/bump-1.22.0-rc1 
Bump 1.22.0-rc1
 2018-06-21 14:30:26 -07:00