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

209 Commits

Author SHA1 Message Date
Evgeniy Dobrohvalov bf48a781db Add flag for stops all containers if any container was stopped. 
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
 2016-01-13 13:12:09 +03:00
Aanand Prasad 9e17cff0ef Refactor API version switching logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Daniel Nephin 12b5405420 Fix pre-commit on master. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 13:27:18 -05:00
Daniel Nephin 304a44aeab Merge pull request #2585 from dnephin/short_signal_handlers 
Fix signal handlers by moving shutdown logic out of handler
 2016-01-12 12:55:53 -05:00
Daniel Nephin d3cd038b84 Update event field names to match the new API fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-11 11:51:17 -05:00
Daniel Nephin d1d3969661 Add docker-compose event 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-08 13:43:30 -05:00
Daniel Nephin 475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Joffrey F ec5111f1c2 Volumes are now prefixed with the project name 
When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F b4be7b870f Add support for declaring named volumes in compose files 
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin 2acc29cf1c Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-04 15:37:21 -05:00
Daniel Nephin 778c213dfc Fix signal handlers by moving shutdown logic out of handler. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-30 11:21:20 -05:00
Daniel Nephin ea8cc1c3dc Merge pull request #2562 from thaJeztah/update-links 
Update links
 2015-12-21 08:31:39 -08:00
Aanand Prasad a2d2915a64 Merge pull request #2547 from seguins/1125-docker-compose-create 
Add docker-compose create command.
 2015-12-21 14:20:56 +00:00
Sebastiaan van Stijn 5ed559fa0e Update links 
Updates some links to their new locations, and
replaces some http:// with https:// links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-12-21 01:52:54 +01:00
Aanand Prasad 12a08255b5 Merge pull request #2554 from aanand/clarify-rm-behaviour 
Clarify behaviour of 'rm'
 2015-12-18 16:42:05 +00:00
Stéphane Seguin 3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Aanand Prasad 2e9a49b4eb Clarify behaviour of 'rm' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-17 17:50:45 +00:00
Dimitar Bonev bc843d6758 Start, restart, pause and unpause exit with non-zero if nothing to do 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-15 23:11:11 +02:00
Daniel Nephin 437f3f8adb Add docker-compose config subcommand. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-07 18:51:01 -08:00
Aanand Prasad ecf2dd11f9 Merge pull request #2467 from dnephin/remove_migrate_to_labels 
Remove migrate-to-labels.
 2015-12-07 14:31:23 +00:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Daniel Nephin 2f568984f7 Fixes #2368, removes the deprecated --allow-insecure-ssl flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 11:52:25 -05:00
Daniel Nephin dac75b07dc Move volume parsing to config.types module 
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:33:00 -05:00
Daniel Nephin c4096525c2 Merge pull request #2364 from dnephin/handle_signals_properly 
Handle SIGTERM/SIGINT properly for up and run
 2015-11-20 11:58:04 -05:00
Daniel Nephin d4b9845201 Add the git sha to version output 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-18 13:21:14 -05:00
Daniel Nephin 6236bb0019 Handle both SIGINT and SIGTERM for docker-compose run. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 17:41:44 -05:00
Daniel Nephin ea4230e7a2 Handle both SIGINT and SIGTERM for docker-compose up. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-12 17:41:44 -05:00
Daniel Nephin 98ad5a05e4 Validate additional files before merging them. 
Consolidates all the top level config handling into `process_config_file` which
is now used for both files and merge sources.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-11 10:56:15 -05:00
Daniel Nephin 7d6c63d1b7 Merge pull request #2361 from dnephin/pr-2262 
Rebase of PR 2262
 2015-11-10 13:42:08 -05:00
Daniel Nephin 338bbb5063 Re-order flags in bash completion 
and remove unnecessary variables from build command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:11:59 -05:00
Joffrey F 133d213e78 Use exit code 1 when encountering a ReadTimeout 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-10 10:11:20 -08:00
Adrian Budau c5c36d8b00 Added --force-rm to compose build. 
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
 2015-11-10 13:05:04 -05:00
Daniel Nephin d32bb8efee Fix #1549 - flush after each line of logs. 
Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 15:33:42 -05:00
Daniel Nephin 3d9e3d0877 Remove service.start_container() 
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 10:17:09 -05:00
Daniel Nephin c439e056a0 Merge pull request #2288 from dnephin/warning_about_vars 
Add console color to warnings and errors so they are more obvious
 2015-10-30 10:58:00 -04:00
Daniel Nephin 841ed4ed21 Remove the duplicate 'Warning' prefix now that the logger adds the prefix. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:18:28 -04:00
Daniel Nephin d836973a04 Use colors when logging warnings or errors, so they are more obvious. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:06:50 -04:00
Joffrey F 596261e759 Ensure network exists when calling run before up 
Otherwise the daemon will error out because the network doesn't exist
yet.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-29 17:56:01 +01:00
Mazz Mosley 7603ebea9b Attach to a container's log_stream before they're started 
So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.

LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Daniel Nephin e2f792c4f4 If -x-networking is used, set the correct API version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 12:09:50 -04:00
Aanand Prasad d5f5eb1924 Enable use of Docker networking with the --x-networking flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-14 11:19:43 -04:00
Aanand Prasad fda615008c Merge pull request #2142 from dnephin/fix_error_cant_connect 
Fix error when compose can't connect to docker
 2015-10-07 11:22:32 +01:00
Daniel Nephin 3661e8bc74 Fix build against the swarm cluster by joining buffered output before parsing json. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00
Daniel Nephin fbaea58fc1 Fix #2133 - fix call to get_client() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:57:49 -04:00
Daniel Nephin aefb7a44b2 Refactor command class hierarchy to remove an unnecessary intermediate base class Command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:49:35 -04:00
Daniel Nephin 78c0734cbd Disable some tests in windows for now. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:42:57 -04:00
mnowster 6f12224ec9 Merge pull request #2005 from lnmunhoz/master 
Fix error message and class name from Boot2Docker to DockerMachine
 2015-09-21 17:05:03 +01:00
