toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn 29c84a9273 Merge pull request #19563 from Microsoft/10662-TestBuildCI1 
First batch of Windows-Windows TestBuild CI enabling
Upstream-commit: 7d13f2fb7d50e2cf93022a692fe93a59ee65e866
Component: engine
 2016-01-28 17:13:45 -08:00
Sebastiaan van Stijn bcbfddb2b6 Merge pull request #19788 from cyli/vendor-notary 
Include a new version of notary with less verbose INFO+ logging
Upstream-commit: e5b1f29ac311d98b9f92b0211be2477d040e49e0
Component: engine
 2016-01-27 14:35:32 -08:00
Sebastiaan van Stijn c193203fff Merge pull request #19741 from jfrazelle/better-apparmor-docs 
way better apparmor docs
Upstream-commit: c1191eb0e83629a6623ee6119ddb7097538f3fc3
Component: engine
 2016-01-27 14:22:54 -08:00
Sebastiaan van Stijn c7ce8d9c8c Merge pull request #19748 from tkopczynski/18884-daemon-not-running-faq 
FAQ: add docker daemon unavailable note
Upstream-commit: b9c8fc5ac9938ed9ff55708f6ea8723e70c2b24e
Component: engine
 2016-01-27 13:10:41 -08:00
Sebastiaan van Stijn d35ce892f0 Merge pull request #19759 from thaJeztah/docs-for-19688 
Fix docs for tmpfs (pr 19688)
Upstream-commit: ab8da94531ba77feee1931923be812354fbd2b2c
Component: engine
 2016-01-27 00:05:38 -08:00
Sebastiaan van Stijn 3bba97b9dd Fix docs for tmpfs (pr 19688) 
Underlying files are no longer copied to the tmpfs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
 2016-01-26 23:52:14 -08:00
Sebastiaan van Stijn 253f58ccf7 Merge pull request #19754 from jfrazelle/revised-release-docs 
updates to release checklist
Upstream-commit: 857093fbcaf8929e24bc42689c3fe337d2c34dcf
Component: engine
 2016-01-26 23:32:18 -08:00
Sebastiaan van Stijn f8277f71b6 Merge pull request #19753 from jfrazelle/repo-docs 
add docs for package repo maintenance
Upstream-commit: 872b927c765943be7237b4b6c9c2d6e6850045eb
Component: engine
 2016-01-26 23:30:21 -08:00
Sebastiaan van Stijn f913d7db9f Merge pull request #19612 from Microsoft/jjh/apicontainerstest 
Windows CI: Fixup docker_api_containers_test.go
Upstream-commit: 3cf4884787b6543dd325cd9f66be7338f2b9997e
Component: engine
 2016-01-26 19:14:43 -08:00
Sebastiaan van Stijn c43fa88487 Merge pull request #19621 from moxiegirl/new-navigation 
New navigation for 1.10
Upstream-commit: eb729a0cb0be1f2d2ba5c616fcd4e585289f6dfc
Component: engine
 2016-01-26 16:06:29 -08:00
Sebastiaan van Stijn aee6396d2e Merge pull request #19743 from aaronlehmann/http-idle-timeouts 
Set idle timeouts for HTTP reads and writes in communications with a registry
Upstream-commit: e23ea05e113ea5069f8bea3e75046b9429ca2e75
Component: engine
 2016-01-26 15:39:52 -08:00
Sebastiaan van Stijn 272aadc7e6 Merge pull request #19150 from mikedougherty/cs-108-rpm-release 
[CS-108] Adjust version string processing for RPM build
Upstream-commit: 4bcb6c7fc8758ad390a634a270cda66a8c98c9f3
Component: engine
 2016-01-26 15:22:14 -08:00
Sebastiaan van Stijn 6e22d2e841 Merge pull request #19745 from cpuguy83/19625_docs_for_mount_prop_with_systemd 
Add note about mount propagation on systemd
Upstream-commit: d648a100c9e84ce6ac3b77b2d65a5ed8a712bd29
Component: engine
 2016-01-26 13:51:22 -08:00
