5416e4c99b
bash completion for `docker-compose up --build`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:21:56 +01:00
d8fb9d8831
bash completion for new `docker logs` options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:11:10 +01:00
2b063d332e
Merge pull request #3196 from albers/completion-daemon-options
...
bash completion for new TLS options
2016-03-24 15:11:55 +00:00
b09b6e390f
Merge pull request #3199 from aanand/add-tls-flags-to-overview
...
Add TLS flags to CLI reference
2016-03-24 10:48:50 -04:00
8282bb1b24
Add TLS flags to CLI reference
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-24 14:41:51 +00:00
5b2c2e332f
bash completion for TLS options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 12:06:10 +01:00
9094c4d97d
prepare bash completion for new TLS options
...
Up to now there were two special top-level options that required special
treatment: --project-name and --file (and their short forms).
For 1.7.0, several TLS related options were added that have to be passed
to secondary docker-compose invocations as well.
This commit introduces a scalable treatment of those options.
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 12:05:59 +01:00
2a09fb02db
Merge pull request #3182 from londoncalling/docs-fix-links-build-errors
...
fixed links showing as build errors per PR #3180
2016-03-23 15:08:25 -07:00
d1ea4d72ac
fixed links showing as build errors per PR #3180
...
fixed links per build errors
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-03-23 14:58:45 -07:00
c3eca82749
Merge pull request #3128 from dnephin/add_network_settings_to_config_hash
...
Include network settings as part of the service config hash.
2016-03-23 17:01:32 +00:00
2be2029791
Merge pull request #3139 from shin-/1716-tls-flags-support
...
Add support for TLS config command-line options
2016-03-22 18:24:52 -04:00
2cc87555cb
tls_config_from_options unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:57:45 -07:00
4727115317
Bump docker-py version to include tcp host fix
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
442dff72b4
Improve assert_hostname setting in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
26f3861791
Specifying --tls no longer overrides all other TLS options
...
Add an option to skip hostname verification
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
7166408d2a
Fixed typos + simplified TLSConfig creation process.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
1ac33ea7e5
Add support for TLS config command-line options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
4f5123bda9
Merge pull request #3168 from dnephin/fix_tty_timeout
...
Handle all timeout errors consistently
2016-03-22 10:14:52 +00:00
aaa7b09369
Merge pull request #3181 from dnephin/fix_partial_change_test_failure
...
Fix flaky partial_change state test
2016-03-22 10:14:28 +00:00
a20b84e6d2
Merge pull request #3178 from aanand/2774-off-one-offs
...
Remove one-off containers in `rm` and `down`
2016-03-22 10:12:21 +00:00
5c968f9e15
Fix flaky partial_change state test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 19:07:50 -04:00
6718e82966
Merge pull request #3179 from dnephin/fix_tmpfs_test_failure
...
Only allow tmpfs with the v2 format
2016-03-21 18:40:51 -04:00
be1476f24b
Only allow tmpfs on v2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 14:41:28 -04:00
2bf5e46857
Stop and remove still-running one-off containers in 'down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 18:08:07 +00:00
a2317dfac2
Remove one-off containers in 'docker-compose down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 16:15:49 +00:00
81f6d86ad9
Warn when --all is not passed to rm
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 15:14:31 +00:00
1bc9469674
Don't allow boolean values for one_off in Project methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 14:42:57 +00:00
5826a2147b
Use enum to represent 3 possible states of the one_off filter
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +00:00
187ea4cd81
Add --all option to rm command - remove one-off containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +00:00
28120148f4
Merge pull request #3137 from dnephin/add_tmpfs_to_config
...
Add support for docker run --tmpfs flag.
2016-03-21 12:10:12 +00:00
dfac48f3f5
Make a new flaky test less flaky.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:20:03 -04:00
089ec66522
Include network settings as part of the service config hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:20:03 -04:00
85c7d3e5ce
Add support for docker run --tmpfs flag.
...
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
2016-03-18 18:19:48 -04:00
f1dce50b3d
Handle all timeout errors consistently.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:19:35 -04:00
25cbc2aae9
Fix flaky network test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:19:16 -04:00
d5ef0dfa92
Merge pull request #3162 from albers/completion-workdir
...
bash completion for `docker-compose run --workdir`
2016-03-18 11:25:41 -04:00
e3c1b5886a
bash completion for `docker-compose run --workdir`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-18 10:47:17 +01:00
3a63a0815d
Merge pull request #3158 from aanand/windows-install-docs
...
Windows install docs
2016-03-17 14:40:22 -04:00
50fe014ba9
Remove hardcoded host from Engine install URLs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 18:10:32 +00:00
10dfd54ebe
Update install page with link to Windows Toolbox install instructions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 18:09:38 +00:00
72ed4d3f97
Merge pull request #3152 from aanand/update-mac-install-url
...
Update Mac Engine install URL in error message
2016-03-17 17:56:34 +00:00
312d764c9c
Merge pull request #3156 from graingert/fix-type-error-in-exc-handling
...
Fix TypeError in Exception handling
2016-03-17 08:51:33 -07:00
b2b58402b3
Merge pull request #3154 from aanand/move-ip-docs-to-reference
...
Move ipv4_address/ipv6_address docs to reference section
2016-03-17 11:44:42 -04:00
20bf05a6e3
Fix TypeError in Exception handling
...
Traceback (most recent call last):
File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
sys.exit(main())
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
log_api_error(e)
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
2016-03-17 15:13:01 +00:00
7424938fc8
Move ipv4_address/ipv6_address docs to reference section
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 11:32:36 +00:00
92d69b0cb6
Update Mac Engine install URL in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 09:56:44 +00:00
371ea479f5
Merge pull request #3075 from dnephin/reactive_logs
...
Display logs for new containers started after the command is run
2016-03-16 21:03:25 +00:00
abddabfb0a
Merge pull request #3135 from dnephin/fix_down_idempotency
...
Make down idempotent, continue to remove resources if one is missing
2016-03-16 20:26:18 +00:00
dd40331b44
Merge pull request #3102 from shin-/1477-a-modest-proposal
...
Add flag to up/down to remove orphaned containers
2016-03-16 10:58:15 -07:00
1696506ff4
Merge pull request #3136 from dnephin/add_workdir_to_run
...
Add workdir to run
2016-03-16 12:45:00 +00:00
Harald Albers
Aanand Prasad
Daniel Nephin
Victoria
Victoria Bialas
Joffrey F
Daniel Nephin
Philip Walls
Joffrey F
Thomas Grainger