Commit Graph

21804 Commits

Author SHA1 Message Date
673b53a1a4 Sync changes for registry and notary
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: ae7d7db985ea11a5613261e2450cd6fbc3ad108f
Component: engine
2016-01-14 01:46:35 +01:00
b346420514 Merge pull request #19318 from Djelibeybi/fix-selinux-rpm-changelog
Not having a changelog is bad RPM etiquette.
Upstream-commit: 3720fbfb35b2f8173b47c0a381cb0bdf09ae1a20
Component: engine
2016-01-13 16:00:44 -08:00
279593a3ff Merge pull request #19313 from tiborvass/bump-go-1.5.3
Bump Go to version 1.5.3
Upstream-commit: a79307c49037b036d4198812a2de83fe8fe2e450
Component: engine
2016-01-13 15:59:19 -08:00
e4291809ce Not having a changelog is bad RPM etiquette.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 22af8dfb14d7cc9eb91964ed187a074658f57005
Component: engine
2016-01-14 10:34:48 +11:00
e45d68c9fe Add missing documentation for static IP options
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ee14232647085ce2faf7167959728977d36e5503
Component: engine
2016-01-13 14:53:14 -08:00
7afe53c8eb Adds cross-repository blob pushing behavior
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 7289c7218e2101eb94fb90f2cb22e1412d016984
Component: engine
2016-01-13 14:26:30 -08:00
2e1c787d5f Bump Go to version 1.5.3
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
0411e42a0a Don't dump authz request when body is too large
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 93268d845e41be9cb67744c9bf7a82f8409dff04
Component: engine
2016-01-13 17:04:49 -05:00
b056e82903 Don't dump request body to log when too large
Fixes an issue where a client can send a large body but specifiy
application/json as the content-type, and cause Docker to consume lots
of RAM while trying to buffer the body so it can be dumped to the debug
log.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 89af3835d483fe758f301aa8f3b1062a0ab712fb
Component: engine
2016-01-13 17:01:35 -05:00
b6d75433b3 Merge pull request #19311 from estesp/no-oom-warning-when-cant-even
Only warn on OOMKill disable if the feature is actually requested
Upstream-commit: 9c30492e9e5cf8da5771af87d2b0a83a627ff2b4
Component: engine
2016-01-13 13:43:37 -08:00
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
2e91a82de6 Merge pull request #19241 from rhvgoyal/fix-device-id-free
Mark device ID free only if device actually got deleted
Upstream-commit: d6e01e3337a6ed1e941cf01840ee91ce55c55db4
Component: engine
2016-01-13 13:07:39 -08:00
5e9b25b836 Only warn on OOMKill disable if the feature is actually requested
Instead of warning the caller who is disabling OOM killer that the
feature isn't available, only warn if they are trying to **enable** OOM
killer and it can't be done.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 5a707d94d605fdf2a35d5a7033d1971b49745352
Component: engine
2016-01-13 11:53:44 -08:00
3bf5cbf342 Merge pull request #19279 from tiborvass/rename-authz-to-authorization
Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
2016-01-13 14:30:18 -05:00
a7dc252abe Merge pull request #19283 from tonistiigi/fix-permission-build-stdin
Avoid extracting to temp directory on building from tar
Upstream-commit: c8cc4fb8d9a8d0cd155b8d26a3108e7762b623e3
Component: engine
2016-01-13 11:17:37 -08:00
460be1e8dd Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc
Component: engine
2016-01-13 14:15:37 -05:00
3605a0e9af Merge pull request #19273 from calavera/volume-lazy-init
[Carry 18549] Lazy initialize Volume on container Mount object.
Upstream-commit: 184040bdd55c3930123ad4984dd976181b26cae8
Component: engine
2016-01-13 14:15:17 -05:00
3baefd3b5b daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: e47112d3e812b90b240624711e7a5d2d203d6746
Component: engine
2016-01-13 13:57:31 -05:00
37e5d77def update registry and remove notary on ppc64le
ppc64le now installs the second registry used for
f11b6a2ab313a03d051dd6f69d264d0482df72d6