mnowster aa70209ade Merge pull request #1957 from aanand/stub-run-on-windows 
WIP: Build Windows binary
 2015-09-21 16:21:12 +01:00
Aanand Prasad e5eaf68490 Remove custom docker client initialization logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-21 15:27:42 +01:00
mnowster b9252aa48e Merge pull request #2032 from villlem/master 
Flag to skip all pull errors when pulling images
 2015-09-21 13:41:08 +01:00
Aanand Prasad 18dbe1b1c0 Merge pull request #2051 from dnephin/extend_compose_files 
Extend compose files by allowing multiple files
 2015-09-21 12:34:22 +02:00
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Aanand Prasad fb30498153 Catch WindowsError in call_silently 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 3e4182a480 Stub 'run' on Windows 
Adapted from @dopry's work in https://github.com/docker/compose/pull/1900

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:17 +01:00
Aanand Prasad 3e58003bd3 Merge pull request #2041 from ggtools/master 
Add new --pull option in build.
 2015-09-18 16:49:05 +01:00
Daniel Nephin fe5daf860d Move find_candidates_in_parent_dirs() into a config module so that config doesn't import from cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin c0c9a7c1e4 Update integration tests for multiple file support 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 10b3188214 Support multiple config files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 258d0fa0c6 Remove some functions from Command class 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 2121f5117e Add docopt support for multiple files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin bdfb21f017 Fixes #189 - stacktrace when ctrl-c stops logs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-15 20:46:22 -04:00
Christophe Labouisse 39786d4da7 Add new --pull option in build. 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-09-15 20:19:17 +02:00
Daniel Nephin 7d8ae9aa6d Refactor LogPrinter to make it immutable and remove logic from the constructor. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-11 12:56:56 -04:00
Daniel Nephin 413b76e228 Fix warning message when a container uses a non-json log driver 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-11 12:54:27 -04:00
Aanand Prasad f7d86d3194 Merge pull request #1944 from funkyfuture/issue-1921 
Adds pause- and unpause-command to docopt's TLC
 2015-09-08 14:05:27 -07:00
Lucas N. Munhoz b33dd3bc01 Fix error message and class name from Boot2Docker to DockerMachine 
Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
 2015-09-08 10:08:38 -03:00
Aanand Prasad 10cb0c921a Merge pull request #1963 from shin-/1923-catch-timeout 
Exit gracefully when requests encounter a ReadTimeout exception.
 2015-09-04 16:14:32 -07:00
Daniel Nephin 0484e22a84 Add enum34 and use it to create a ConvergenceStrategy enum. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-04 10:45:53 -04:00
Daniel Nephin db9f577ad6 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:08:44 -04:00
Joffrey F f9c7346380 HTTP_TIMEOUT as importable constant for consistency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 16:29:19 -07:00
Joffrey F b110bbe9e3 Refined error message when timeout is encountered. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 14:31:30 -07:00
Joffrey F e634fe3fd6 Deprecation warning when DOCKER_CLIENT_TIMEOUT is used 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 14:28:57 -07:00
Daniel Nephin 48466d7d82 Fix #1961 - docker-compose up should attach to all containers with no service names are specified, and add tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-02 16:08:18 -04:00
Joffrey F b54b932b54 Exit gracefully when requests encounter a ReadTimeout exception. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 11:54:20 -07:00
Frank Sachsenheim a4bab13aee Adds pause- and unpause-command to docopt's TLC 
solves # 1921

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-28 19:05:19 +02:00
Aanand Prasad e777d08854 Merge pull request #1924 from dnephin/python3_fix_for_logs 
Fix `docker-compose logs` on python3
 2015-08-27 14:19:42 +01:00
Daniel Nephin 3a0153859a Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 16:21:31 -04:00
Daniel Nephin d2718bed99 Allow setting a one-off container name 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:33:03 -04:00
Daniel Nephin 9d9550c5b6 Fix log printing for python3 by converting everything to unicode. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 11:24:48 -04:00
Daniel Nephin a348993d2c Remove two unused functions from cli/utils.py 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 16:55:29 -04:00
Daniel Nephin 71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin 7e4c3142d7 Have log_printer use utf8 stream. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:47:06 -04:00
Daniel Nephin 809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Aanand Prasad 60ff4549c9 Merge pull request #1766 from funkyfuture/pause_unpause 
Adds pause and unpause-commands
 2015-08-24 16:10:22 +01:00
Frank Sachsenheim 227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Aanand Prasad c699876617 Set log level to DEBUG when `--verbose` is passed 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:09:28 +01:00
Karol Duleba ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad 80d90a745a Make sure an exception in any iterator gets raised in the main thread 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/multiplexer.py
 2015-07-29 19:42:33 +01:00
Aanand Prasad a9942b512a Wait for all containers to exit when running 'up' interactively 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad 27378704df Isolate STOP logic in multiplexer module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad 03c3d4c768 generator -> iterator 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad 118a389646 Update API version to 1.19 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 15:44:21 +01:00
Reilly Herrewig-Pope fc203d643a Allow API version specification via env var 
Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.

Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.

Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
 2015-07-29 08:44:47 -04:00
Aanand Prasad 04a773f1c8 Deprecate --allow-insecure-ssl 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad 38a6209acd Stop printing a stack trace when there's an error when pulling 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 11:07:20 +01:00
Aanand Prasad ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Aanand Prasad 9d0bbdf8dd Make scale timeout configurable, default to 10 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-16 16:39:38 +01:00