6cd9bab35b
Merge pull request #2276 from dnephin/update_networking_docs
...
Update docs about networking for current release
2015-10-29 15:19:02 +00:00
64a2713714
Merge pull request #2264 from mnowster/2259-unicode-error-volume-paths
...
Handle non-ascii volume directories
2015-10-29 14:42:29 +00:00
5dc14f3925
Handle non-ascii chars in volume directories
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-29 12:05:51 +00:00
0b25014020
Merge pull request #2278 from dnephin/disable_flaky_test
...
Disable flaky test against 1.8.3
2015-10-29 12:04:54 +00:00
3a2df57f3d
Merge pull request #2273 from mnowster/cross-ref-docs
...
Add cross references for env/cli
2015-10-29 12:04:10 +00:00
a71d9af522
Disable a test against docker 1.8.3 because it fails due to a bug in docker engine.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 17:54:38 -04:00
0ef3b47f74
Update docs about networking for current release.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 15:17:11 -04:00
66f1c8e6c0
Merge pull request #2272 from dnephin/update_release_docs_and_scripts
...
Another release, another round of fixes to the release scripts
2015-10-28 17:54:48 +00:00
dfaa18ebc5
Merge pull request #2274 from mnowster/docs-key-dependency-clarification
...
Clarify `dockerfile` requires `build` key
2015-10-28 17:45:27 +00:00
e13b8949b0
Add cross references for env/cli
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-28 17:42:30 +00:00
c341860d11
Clarify `dockerfile` requires `build` key
...
Credit to @funkyfuture for the first PR addressing the clarification.
https://github.com/docker/compose/pull/1767
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-28 17:27:38 +00:00
8306405340
On error print daemon logs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 12:40:59 -04:00
bbc76e6034
Convert the README to rst and fix the logo url before packaging it up for pypi.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 12:11:29 -04:00
c4f0f24c57
Fix release script notes about software and typos.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 12:10:30 -04:00
7e48b0b289
Merge pull request #2271 from mnowster/2270-pypi-page-info
...
Include link to github for code & issues
2015-10-28 15:30:07 +00:00
379af594da
Include link to github for code&issues
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-28 14:59:43 +00:00
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
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
30a84f1be6
Move rename functionality into Container
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-27 17:12:18 +00:00
bee063c07d
Fix tests
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-27 17:12:18 +00:00
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
ffa2b08dbb
Merge pull request #2258 from dnephin/dont_link_when_using_networking
...
Fix running one-off containers with --x-networking
2015-10-27 15:32:20 +00:00
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
a4b002a76e
Merge pull request #2257 from mnowster/2226-additional-classifiers
...
Include additional classifiers
2015-10-27 11:12:38 +00:00
fe760a7b62
Include additional classifiers
...
I've included Python 2/3 as they are not parent classifiers but
sibling classifiers. They denote that this project will work with
*some* versions of python and by having them, they'll show up for
people searching for python 2 or 3 projects.
According to the internet :)
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-26 17:08:45 +00:00
f3d49e38c0
Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3
...
Upgrade to pyinstaller 3
2015-10-26 11:54:02 +00:00
0340361f56
Upgrade pyinstaller to 3.0
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-23 13:34:49 -04:00
986036b6f9
Merge pull request #2223 from au-phiware/master
...
Powershell script to run compose in a container.
2015-10-23 18:10:18 +01:00
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
e6f3946c17
Merge pull request #2239 from dnephin/fix_unicode_in_env
...
Fix unicode in environment variables for python2
2015-10-23 11:03:59 +01:00
e2af02b158
Merge pull request #2238 from SvenDowideit/possible-link-fixes
...
Possible link fixes
2015-10-22 16:27:44 -07:00
cf197253cd
Possible link fixes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-23 09:00:08 +10:00
ae47435425
Fix unicode in environment variables for python2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-22 12:12:43 -04:00
6f78271b82
Merge pull request #2236 from dnephin/use_inspect_network
...
Use inspect network to query for an existing network
2015-10-22 13:37:27 +01:00
cf40a38820
Merge pull request #2237 from dnephin/env_ci_storage_graph
...
Make storage driver configurable in CI
2015-10-21 16:29:40 -04:00
f7100b2ef3
Change version check from engine version to api version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 15:40:50 -04:00
1bc3c97f2a
Make storage driver configurable in CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 15:26:44 -04:00
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
c34a9f165d
Merge pull request #2207 from dnephin/make_config_loader_immutable
...
Refactor of ServiceLoader to make it immutable
2015-10-21 17:14:40 +01:00
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
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
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
44e1fc3a32
Merge pull request #2230 from dnephin/lowercase_windows_drive
...
Lowercase windows drive letter
2015-10-21 10:36:46 +01:00
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
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
3f0e083585
Force windows drives to be lowercase.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-20 11:39:06 -04:00
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
3725c3ab7e
Merge pull request #2225 from mnowster/2221-blank-env-vars
...
2221 allow empty environment keys
2015-10-19 14:06:31 -04:00
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
f1f3acd070
Merge pull request #2210 from dnephin/fix_empty_override
...
Properly validate files when multiple files are used
2015-10-19 18:32:48 +01:00
mnowster
Mazz Mosley
Daniel Nephin
Daniel Nephin
moxiegirl
Sven Dowideit