Also, removed notary until the change to go 1.5.1+

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 7465a3149f9f0f5c996e95198c46960a4b92c9c2
Component: engine
2016-01-13 13:55:29 -05:00
82334437e0 Better warning message on OOM kill disable without mem limit
Modify the warning to be more readable/understandable.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 4983e5807eb86a71f88dd83791f7a9f277bc2889
Component: engine
2016-01-13 10:40:49 -08:00
1e6d6c8c64 Merge pull request #19276 from calavera/internal
[Carry 18926] Add network internal mode
Upstream-commit: 0ee64127ae67844918aa961f81e73185c57c21dc
Component: engine
2016-01-13 10:13:21 -08:00
f9405712ff Merge pull request #19254 from aboch/v6b
Account docker0 IPv6 address on daemon start
Upstream-commit: 7ea65da7efe317d9dabc07557c8b2d196d20d815
Component: engine
2016-01-13 09:48:41 -08:00
b2898bb348 Merge pull request #19294 from runcom/fix-check-test
integration-cli: check nil before Close'ing
Upstream-commit: ba15b6f04936b3e38fb5b832e28ceb02277fc2e5
Component: engine
2016-01-13 09:28:54 -08:00
a0c04482f7 refactor aaparser pkg, add unit tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 446f498ebac56d4ed396b6c20252d152926dc30e
Component: engine
2016-01-13 08:43:12 -08:00
7e15010c90 Merge pull request #19287 from tianon/check-config-assoc-array
Update check-config.sh to use "case" instead of an associative array
Upstream-commit: 22f4dad3d7d3e5a79529bfd763bcefd8af94ba52
Component: engine
2016-01-13 08:38:10 -08:00
9c6798de6b Add network interal mode
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b70954e60a15d09756bd6b00a6fadedc64829477
Component: engine
2016-01-13 11:30:36 -05:00
e92314d4dc Remove duplicated lazy volume initialization.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: aab3596397c7b4fceac9061625898b3d2606597d
Component: engine
2016-01-13 11:22:31 -05:00
b85989684a Merge pull request #19293 from albers/completion-connect-all
bash completion for connecting non-running containers to networks
Upstream-commit: e44bde86066606034ca1f7c41a115048fa838c8b
Component: engine
2016-01-13 08:10:38 -08:00
c1149a155a integration-cli: check nil before Close'ing
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 11a95b951435b63accae8765f7ace97c73f133d0
Component: engine
2016-01-13 13:36:45 +01:00
296f98f18e Merge pull request #19267 from mavenugo/vin-ln
Vendor libnetwork v0.5.4
Upstream-commit: 46eb4700391e8462756000d584337a763bc563c6
Component: engine
2016-01-13 07:09:58 -05:00
69c1610f93 Merge pull request #19249 from calavera/carry_17414
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
29bf1857fc bash completion for connecting non-running containers to networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 40f73c7c8e577baa795b799e0390c89cc0488d45
Component: engine
2016-01-13 10:32:23 +01:00
d62b8abe37 Merge pull request #19275 from tonistiigi/delete-image-conflict-bitmask
Use bitmask for conflict checking
Upstream-commit: 40d7ad98a8e9220745a4505b2f6d902c0732f7a5
Component: engine
2016-01-13 10:00:57 +01:00
a96ea519a9 Merge pull request #19281 from hqhq/hq_dont_fail_oomkilldisable
Do not fail if not support OomKillDisable
Upstream-commit: 9232c09cd5b4512ff267b16526797d9def38396a
Component: engine
2016-01-12 21:54:38 -08:00
cc56e418d7 Update check-config.sh to use "case" instead of an associative array
This fixes Bash 3.x compatibility (where associative arrays are not available).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 5c161f4e1a7e25abedefb6d40dfe7f355077773a
Component: engine
2016-01-12 20:57:56 -08:00
5530c5d838 Updating to the new ep.Delete API
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8edbd10349afb4ea78919e0037cf895eb95cb5fb
Component: engine
2016-01-12 20:42:37 -08:00
fb043c8580 Vendor libnetwork v0.5.4
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 537089481fd9f6859d851a76b67a4f80e0e3691e
Component: engine
2016-01-12 20:42:30 -08:00
c28d7c537e Update response content for volume mounts
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 6a04ecf81333d7b26928f0dcbfb416ca788f287c
Component: engine
2016-01-13 03:48:14 +00:00
d461b41f22 Avoid extracting to temp directory on building from tar
Fixes #15785

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 42961a66a5c1575d81c89aa258f6624f48bba94d
Component: engine
2016-01-12 17:43:52 -08:00
eed3a9a5f1 Do not fail if not support OomKillDisable
Fixes: #19278

