c7267017e9
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:42 +00:00
f7dd1333b5
Adding documentation for '--cgroup-parent' option.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:15 +00:00
0b1e2b5a55
Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex
...
resource isolation policies on top of what native docker provides.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:15 +00:00
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
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
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
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
42f5c87425
Merge pull request #11328 from jfrazelle/fix-docs-release-script
...
Fix clear cache docs release.
2015-03-18 16:06:27 -07:00
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
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
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
54232084c5
Merge pull request #11472 from LK4D4/logger_mutex
...
Protect jsonfilelog writes with mutex
2015-03-18 17:20:03 -04:00
f4a458e67f
Do not mask /proc/kcore in privileged
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-18 14:17:21 -07:00
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
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
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
bd8661e8fa
Protect jsonfilelog writes with mutex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-18 13:00:53 -07:00
50bf3cbedc
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
2015-03-18 08:46:52 -07:00
c680dd9e5a
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-18 10:41:01 -04:00
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
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
cf071bb962
Merge pull request #11450 from crosbymichael/rlimitfix
...
Don't hardcode default rlimit
2015-03-17 20:27:05 -07:00
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
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
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
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
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
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
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
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
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
75e29f4550
Vendor distribution/digest
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-03-17 10:47:45 -07:00
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
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
c858cbffe0
Merge pull request #11444 from albers/bash-completion
...
Updates to bash completion
2015-03-17 10:25:46 -07:00
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
ed66853697
Merge pull request #11447 from moxiegirl/black-to-back-fixes
...
Fixing it back
2015-03-17 13:09:16 -04:00
241579a34f
Fixing it back
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-17 10:07:09 -07:00
2ab105e9fe
Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882
...
Return of the Ring: Metadata Labels Doc Tweaks
2015-03-17 09:47:36 -07:00
1ff5a91007
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
2015-03-17 09:45:58 -07:00
a751cc53a7
Merge pull request #11118 from shishir-a412ed/restriction_username_length
...
Docker Tag command: Relax the restriction on namespace (username) length from 30 to 255 characters.
2015-03-17 09:41:12 -07:00
04ca2c1f2b
Updates to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-17 17:07:10 +01:00
cb77ad4757
Merge pull request #11369 from coolljt0725/fix_link
...
Fix --link to a container which net mode is container
2015-03-17 08:36:33 -07:00
8685af0b13
Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error
...
fix not show error when using --lxc-conf without lxc driver
2015-03-17 08:35:18 -07:00
aba193499e
Merge pull request #11436 from sunyuan3/m1
...
verify MaximumRetryCount for container restart policy
2015-03-17 08:26:22 -07:00
0c3c645ad7
Merge pull request #11109 from ncdc/pull-by-digest
...
Add support for referring to images by digest
2015-03-17 08:15:45 -07:00
82e2e1a11a
Fix --link to a container which net mode is container mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-17 07:50:12 -07:00
a2b0c9778f
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-17 10:10:42 +00:00
6a313e81cc
fix TestExportContainerWithOutputAndImportImage on windows
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-17 01:01:52 -07:00
5ff122f797
Modified `docker export` to allow an --output flag
...
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added an --output flag to docker export and created tests.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added text to reflect a new output option for the export command.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Whitespace clean up
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added man page documentation for the new --output flag in export
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
2015-03-17 00:20:19 -07:00
Vishnu Kannan
Doug Davis
Brian Goff
moxiegirl
Jeffrey Morgan
Jessie Frazelle
Tibor Vass
Phil Estes
Michael Crosby
Alexander Morozov
Andy Goldstein
Zhang Wei
Alexander Morozov
Sebastiaan van Stijn
Phil Estes
James Turnbull
Derek McGowan
Mary Anthony
Mary Anthony
Arnaud Porterie
Harald Albers
Lei Jitang
Jessica Frazelle
Joseph Kern