docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,725 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

771 Commits

Author SHA1 Message Date
twitherspoon 9f47e43b5c Merge branch 'master' into 3191_2_help_cli_feature 2016-04-07 12:43:34 -04:00
Daniel Nephin b33d7b3dd8 Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-06 11:14:42 -04:00
Tony Witherspoon 129fb5b356 Added code to output the top level command options if docker-compose help with no command options provided 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-04 13:15:28 -04:00
Joffrey F 78a8be07ad Re-enabling assert_hostname when instantiating docker_client from the 
environment.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 11:11:19 -07:00
Joffrey F 71c86acaa4 Update docker-py version to include match_hostname fix 
Removed unnecessary assert_hostname computation in tls_config_from_options

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 18:01:27 -07:00
Joffrey F 7116aefe43 Fix assert_hostname logic in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-28 17:39:20 -07:00
Joffrey F 12ad3ff301 Injecting os.environ in Environment instance happens outside of init method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F 1506f997de Better windows support for Environment class 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F b99037b4a6 Add support for DOCKER_* variables in .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F c7afe16419 Account for case-insensitive env on windows platform 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 36f1b4589c Limit occurrences of creating an environment object. 
.env file is always read from the project_dir

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 0ff53d9668 Less verbose environment invocation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F f48da96e8b Test get_project_name from env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 1801f83bb8 Environment class cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 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
Joffrey F 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
Aanand Prasad 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
Joffrey F 2cc87555cb tls_config_from_options unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:57:45 -07:00
Joffrey F 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
Joffrey F 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
Joffrey F 7166408d2a Fixed typos + simplified TLSConfig creation process. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F 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
Aanand Prasad 4f5123bda9 Merge pull request #3168 from dnephin/fix_tty_timeout 
Handle all timeout errors consistently
 2016-03-22 10:14:52 +00:00
Aanand Prasad 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
Aanand Prasad 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
Daniel Nephin 5c968f9e15 Fix flaky partial_change state test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 19:07:50 -04:00
Daniel Nephin be1476f24b Only allow tmpfs on v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 14:41:28 -04:00
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Joffrey F 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
Joffrey F 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
Daniel Nephin 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
Philip Walls 85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Daniel Nephin f1dce50b3d Handle all timeout errors consistently. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:19:35 -04:00
Aanand Prasad 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
Thomas Grainger 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
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad 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
Joffrey F 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
Joffrey F 20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Daniel Nephin 52b791a264 Split off build_container_options() to reduce the complexity of run 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 15:29:24 -04:00
Simon van der Veldt 658803edf8 Add -w or --workdir to compose run to override workdir from commandline 
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2016-03-15 15:28:32 -04:00
Daniel Nephin bf96edfe11 Reduce the args of some functions by including presenters as part of the thread_args. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 15:15:00 -04:00
Daniel Nephin e5529a89e1 Make down idempotent, continue to remove resources if one is missing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:26:29 -04:00
Daniel Nephin e8a93821d4 Fix race condition where a container stopping and starting again would cause logs to miss logs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:11 -04:00
Daniel Nephin 3f7e5bf768 Filter logs by service names. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 48ed68eeaa Fix geneartors for python3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00