The issue seems existed since we add support for OomKillDisable,
OomKillDisable support should not be hard request, we just
discard it if not support and move on.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7b616d4743c94f8be3eb59f8c23ed7a19fb2786d
Component: engine
2016-01-13 09:07:40 +08:00
b2c9225704 Merge pull request #19229 from mavenugo/udlinks
Local alias support
Upstream-commit: 47d87d3b92e349608e080f15035d8485af7254c5
Component: engine
2016-01-12 16:47:32 -08:00
430ab95b60 Use bitmask for conflict checking
Rather than using 2 different functions for different
types of conflicts use a bitmask to specify what
conflicts need to be checked. This allows a better way
to make exceptions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 883be4893049aa97cb874d239cf6b06325fc74f2
Component: engine
2016-01-12 16:01:56 -08:00
e1237c9947 Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
Fix rmi by ID untagging image on error
Upstream-commit: 1e1a3c9508f196f17daec3e47298a86949ab66ec
Component: engine
2016-01-12 18:56:25 -05:00
fc7fff6884 Merge pull request #19060 from jfrazelle/daemon-read-seccomp
read seccomp profile locally then pass to daemon
Upstream-commit: 56272c9e9e6816f7515a7a1f58390eccb35780b0
Component: engine
2016-01-12 18:34:59 -05:00
a4e709fac0 Complete documentation about extra container information.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e5edc168a65e038245efbc5353a456302554f4eb
Component: engine
2016-01-12 18:16:58 -05:00
296e59632a Merge pull request #19170 from aaronlehmann/delete-prune-digests
Prune digest references when deleting by tag
Upstream-commit: c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf
Component: engine
2016-01-12 15:15:36 -08:00
ae6533484c Lazy initialize Volume on container Mount object
Currently on daemon start volumes are "created" which involves invoking
a volume driver if needed.  If this process fails the mount is left in a
bad state in which there is no source or Volume set.  This now becomes
an unrecoverable state in which that container can not be started.  The
only way to fix is to restart the daemon and hopefully you don't get
another error on startup.

This change moves "createVolume" to be done at container start.  If the
start fails it leaves it in the state in which you can try another
start.  If the second start can contact the volume driver everything
will recover fine.

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 2aa673aed7cd10497d578a14a9550c75789e0a43
Component: engine
2016-01-12 17:19:59 -05:00
683a1e1423 Merge pull request #19272 from sdurrheimer/zsh-completion-daemon-userns-remap
Add zsh completion for 'docker daemon --userns-remap'
Upstream-commit: 09510c7c43c2717dbd6086a29bfdd63a0d370242
Component: engine
2016-01-12 14:06:24 -08:00
f00ac953d1 Fix rmi by ID untagging image on error
Do not untag image if it would later get a hard conflict because of running containers.

Fixes #18873

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 38a45eed8850a15d2f737ce7455f29c5ae53ab49
Component: engine
2016-01-12 13:45:40 -08:00
6e46b2fdf4 Docs update for link functionality in user-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2aa5f33b20881d3d5e7f412ff946f83f33cde810
Component: engine
2016-01-12 13:38:48 -08:00