Sebastiaan van Stijn 81922b0d60 Update notary to 1.10-3 in all Dockerfiles 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589c8a879fea758007a36bd0f00d07aa1000d0cb
Component: engine
 2016-01-26 11:51:22 -08:00
Sebastiaan van Stijn 531573357d Merge pull request #19683 from calavera/network_config_file 
Allow network configuration via daemon config file.
Upstream-commit: 5b0183e91c173c06bcbb5d53da03f13519c14c87
Component: engine
 2016-01-25 18:59:20 -08:00
Sebastiaan van Stijn c43bc4b09f Merge pull request #19680 from mavenugo/rc2-vin 
Vendor libnetwork v0.6.0-rc3
Upstream-commit: 8d096114f2d30afb1c007da3fb99a04d65f5dbcd
Component: engine
 2016-01-25 16:07:56 -08:00
Sebastiaan van Stijn 2c020b81f9 Merge pull request #19074 from arun-gupta/couchbase 
adding docs for Dockerizing Couchbase service
Upstream-commit: 2b97c9674258e0dc0b36526176b2f2cea85b40fe
Component: engine
 2016-01-25 15:46:56 -08:00
Sebastiaan van Stijn e8b8068b46 Merge pull request #19682 from aaronlehmann/transfer-release-race 
Fix watching a released transfer
Upstream-commit: 31adcc96d0d2fd796d3ec204f0dd827f3e63d64a
Component: engine
 2016-01-25 15:37:47 -08:00
Sebastiaan van Stijn e27cdfa32d Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf 
Update registry version in Dockerfile.armhf
Upstream-commit: 156e2f0e5c2190a31caef9d91116ee1008ee27e3
Component: engine
 2016-01-25 14:14:00 -08:00
Sebastiaan van Stijn f507b64609 Merge pull request #19657 from sdurrheimer/zsh-completion-new-syslog-over-tls-options 
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cer…
Upstream-commit: 5719dca1d7a4aab0abbb8bd7a4d6e09c65c678ea
Component: engine
 2016-01-25 01:21:57 -08:00
Sebastiaan van Stijn 2cf722e190 Merge pull request #19656 from sdurrheimer/zsh-completion-daemon-cluster-store-opt 
Add zsh completion for new 'docker daemon --cluster-store-opt discove…
Upstream-commit: 9609cb73447d3a35b689e5dea04ef40b89ba4115
Component: engine
 2016-01-25 01:21:23 -08:00
Sebastiaan van Stijn 93f57e97b4 Fix remove API order in menu 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 42f6e8d40d059c8d53adaada24b400761f42ec5b
Component: engine
 2016-01-24 02:48:47 -08:00
Sebastiaan van Stijn c418f65372 Merge pull request #19622 from r4j4h/quick-doc-fix 
Correcting `overlay` -> `bridge` driver in run.md
Upstream-commit: 037d159981c8f8d79f8f445df502527e635d525c
Component: engine
 2016-01-24 00:42:36 -08:00
Sebastiaan van Stijn 5c1f1fe462 Merge pull request #19610 from companycy/patch-1 
docs: image layers' path in aufs-driver.md
Upstream-commit: a1c6642c4547fb3cbdd41b8ada1a8eb8d0f22afc
Component: engine
 2016-01-23 23:37:03 -08:00
Sebastiaan van Stijn 7f768a5d6e Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose 
Windows CI: Fix TestRunExitOnStdinClose flakiness
Upstream-commit: 717ced8dd7aa769de1c19ee982a10394e95eb0e1
Component: engine
 2016-01-23 18:53:28 -08:00
Sebastiaan van Stijn a12671092e Merge pull request #19592 from duglin/Issue15777 
Add some helper text for magical ADD
Upstream-commit: bf85a49509ef67eb68a2251928385a221a85254e
Component: engine
 2016-01-22 18:27:44 -08:00
Sebastiaan van Stijn a0bfe06203 Merge pull request #19598 from tianon/pkg-config 
Add pkg-config to our Debian build environment
Upstream-commit: b3af1d52427384db5a841678d29935654c904f5f
Component: engine
 2016-01-22 17:33:43 -08:00
