5831b869e8
Update tests for new environment handling
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
b9ca5188a2
Remove Environment singleton, instead carry instance during config processing
...
Project name and compose file detection also updated
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
bf8e501b5e
Fix pre-commit config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c69d8a3bd2
Implement environment singleton to be accessed throughout the code
...
Load and parse environment file from working dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
d1d8df7f72
Merge pull request #3192 from shin-/use-dockerpy-1.8
...
Require docker-py 1.8.0rc2
2016-03-24 13:55:59 -04:00
d78b013bb0
Merge pull request #3204 from albers/completion-rm--all
...
bash completion for `docker-compose rm --all`
2016-03-24 10:44:36 -07:00
aabeb56527
Merge pull request #3206 from albers/completion-exec
...
bash completion for `docker-compose exec`
2016-03-24 10:44:19 -07:00
60470fb9f1
Require docker-py 1.8.0rc2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:13:56 -07:00
84a2e634a8
Merge pull request #3200 from dnephin/disable_broken_test
...
Disable a test that is failing against 1.11.0rc1.
2016-03-24 13:09:35 -04:00
c9b02b7b34
bash completion for `docker-compose exec`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 18:02:12 +01:00
87231a25be
Merge pull request #3202 from albers/completion-logs
...
bash completion for new `docker logs` options
2016-03-24 09:56:12 -07:00
353c4deb19
Merge pull request #3203 from albers/completion-up--build
...
bash completion for `docker-compose up --build`
2016-03-24 09:55:58 -07:00
732531b722
Disable a test that is failing against 1.11.0rc1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-24 12:32:13 -04:00
b030c3928a
bash completion for `docker-compose rm --all`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-24 17:29:04 +01:00
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
a53b29467a
Update wordpress example to use official images
...
The orchardup images are very old and not maintained.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-03-22 17:19:50 -07: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
7fc40dd7cc
Adding ssl_version to docker_clients kwargs
...
Select tls version based of COMPOSE_TLS_VERSION
Changed from SSL to TLS
Also did docs - missing default value
Using getattr and raises AttributeError in case of unsupported version
Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
2016-03-19 01:15:03 +01: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
Joffrey F
Daniel Nephin
Joffrey F
Harald Albers
Daniel Nephin
Aanand Prasad
Victoria
Victoria Bialas
Ben Firshman
Kalle Møller
Philip Walls