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

3708 Commits

Author SHA1 Message Date
Joffrey F f065ce0f73 Merge pull request #3942 from shin-/3873-syslog-logs-error 
Only allow log streaming if logdriver is json-file
 2016-09-13 12:28:27 -07:00
Joffrey F 3fcd648ba2 Catch APIError while printing container logs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 12:10:41 -07:00
Joffrey F 7dd2e33057 Only allow log streaming if logdriver is json-file or journald 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-13 11:56:26 -07:00
Joffrey F 1b2354c6f4 Merge pull request #3943 from aanand/fix-integration-test-on-docker-for-mac 
Fix integration test on Docker for Mac
 2016-09-13 11:54:16 -07:00
Daniel Nephin ac9198e638 Merge pull request #3930 from shin-/update_dockerpy_version 
Update docker-py dependency to latest release
 2016-09-13 10:35:56 -04:00
Daniel Nephin 9faa852d41 Merge pull request #3921 from shin-/3890-pull-services 
Fix command hint in bundle to pull services instead of images
 2016-09-13 10:32:14 -04:00
Aanand Prasad 9759f27fa6 Fix integration test on Docker for Mac 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-09-13 14:50:37 +01:00
Joffrey F b64bd07f22 Update docker-py dependency to latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-12 14:34:07 -07:00
George Lester dada36f732 Supported group_add 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-09-11 23:10:49 -07:00
Joffrey F 817c76c8e9 Fix command hint in bundle to pull services instead of images 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-08 11:17:39 -07:00
Joffrey F 3dec600d82 Merge pull request #3830 from shin-/3534-machine-config-args 
Remove surrounding quotes from TLS paths, if present
 2016-09-07 18:35:43 -07:00
Ben Firshman c197e02ecc Merge pull request #3814 from aanand/disambiguate-swarm 
Disambiguate 'Swarm' in integration doc
 2016-09-07 10:46:14 +01:00
Joffrey F 267a243f80 Merge pull request #3799 from aanand/handle-connection-error-on-project-init 
Handle connection errors on project initialization
 2016-09-06 10:25:48 -07:00
Sven Dowideit 08179fc7e3 Merge pull request #3865 from SvenDowideit/add-jenkinsfile 
Add docs checking Jenkinsfile
 2016-08-24 15:01:36 +10:00
Sven Dowideit bf91c64983 Add docs checking Jenkinsfile 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-08-22 12:18:07 +10:00
Ben Firshman acfe100686 Merge pull request #3542 from jfroche/add_swappiness 
Add support for swappiness constraint
 2016-08-16 13:58:33 +01:00
Jean-François Roche d824cb9b06 Add support for swappiness constraint 
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/)

refs #2383

Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
 2016-08-16 11:02:51 +02:00
Joffrey F 13bcd85eb3 Merge pull request #3808 from jgsqware/patch-1 
Update rm.md
 2016-08-09 15:16:48 -07:00
Joffrey F c0305024f5 Remove surrounding quotes from TLS paths, if present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-09 15:13:01 -07:00
JG² 17f46f8999 Update rm.md 
Receiving this message when using the -a flag : `--all flag is obsolete. This is now the default behavior of `docker-compose rm`, I proposed to mark it in the docs but I don't know which way is the best

Signed-off-by: jgsqware <garciagonzalez.julien@gmail.com>
 2016-08-05 13:41:20 +02:00
Aanand Prasad 4cba653eeb Disambiguate 'Swarm' in integration doc 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-08-04 15:19:02 +01:00
Aanand Prasad d29f8e1022 Merge pull request #3789 from shin-/3788-json-splitter-fix 
json_splitter: Don't break when buffer contains leading whitespace.
 2016-08-03 13:23:52 +01:00
Joffrey F 9abbe1b7f8 Catchable error for parse failures in split_buffer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-02 12:48:32 -07:00
Aanand Prasad b3a4d76d4f Handle connection errors on project initialization 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-08-02 11:44:25 +01:00
Victoria 589fb4925e Merge pull request #3797 from aanand/note-about-experimental-build 
Add note to bundle docs about requiring an experimental Engine build
 2016-08-01 12:25:38 -07:00
Aanand Prasad 48258e2b46 Add note to bundle docs about requiring an experimental Engine build 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-08-01 12:25:49 +01:00
Joffrey F 6ce066274e Merge pull request #3784 from aanand/fix-timeout-error 
Fix stacktrace when handling timeout error
 2016-07-29 14:09:21 -07:00
Joffrey F 6f4be1cffc json_splitter: Don't break when buffer contains leading whitespace. 
Add error logging with detailed output for decode errors

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-29 14:05:59 -07:00
Aanand Prasad 5aeeecb6f2 Fix stacktrace when handling timeout error 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-29 17:12:46 +01:00
Daniel Nephin dec2c83014 Merge pull request #3778 from shin-/1.8.0-release-master-changes 
1.8.0 release master changes
 2016-07-27 18:04:43 -04:00
Joffrey F d5765b7856 Merge pull request #3771 from aanand/shell-completion-for-push-images 
Shell completion for --push-images
 2016-07-27 13:35:05 -07:00
Joffrey F 6ab0607e61 Switch back to dev version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 13:30:52 -07:00
Joffrey F 1110af1bae Bump 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 13:30:06 -07:00
Aanand Prasad 7fafd72c1e Bump 1.8.0-rc3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 13:22:20 -07:00
Aanand Prasad 60622026fa Bump 1.8.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 13:22:07 -07:00
Joffrey F 22c0779a49 Bump 1.8.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 13:21:47 -07:00
Joffrey F 94f7016fb7 Merge pull request #3777 from docker/bump-1.8.0 
Bump 1.8.0
 2016-07-27 12:40:07 -07:00
Joffrey F f3628c7a5e Bump 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 11:57:23 -07:00
Aanand Prasad e115eaf6fc Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 11:57:23 -07:00
Joffrey F 1bf0cd07de Merge pull request #3772 from docker/bump-1.8.0-rc3 
Bump 1.8.0-rc3
 2016-07-27 11:50:24 -07:00
Joffrey F 647f260b0a Merge pull request #3774 from aanand/fix-tls-version-error-message 
Fix error message for unrecognised TLS version
 2016-07-27 10:35:21 -07:00
Aanand Prasad ec825af3d3 Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 18:26:40 +01:00
Aanand Prasad cefa239c2e Bump 1.8.0-rc3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 17:46:13 +01:00
Aanand Prasad 6f3e4bbc6c Remove note about .dsb 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 87b6b3c139 Add note about missing volume mount support 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 1fb5c4b15a Fix example image hash 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad 35ed189981 Copy experimental bundle docs into Compose docs so URL is stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad c392acc56b Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Ben Firshman cd267d5121 Add user agent to API calls 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00
Ben Firshman cb076a57b9 Suggest to run Docker for Mac if it isn't running 
Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00