Sebastiaan van Stijn a793a1a33c Merge pull request #19596 from Djelibeybi/fix-oracle-install-docs 
Updated Oracle Linux install documentation
Upstream-commit: 2d30720c1e2fedca5534e0cc5b0763162f740501
Component: engine
 2016-01-22 17:27:42 -08:00
Sebastiaan van Stijn 3545ab39d6 Merge pull request #19511 from moxiegirl/19473-fix-certificate 
Fixing missing certs article; consolidating security material
Upstream-commit: bf28c219c5d3e43bff5e55da455bffceea865405
Component: engine
 2016-01-22 17:20:36 -08:00
Sebastiaan van Stijn dd594705a0 Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer 
Hotfix vendor libcontainer
Upstream-commit: 6d1455e74b388faeae0f90379b8aa908afed0bf7
Component: engine
 2016-01-22 16:46:04 -08:00
Sebastiaan van Stijn 84f68b3062 Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation 
Carry 19305: Added `dead` to docs for docker ps -f status=...
Upstream-commit: 45db4fa70eb3d33230e38457fd98b1f5403e70d6
Component: engine
 2016-01-21 13:46:51 -08:00
Sebastiaan van Stijn 8e2b976298 Merge pull request #19434 from HackToday/fixmntvolume 
Refine the volume mount example
Upstream-commit: 7db58948bf256ae7daf372eed6b996688e4aae40
Component: engine
 2016-01-20 20:42:24 -08:00
Sebastiaan van Stijn 9a21c2f764 Merge pull request #19530 from HackToday/fixtiny 
Fix the typo in ps
Upstream-commit: 13dbf52611899060878764427314628296316c3d
Component: engine
 2016-01-20 20:41:35 -08:00
Sebastiaan van Stijn 496ec096f7 Merge pull request #19452 from mortonfox/patch-1 
cgroups documentation moved
Upstream-commit: ad87333f7968fe8c219288ac8bcb2e0f61c618cb
Component: engine
 2016-01-20 14:54:24 -08:00
Sebastiaan van Stijn f4fc2afe32 Merge pull request #19487 from HackToday/fixcommitcli 
Fix commit wrong repository example
Upstream-commit: 048234fcdbc4f3af7e81048bbd2367940f3718ac
Component: engine
 2016-01-20 14:45:59 -08:00
Sebastiaan van Stijn 52842fc3ba Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles 
Remove validate-vendor from default bundles
Upstream-commit: c21eb2a4209f6339fe59e4a97c3e6479aeb39f94
Component: engine
 2016-01-20 14:29:07 -08:00
Sebastiaan van Stijn ae923d4789 Merge pull request #19486 from sdurrheimer/zsh-completion-network-links 
Zsh completion for '--alias --net-alias --ip --ip6 --link'
Upstream-commit: b433e1e7fb84608147825e5669146fd58dbbd07b
Component: engine
 2016-01-20 09:28:04 -08:00
Sebastiaan van Stijn 6035ebdc94 Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt 
Add zsh completion for 'docker network create --ipam-opt'
Upstream-commit: d45643a8650f4c718c61fbf7ecebc8aabeb9d4d1
Component: engine
 2016-01-20 00:30:30 -08:00
Sebastiaan van Stijn bea0f479a8 Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout 
Fix DockerTrustSuite SetUpTest
Upstream-commit: cd1ed858d38af2dede529d9fade88069439fdade
Component: engine
 2016-01-19 21:58:24 -08:00
Sebastiaan van Stijn dd61cb6f47 Fix DockerTrustSuite SetUpTest 
This hopefully makes DockerTrustSuite.SetUpTest
less flaky.

Increased the number of attempts to check
if Notary is available before giving up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 910a5fc2348b934dcb126c021721305d5316c7c0
Component: engine
 2016-01-19 16:45:47 -08:00
Sebastiaan van Stijn 617e630788 Merge pull request #19458 from dmcgowan/layerstore-error-handling 
Add more robust error handling on layer store creation
Upstream-commit: e11a7f53719cade69ef8553a71d2d6f025acde98
Component: engine
 2016-01-19 14:37:23 -08:00
