docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-03 11:12:47 +03:00
Code Activity
1,997 Commits 89 Branches 28 Tags
3474bb6cf5c1961deb20cd186cd2a2dbf3224f0c
Commit Graph

425 Commits

Author SHA1 Message Date
Aanand Prasad
0017f43d7f Merge pull request #2339 from dnephin/recreate_deps_on_create 
Recreate dependents when a dependency is created
 2015-11-10 17:36:23 +00:00
Daniel Nephin
c8fa0a902a Merge pull request #2331 from dnephin/flush_log_buffer_when_printing_logs 
Flush the log stream after writing each line
 2015-11-10 12:34:42 -05:00
Aanand Prasad
917b885a44 Merge pull request #2334 from dnephin/dont_set_hostname 
Don't set the hostname to the service name with networking.
 2015-11-10 17:34:02 +00:00
Daniel Nephin
b09cf86dd6 Merge pull request #2326 from dnephin/unicode_decode_error 
Unicode decode error
 2015-11-10 12:29:52 -05:00
Joffrey F
774d852f93 Merge pull request #2335 from dnephin/volumes_refactoring 
Some small refactoring around volumes
 2015-11-09 14:05:52 -08:00
Joffrey F
a1e140f5a3 Update service config_dict computation to include volumes_from mode 
Ensure config_hash is updated when volumes_from mode is changed, and
service is recreated on next up as a result.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-11-09 13:07:26 -08:00
Aanand Prasad
1bfb710326 Fix parallel output 
We were outputting an extra line, which in *some* cases, on *some*
terminals, was causing the output of parallel actions to get messed up.

In particular, it would happen when the terminal had just been cleared
or hadn't yet filled up with a screen's worth of text.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-11-09 17:24:21 +00:00
Daniel Nephin
7c2a16234f Recreate dependents when a dependency is created (not just when it's recreated). 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-06 12:29:52 -05:00
Daniel Nephin
ec22d98377 Use VolumeSpec instead of re-parsing the volume string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
0e19c92e82 Make working_dir consistent in the config package. 
- make it a positional arg, since it's required
- make it the first argument for all functions that require it
- remove an unnecessary one-line function that was only called in one place

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 18:11:56 -05:00
Daniel Nephin
3456002aef Don't set the hostname to the service name with networking. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 17:50:32 -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
26c7dd3712 Handle non-utf8 unicode without raising an error. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 12:56:36 -05:00
Aanand Prasad
67dc90ec0e Merge pull request #2314 from dnephin/fix_up_require_build_error 
Fix `up` "requires build" error
 2015-11-05 15:52:56 +00:00
Daniel Nephin
8ff960afd1 Fix service recreate when image changes to build. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin
6b002fb922 Cherry-pick release notes froim 1.5.0 
And bump version to 1.6.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -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
491d052088 Don't set a default network driver, let the server decide. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 11:53:36 -04: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
04a76dc284 Merge pull request #2287 from shin-/2284-ensure-network-exists-run 
Ensure network exists when calling run before up
 2015-10-30 10:41:55 -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
Daniel Nephin
eab9d86a3d Logs are available for all log drivers except for none. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 11:28:17 -04:00
Mazz Mosley
5dc14f3925 Handle non-ascii chars in volume directories 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-29 12:05:51 +00:00
Daniel Nephin
b6b9b002e5 Merge pull request #2254 from mnowster/1756-dont-display-output-from-previous-runs 
1756 dont display output from previous runs
 2015-10-27 18:45:47 -04:00
Mazz Mosley
76d52b1c5f Remove redundant try/except 
Code cleanup. We no longer need this as the api returns a 304 for any
stopped containers, which doesn't raise an error.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
30a84f1be6 Move rename functionality into Container 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00: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
7878d38dee Fix running one-off containers with --x-networking by disabling linking to self. 
docker create fails if networking and links are used together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-27 11:11:15 -04:00
mnowster
5d60fbe31e Merge pull request #1659 from viranch/hostip-random-port 
Allow scaling services that have port binding of the form `host_ip::container_port`
 2015-10-23 17:11:28 +01:00
Daniel Nephin
ae47435425 Fix unicode in environment variables for python2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-22 12:12:43 -04:00
Daniel Nephin
0fed5e6864 Use inspect network to query for an existing network. 
And more tests for get_network()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 13:05:14 -04:00
Daniel Nephin
b500fa2351 Refactor ServiceLoader to be immutable. 
Mutable objects are harder to debug and harder to reason about. ServiceLoader was almost immutable. There was just a single function which set fields for a second function. Instead of mutating the object, we can pass those values as parameters to the next function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:14:35 -04:00
Daniel Nephin
4505632274 Some minor style cleanup 
- fixed a docstring to make it PEP257 compliant
- wrapped some long lines
- used a more specific error

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:13:00 -04:00
mnowster
fb69391889 Merge pull request #2233 from dnephin/some_unit_test_cleanup 
Cleanup some unit tests and whitespace
 2015-10-21 10:39:28 +01:00
Daniel Nephin
b1f8ed84a3 Cleanup some unit tests and whitespace. 
Remove some unnecessary newlines.
Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything.
Updated some unit tests to use mocks instead of a custom fake.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 14:23:56 -04:00
Daniel Nephin
5523c3d745 Minor refactor to use guard and replace instead of split+join 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 12:09:01 -04:00
Daniel Nephin
3f0e083585 Force windows drives to be lowercase. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 11:39:06 -04:00
mnowster
5ed9f9bdf7 Merge pull request #2206 from dnephin/fix_extends_from_second_file 
extends must be copied from override file
 2015-10-20 10:22:58 +01:00
Daniel Nephin
3725c3ab7e Merge pull request #2225 from mnowster/2221-blank-env-vars 
2221 allow empty environment keys
 2015-10-19 14:06:31 -04:00
Daniel Nephin
938d49cbdc Fixes #2205 - extends must be copied from override file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 13:41:58 -04:00
Daniel Nephin
937e087c6c Fixes #2203 - properly validate files when multiple files are used. 
Remove the single-use decorators so the functionality can be used directly as a function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 12:39:45 -04:00
Mazz Mosley
08add665e9 Environment keys can contain empty values 
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-19 16:32:12 +01:00
Mazz Mosley
ff83c459d0 Improve error message for type constraints 
It was missing a space between the different types, when there
were 3 possible type values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-19 14:36:56 +01:00
Viranch Mehta
258c8bc54d Fix specifies_host_port() to handle port binding with host IP but no host port 
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
 2015-10-18 00:40:51 +05:30
Daniel Nephin
26dc0b785b Give the user a better error message (without a stack trace) when there is a yaml error. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 15:05:06 -04:00
Cameron Eagans
53fc6d06f6 docker-compose pull SERVICE should not pull SERVICE's dependencies 
Signed-off-by: Cameron Eagans <me@cweagans.net>
 2015-10-15 17:33:32 -06:00
Daniel Nephin
0409b287ad Merge pull request #2191 from dnephin/networking 
Networking
 2015-10-14 12:31:26 -04:00
mnowster
6b68a84b9b Merge pull request #2019 from mrfuxi/less-verbose-extends 
Allow to extend service using shorthand notation. Closes #1989
 2015-10-14 17:13:09 +01:00