Evan Hazlett
dbd311943e
Merge pull request #803 from ehazlett/fix-rm-cmd-description
...
corrects the rm command line description
2015-03-18 11:33:12 -04:00
Evan Hazlett
217f144d25
corrects the rm command line description
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-18 11:20:38 -04:00
Evan Hazlett
a9fce41071
Merge pull request #802 from ehazlett/revert-772
...
revert "function GetActive should return real error when file doesn't ex...
2015-03-18 11:07:50 -04:00
Evan Hazlett
391e97b9b4
revert "function GetActive should return real error when file doesn't exist"
...
This reverts commit 036b6b07b2 .
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-03-18 11:05:06 -04:00
Dave Henderson
3c57799534
Fixing config and env bad handling of paths with spaces
...
Fixes #781
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-03-18 11:04:47 -04:00
Ben Firshman
ae9c965823
Merge pull request #1128 from aanand/jenkins-dco
...
Validate DCO in script/test-versions
2015-03-18 14:49:40 +00:00
Evan Hazlett
bc9b390bde
Merge pull request #799 from ahmetalpbalkan/naturalsort
...
Natural sorting in machine ls command
2015-03-18 10:41:32 -04:00
Andy Goldstein
c680dd9e5a
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
2015-03-18 10:41:01 -04:00
Evan Hazlett
1c454fd800
Merge pull request #772 from TrumanLing/get_active_machine_failure_improvment
...
function GetActive should return real error when file doesn't exist
2015-03-18 10:18:15 -04:00
Doug Davis
9732c254ad
Merge pull request #11314 from HammerOfThor/pull_err_print
...
print detailed error info for docker pull
2015-03-18 08:08:01 -04:00
Christian Simon
4307ec283b
[WiP] Adds testing for bridge's IPv6 support
...
* fixes #10001
* test for global subnets <= 80
* test for global subnets > 80
* test link local allocations
* test duplicated addresses
* test regression from bug #11427
Signed-off-by: Christian Simon <simon@swine.de >
2015-03-18 08:51:14 +01:00
Ahmet Alp Balkan
c4b83b4935
Add natural sorting by host name to ls cmd
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-17 23:32:27 -07:00
Ahmet Alp Balkan
f2918929b0
Vendor 'github.com/skarademir/naturalsort'
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-17 23:32:26 -07:00
Tianon Gravi
b5763f8fa7
Fail explicitly if curl is missing in contrib/download-frozen-image.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-03-17 23:10:02 -06:00
Tianon Gravi
ae61593417
Fix several very minor consistency issues
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-03-17 23:01:40 -06:00
Olivier Gambier
53e1b27a76
Merge pull request #268 from docker/stevvooe-patch-2
...
Update Sprint label link from Ready
2015-03-17 21:29:12 -07:00
Stephen Day
7e7b6109dc
Merge pull request #236 from endophage/config
...
Adding docs for full suite of configuration options
2015-03-17 21:12:19 -07:00
Zhang Wei
efa65d16b6
print detailed error info for docker pull
...
When docker push get response with unknown HTTP status, docker daemon
print:
"Error: Status XXX trying to push repository XXX: XXX"
But when docker pull meets response with unknown status code, it gives:
"HTTP code: XXX"
This commit helps docker pull print more detailed error info like push
does, so push and pull can behave consistently when error happens.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-03-18 11:35:44 +08:00
Alexander Morozov
cf071bb962
Merge pull request #11450 from crosbymichael/rlimitfix
...
Don't hardcode default rlimit
2015-03-17 20:27:05 -07:00
Qiang Huang
55cc166e53
do not warning when we disable memoryswap
...
$ docker run -ti --rm -m 300M --memory-swap=-1 ubuntu:14.04
WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.
root@813aafc019d5:/#
When we disable memoryswap, it should not warning swap limit not support.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-03-18 10:08:17 +08:00
Jessie Frazelle
a5269223a7
Merge pull request #11320 from estesp/fix-daemon-startup
...
Fix daemon shutdown on error after rework of daemon startup
2015-03-17 19:04:25 -07:00
Stephen Day
1f229923d3
Update Sprint label link from Ready
2015-03-17 18:56:56 -07:00
Daniel Nephin
d7a90092c2
Merge pull request #1118 from funkyfuture/issue-1082
...
Change port in ports-composefile to 49152
2015-03-17 21:39:34 -04:00
Aanand Prasad
85fb8956f3
Validate DCO in script/test-versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-03-17 18:02:22 -07:00
Victor Vieux
af05bfd0ba
fix test
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Victor Vieux
bc17fbd6f7
better error
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Victor Vieux
6044354ea2
update Godeps
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Victor Vieux
c969fcdae6
use dockerclient
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Victor Vieux
b4a88ad622
Add match in images.go
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Victor Vieux
649b6cf577
add docker rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 17:41:46 -07:00
Doug Davis
88dc6cc2df
Hide dots on daemon startup when loglevel != info
...
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-17 17:27:53 -07:00
Victor Vieux
8c09bba1de
mitigate race in pull while we wait for a proper store
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-03-17 23:29:42 +00:00
Victor Vieux
3dfa0816c5
Merge pull request #480 from vieux/pull_only_tag
...
pull only latest if no tag
2015-03-17 16:27:47 -07:00
Victor Vieux
b9e600d38d
pull only latest if no tag
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-03-17 16:19:35 -07:00
Michael Crosby
f5a154f2d2
Don't hardcode default rlimit
...
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-17 16:04:15 -07:00
Jessie Frazelle
ef78cc0191
Merge pull request #11237 from thaJeztah/docs-remove-temporary-styles
...
cleanup: docs: remove temporary inline styles
2015-03-17 15:09:17 -07:00
Jessie Frazelle
8e6d0107df
Merge pull request #11431 from jfrazelle/update-docs-image-on-make
...
Update docs/base in makefile docs-build.
2015-03-17 14:49:24 -07:00
Sebastiaan van Stijn
4e6a01023b
cleanup: docs: remove temporary inline styles
...
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868 ).
This removes those temporary `<style>` tags.
depends on #11230 (https://github.com/docker/docker/issues/11230 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-03-17 22:48:28 +01:00
Fabian Ruff
ca4fe2a2cb
Disable HTTP Keepalives for b2d iso download
...
Signed-off-by: Fabian Ruff <fabian@progra.de >
2015-03-17 22:31:00 +01:00
Fabian Ruff
ac51f9abbd
respect proxy settings for b2d downloads
...
Signed-off-by: Fabian Ruff <fabian@progra.de >
2015-03-17 22:21:20 +01:00
Jeffrey Morgan
4a5162ba23
Merge branch 'master' into hub-button
2015-03-17 13:31:57 -07:00
Phil Estes
f42acd070a
Merge pull request #11448 from vishh/port_log
...
Reduce logging level for "ip_local_port_range" proc file in not accessible.
2015-03-17 14:52:23 -04:00
Phil Estes
459e58ffc9
Fix daemon shutdown on error after rework of daemon startup
...
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init. A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-03-17 14:15:00 -04:00
James Turnbull
c1639a7e4e
Merge pull request #11355 from moxiegirl/11023-ubuntu-install
...
Updating Ubuntu installation to use wget; eliminating elo
2015-03-17 14:11:27 -04:00
Evan Hazlett
344c7d771a
Merge pull request #770 from ehazlett/x509-check-ip-san
...
certs: x509 check ip san
2015-03-17 14:04:58 -04:00
Derek McGowan
514be385f7
Support push and pull of sha256
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-17 10:50:35 -07:00
Derek McGowan
75e29f4550
Vendor distribution/digest
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-17 10:47:45 -07:00
Phil Estes
e35c78a495
Merge pull request #11298 from brahmaroutu/gccgo_script
...
Initial gccgo build script, requires host to contain gccgo 5.0
2015-03-17 13:45:47 -04:00
Vishnu Kannan
39d49ba7ba
Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2015-03-17 17:39:17 +00:00
Jessie Frazelle
c858cbffe0
Merge pull request #11444 from albers/bash-completion
...
Updates to bash completion
2015-03-17 10:25:46 -07:00