Commit Graph

13868 Commits

Author SHA1 Message Date
J. Nunn a8faba021c Typo/grammar corrections to dockerizing.md
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
2015-03-19 10:51:12 -05:00
Alexander Morozov d338c613bf Merge pull request #11459 from simonswine/10001-ipv6-tests
[WiP] Adds testing for bridge's IPv6 support
2015-03-19 08:37:28 -07:00
Tibor Vass fdf49d758f Merge pull request #11274 from MabinGo/selinux_enable_verify
Add logs when Docker enabled selinux (closes #11197)
2015-03-19 10:34:55 -04:00
Phil Estes 9d5eab1873 Merge pull request #11453 from duglin/HideDaemonDots
Hide dots on daemon startup when loglevel != info
2015-03-19 10:10:18 -04:00
Phil Estes ae1d3d6d68 Merge pull request #11455 from tianon/minor-formatting-consistency
Fix several very minor consistency issues
2015-03-19 09:57:57 -04:00
Phil Estes 27fd77cc3b Merge pull request #11496 from docker/revert-11495-m3
Revert "correct comment errors for netlink_linux.go"
2015-03-19 09:38:25 -04:00
unclejack d173669fdf Revert "correct comment errors for netlink_linux.go"
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-03-19 14:38:00 +02:00
Doug Davis 70092e5ebb Merge pull request #11495 from sunyuan3/m3
correct comment errors for netlink_linux.go
2015-03-19 08:29:54 -04:00
s00318865 c5fdc93f89 correct comment errors for netlink_linux.go
Signed-off-by: s00318865 <sunyuan3@huawei.com>
2015-03-19 20:29:30 +08:00
Michael Crosby c861231a70 Merge pull request #11488 from stevvooe/address-digest-deadlock
Correctly close pipe after error in tarsum verification
2015-03-18 23:00:13 -07:00
James Turnbull 33bec0a7f6 Merge pull request #11028 from jstangroome/patch-1
Correct IP/MAC address generation docs
2015-03-19 01:44:43 -04:00
Stephen J Day 0306a41909 Correctly close pipe after error in tarsum verification
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-03-18 19:07:55 -07:00
Mabin 1bf529a456 Add logs when Docker enabled selinux
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-19 09:46:53 +08:00
Doug Davis 2cde817458 Merge pull request #11410 from cpuguy83/10191_build_resources
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
Brian Goff e6ae89a45a Allow setting resource constrains for build
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-18 20:57:13 -04:00
moxiegirl 068d343ddf Merge pull request #11452 from jeffdm/master
Adding Kitematic link to Mac OS X install instructions in docs
2015-03-18 17:32:48 -07:00
Jeffrey Morgan 3ddf5d7517 Adding Kitematic link to Mac OS X install instructions
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
2015-03-18 16:32:59 -07:00
Jessie Frazelle 42f5c87425 Merge pull request #11328 from jfrazelle/fix-docs-release-script
Fix clear cache docs release.
2015-03-18 16:06:27 -07:00
Tibor Vass 8ec4e69839 Merge pull request #11430 from jfrazelle/export_outputflag
Modified `docker export` to allow an --output flag
2015-03-18 19:04:43 -04:00
Jessie Frazelle 474f58e2e7 Merge pull request #11471 from LK4D4/wait_for_copier
Wait for copier finishing it's work before closing logger
2015-03-18 15:41:12 -07:00
Jessie Frazelle e1a0bff6b8 Merge pull request #11474 from crosbymichael/null-masked-paths
Do not mask /proc/kcore in privileged
2015-03-18 14:43:13 -07:00
Phil Estes 54232084c5 Merge pull request #11472 from LK4D4/logger_mutex
Protect jsonfilelog writes with mutex
2015-03-18 17:20:03 -04:00
Michael Crosby f4a458e67f Do not mask /proc/kcore in privileged
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-18 14:17:21 -07:00
Tibor Vass d0e5f52fbb Merge pull request #11271 from dmcgowan/v2-sha256
Push and pull to v2 registries with sha256 instead of tarsum
2015-03-18 16:53:47 -04:00
Jessie Frazelle 29f809233e Merge pull request #11464 from ncdc/fix-duplicate-dangling-images
Fix duplicate display of dangling images
2015-03-18 13:53:33 -07:00
Alexander Morozov b6a42673ab Wait for copier finishing it's work before closing logger
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-18 13:48:01 -07:00
Alexander Morozov bd8661e8fa Protect jsonfilelog writes with mutex
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-18 13:00:53 -07:00
moxiegirl 50bf3cbedc Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
Clarify behavior of docker cp
2015-03-18 08:46:52 -07: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
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
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
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
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
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
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
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
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
Mary Anthony f60ed98e79 # This is a combination of 2 commits.
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

Signed-off-by: Mary Anthony <mary.anthony@docker.com>

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-17 10:15:46 -07:00
Tibor Vass ed66853697 Merge pull request #11447 from moxiegirl/black-to-back-fixes
Fixing it back
2015-03-17 13:09:16 -04:00