Sebastiaan van Stijn b4e2edd4ca Merge pull request #19385 from runcom/better-git-error 
api: client: build: do not fall through if git isn't installed
Upstream-commit: 4b63689679089f7bb2286e7c330d6a7884c0aec3
Component: engine
 2016-01-19 11:39:05 -08:00
Sebastiaan van Stijn 8586a19d86 Merge pull request #19433 from HackToday/fixclidoc 
Fix the privileged example
Upstream-commit: 0f04f3ba9fa81ff10424a7ef93718f8ea1dc7262
Component: engine
 2016-01-19 00:37:30 -08:00
Sebastiaan van Stijn 5afee20d48 Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver 
Fixing TestInspectApiContainerVolumeDriver
Upstream-commit: f1c6cd57fab751464c174a84b41b511cb400ee55
Component: engine
 2016-01-16 01:04:32 -08:00
Sebastiaan van Stijn d7b38ae326 Merge pull request #19379 from thaJeztah/update-windows-dockerfile 
Switch Windows Dockerfile to golang 1.5.3
Upstream-commit: 785493226b50ee844f7026f2f846ebf94ed5a9dc
Component: engine
 2016-01-16 01:00:19 -08:00
Sebastiaan van Stijn 3d210ea531 Merge pull request #19382 from Collinux/master 
Fixed typo in experimental/plugins_graphdriver.md
Upstream-commit: d232ed4cea83a9f908b37012eea8627610a3d1ef
Component: engine
 2016-01-15 18:51:29 -08:00
Sebastiaan van Stijn 63fd2cf9aa Switch Windows Dockerfile to golang 1.5.3 
Also renamed the env-variable to match what
we use in other locations (for easier finding)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e281f640c69a11d7c211e167691cbc563ecdeac7
Component: engine
 2016-01-15 15:52:53 -08:00
Sebastiaan van Stijn b63f564a27 Merge pull request #19353 from calavera/coolljt0725_is_a_maintainer 
Add Lei Jitang to MAINTAINERS.
Upstream-commit: c56ed85f3d79054391fa7a485ad476571569aa97
Component: engine
 2016-01-14 19:37:33 -08:00
Sebastiaan van Stijn b7e519041b Merge pull request #19122 from ajneu/master 
documentation: debian/ubuntu need apt-transport-https ca-certificates
Upstream-commit: 954613fb248ee31ed1a919f72153eb43268f2c30
Component: engine
 2016-01-14 16:53:08 -08:00
Sebastiaan van Stijn 25aab1428e Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
 2016-01-14 16:44:58 -08:00
Sebastiaan van Stijn 95dbab54f7 Merge pull request #18452 from moxiegirl/carrry-doc-17989 
Update security docs for seccomp/apparmor
Upstream-commit: 9539c0a4022857f7d317894e24a0694f4b62bbaf
Component: engine
 2016-01-14 14:42:37 -08:00
Sebastiaan van Stijn 90c0fba48e Merge pull request #19322 from HackToday/fixlxc 
Remove wrong lxc support
Upstream-commit: d62466bd33d4abdbe43640aec9ed931a6d3ed630
Component: engine
 2016-01-13 23:45:43 -08:00
Sebastiaan van Stijn 3587269c45 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable 
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 661d75f39858934c230c59a68d908ef203c34136
Component: engine
 2016-01-13 13:22:08 -08:00
Sebastiaan van Stijn b2c9225704 Merge pull request #19229 from mavenugo/udlinks 
Local alias support
Upstream-commit: 47d87d3b92e349608e080f15035d8485af7254c5
Component: engine
 2016-01-12 16:47:32 -08:00
Sebastiaan van Stijn 41680fdf37 Merge pull request #19104 from vdemeester/18957-update-config 
Add a specific config struct for the update command (#18957)
Upstream-commit: 1393c450cd8b4b7143a069ac062fd2adc6e02ca0
Component: engine
 2016-01-12 09:46:19 -08:00
Sebastiaan van Stijn 4a64d99bbc Merge pull request #19187 from estesp/lets-do-this 
User namespaces: graduate from experimental
Upstream-commit: c72be040bb893e49bb12baf7e688c88b635d8ea1
Component: engine
 2016-01-12 09:34:19 -08:00
Sebastiaan van Stijn e2b2a71502 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
 2016-01-12 07:06:31 -08:00
Sebastiaan van Stijn 3340505b84 Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port 
Fix ambassador script
Upstream-commit: 3f1b16e236ad4626e02f3da4643023454d7dbb3f
Component: engine
 2016-01-11 17:41:53 -08:00
Sebastiaan van Stijn e46c089f56 Merge pull request #18998 from calavera/syslog_tls 
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
 2016-01-11 17:21:38 -08:00
Sebastiaan van Stijn 3a03e124c2 Merge pull request #19222 from justincormack/shirley 
Add Dame Stephanie "Steve" Shirley to names
Upstream-commit: 3f74d10142051abc231093cc05b76b08ae30f597
Component: engine
 2016-01-11 00:09:45 +01:00
Sebastiaan van Stijn ddd50b3705 Merge pull request #18512 from euank/18510-fixOomKilled 
Set OOMKilled state on any OOM event
Upstream-commit: 967acd56c175b7c0f3ad4236c664730338a94bb8
Component: engine
 2016-01-11 00:09:26 +01:00
Sebastiaan van Stijn 7e1d4c2453 Merge pull request #19195 from Microsoft/jjh/wincifailingtests 
Windows CI: Deal with failing tests for TP4
Upstream-commit: 38f4217bfff1e5aec7457c2acfbe2409759ee830
Component: engine
 2016-01-10 21:18:02 +01:00
Sebastiaan van Stijn 7eedab5098 Merge pull request #18736 from WeiZhang555/tiny-lock 
Break big lock into some tiny locks for containerStart
Upstream-commit: a082f8083212a50b5a3e40e2d2507b78e0a8e6a8
Component: engine
 2016-01-09 00:35:26 +01:00
Sebastiaan van Stijn 67b669c5ee Merge pull request #19160 from thaJeztah/carry-19020-groupadd-docs 
(carry 19020) add documentation for groupadd for remote api
Upstream-commit: 6aefa898cb4733888b4b3ffe126ab1ddb9b337fc
Component: engine
 2016-01-07 12:41:08 +01:00
Sebastiaan van Stijn 25ac09e895 Merge pull request #19090 from thaJeztah/fix-api-markdown 
fix markdown and typos in API docs
Upstream-commit: 3442339b98dccc7137ea8d49393eff44166a67ec
Component: engine
 2016-01-07 08:32:01 +01:00
Sebastiaan van Stijn b6c1a9dfa1 Update antonio's e-mail address 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bdce7dd5c87e76f41a0d8c129645c84d0779f5c0
Component: engine
 2016-01-06 22:18:47 +01:00
Sebastiaan van Stijn 0cad98a56c Add -f flag to cURL install instructions 
From the -f description:

(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
 2016-01-06 16:05:16 +01:00
Sebastiaan van Stijn 1dce35922d Merge pull request #19056 from clintonskitson/docs-rexray_update 
Updated docs for consolidated list of REX-Ray providers
Upstream-commit: 7a15586f4fb4d5482b35fc00d1506ea8b36d2b10
Component: engine
 2016-01-05 23:53:27 +01:00
Sebastiaan van Stijn 3906315c1f Merge pull request #19077 from AvdN/patch-2 
example cannot work, pip needs --requirement
Upstream-commit: d9a38126562906381ac6829c4b49d1054e615dc6
Component: engine
 2016-01-05 23:50:52 +01:00
Sebastiaan van Stijn d708725a46 Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop 
Windows CI: No integration daemon stop
Upstream-commit: 2b489450d7abc56301e48f11bc6dabb878d7e585
Component: engine
 2016-01-05 20:52:51 +01:00
Sebastiaan van Stijn 40a92806fd fix markdown and typos in API docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 72472f5639fc92f3fd554e4eb860b0cb6938f7c2
Component: engine
 2016-01-05 16:33:32 +01:00
Sebastiaan van Stijn c69ee1ec9e Merge pull request #18737 from sdurrheimer/zsh-completion-daemon-cgroup-parent 
Add zsh completion for 'docker daemon --cgroup-parent'
Upstream-commit: 0439e03a2720987785f98496867c20fd71b9fa44
Component: engine
 2016-01-05 13:12:02 +01:00
Sebastiaan van Stijn 609d075f70 Merge pull request #19075 from HackToday/fixvoldoc 
Fix the unnecessary parameter
Upstream-commit: 4a4131ac1b5ca28a06802d4e904bc99afa721d1f
Component: engine
 2016-01-05 11:51:33 +01:00
Sebastiaan van Stijn 23281e4aa3 Merge pull request #19064 from RichardScothern/registry-flag 
Show the legacy registry flag only in the daemon arguments
Upstream-commit: 14a7048df9234608f36b47183fae00ecb46b7e1f
Component: engine
 2016-01-05 11:48:01 +01:00
Sebastiaan van Stijn 658f3a4fa1 Merge pull request #19079 from wenchma/typo_error 
Fix a typo error
Upstream-commit: cd9c641b1d00e10bddec14ad7f88e2476e55f3c1
Component: engine
 2016-01-05 11:06:30 +01:00
Sebastiaan van Stijn fc0ab04968 docs: add note to volume-plugins 
The /var/lib/docker directory is reserved for
docker, and should not be touched by plugins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb893cf6568f2b0cdf500bc3ecfb231fd374ffac
Component: engine
 2016-01-04 18:28:14 +01:00
Sebastiaan van Stijn 7489ecd35e Fix pid=host example in documentation 
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.

This updates the example to use htop (strace is
not working without disabling apparmor for the container)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9b6592ca858a23376b838e9808d7fa3f15ebc381
Component: engine
 2016-01-04 16:25:54 +01:00
Sebastiaan van Stijn d68e62b901 docs: update configuring docker for systemd 
Ubuntu 15.04 and above uses systemd. Add a note
in the docs to point users to the right instructions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 59301e018ce7933c86c9874c209802acdb170d69
Component: engine
 2016-01-04 15:26:55 +01:00
Sebastiaan van Stijn 1162375d21 Merge pull request #15666 from vdemeester/3519-configurable-escape 
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
 2016-01-04 00:49:07 +01:00
Sebastiaan van Stijn 90d9d53d0f Merge pull request #19037 from moxiegirl/15666-file-carry 
Creating a man page for the configuration file
Upstream-commit: 2916ceb31376cc7ed92f87d7ff413b0dad82b984
Component: engine
 2016-01-03 22:50:32 +01:00
Sebastiaan van Stijn c32d38aa18 Merge pull request #18387 from wenchma/18385-improve_help_msg 
Improvement for docker subcommand's help messages
Upstream-commit: 9d6c2196b54a20cef3ede074d521ccb6bdabbe63
Component: engine
 2016-01-03 12:19:53 +01:00
Sebastiaan van Stijn b09d7888d3 Merge pull request #18891 from HackToday/18872-fix-volume-cmd 
Fix the restore data example
Upstream-commit: dcbd5e04b79cab9e53f9700a07939f21a3268e6b
Component: engine
 2016-01-02 00:43:46 +01:00
Sebastiaan van Stijn 0fe68c786a Merge pull request #19015 from timwangdev/patch-1 
🎉 Happy New Year!  🎉
Upstream-commit: d88e92d839c91156676d58d3818d7c72a3c692c3
Component: engine
 2015-12-31 14:26:10 +01:00
Sebastiaan van Stijn 301494dba6 Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2 
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
 2015-12-30 21:01:48 +01:00
Sebastiaan van Stijn 2821f3dd6b Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses 
fix incorrect ip addresses in networkingcontainers
Upstream-commit: 3b605b5926cff095452f2c2dca374bd132e23fac
Component: engine
 2015-12-30 17:49:08 +01:00
Sebastiaan van Stijn 149b5814a0 Merge pull request #18984 from coolljt0725/fix_daemon_start 
Fix daemon failed to start with error "layer does not exist"
Upstream-commit: 9860effc4e4a303aa12bdc8b0738003ddac1b121
Component: engine
 2015-12-30 16:52:41 +01:00
Sebastiaan van Stijn 27b1292ae2 add new impact/distribution label 
Adds the new label to the documentation. The
impact/distribution label is intended for changes
that affect the image-format or interaction
with the registry (distribution).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ac0180620d906c39486963460415502f7abbd16f
Component: engine
 2015-12-30 13:53:46 +01:00
Sebastiaan van Stijn 69fc58a8aa Merge pull request #18925 from thaJeztah/please-dont-plus-one 
Be more explicit about "+1" comments
Upstream-commit: 024eead82f4739d028052b8138c3505d9e157a34
Component: engine
 2015-12-30 11:41:32 +01:00
Sebastiaan van Stijn 0206b55252 Merge pull request #18978 from tswift242/fix-daemon-storage-doc-typo 
Fix typo in daemon storage-driver docs
Upstream-commit: 1614a8652034b4a52b8260187094a09296b7e879
Component: engine
 2015-12-29 23:33:05 +01:00
Sebastiaan van Stijn a60a5fd425 Merge pull request #18945 from jbruni/patch-2 
Fixed /etc/defaults/docker to /etc/default/docker
Upstream-commit: a3ca176e3c23907225f2e34a3b4a565b6f7bf31a
Component: engine
 2015-12-29 00:05:45 +01:00
Sebastiaan van Stijn 383605ec04 Merge pull request #18899 from cpswan/18898-fix-storage-driver-example 
Fix --storage-driver example
Upstream-commit: 8c6ad0991e313805ea2c67275086f2c9130cceda
Component: engine
 2015-12-28 21:58:43 +01:00
Sebastiaan van Stijn 78e703beaa Move Vishnu to alumni 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5facd0e94be0bce668a4d335b1b6bb284934df94
Component: engine
 2015-12-28 16:30:05 +01:00
Sebastiaan van Stijn cab7e6492d Be more explicit about "+1" comments 
Add some more information about not leaving random
"+1" comments.

Also removed the requirements to send "uname -a",
because that information is now included in the output
of "docker version".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 849f64eeab5c026bad3e10bef06097c1bc684bf3
Component: engine
 2015-12-28 00:26:05 +01:00
Sebastiaan van Stijn 451c1a819a Merge pull request #18782 from aditirajagopal/docker-no-like-x86 
Specify that Docker requires x64
Upstream-commit: 087e4c10241d70803bc0b7ae61fa2258879ddccf
Component: engine
 2015-12-27 01:19:38 +01:00
Sebastiaan van Stijn 3dd9453e30 Merge pull request #18775 from mrjana/mh 
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
 2015-12-26 11:42:55 +01:00
Sebastiaan van Stijn 5805d2d5d6 Move Erik to alumni 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fae00ad445cd6071e86d3372a6056d98dcdb9f6c
Component: engine
 2015-12-23 18:01:02 +01:00
Sebastiaan van Stijn 73ee680a1d Merge pull request #18874 from duglin/falseDocs 
remove =false from options that default to false in the docs
Upstream-commit: 8022d1159d472f0a54957d4e8cc2f39a0856f088
Component: engine
 2015-12-23 16:34:44 +01:00
Sebastiaan van Stijn 58f7d0c31d Merge pull request #17782 from WeiZhang555/network-ls-nopre 
Add filter for `network ls` to hide predefined network
Upstream-commit: 4432a8982188f5f3ccad753860b12bf0e516c4e9
Component: engine
 2015-12-23 13:59:17 +01:00
Sebastiaan van Stijn f88ae3fe07 Merge pull request #18860 from dnephin/remove_migrate_if_downlevel 
Remove migrateIfDownlevel and aufs migration from docker pre-0.7
Upstream-commit: 1105caa7f10ae1fa775670256fa7d4ca9d44e4dd
Component: engine
 2015-12-23 00:08:36 +01:00
Sebastiaan van Stijn 6fc9c2e476 Merge pull request #18757 from thaJeztah/patch-release-process 
Document process for patch-releases
Upstream-commit: 45033c0bdee09d63c6f92de6d71028a5b0a152d2
Component: engine
 2015-12-22 23:42:34 +01:00