Commit Graph
24311 Commits
Author SHA1 Message Date
Ken Cochrane 7b511aec8e Create the correct directory structure for apt-ftparchive. fixes #22238
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: f68b61052ba12a0387eb0a761f05ccd16c4c3105
Component: engine
2016-04-22 16:28:49 -04:00
Sebastiaan van Stijn d680608fe6 OHMAN! Move vbatts to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3c45c5abfc1583c4d409b1e02c0161218572fd05
Component: engine
2016-04-22 21:53:24 +02:00
Brian Goff c0795c57ea Merge pull request #22237 from tonistiigi/fix-config-removal-on-restartmanager-cancel
Fix config cleanup on canceling restartmanager
Upstream-commit: 717f0c95b59b215c07af2d2b2dd06b1246d174ca
Component: engine
2016-04-22 14:31:55 -04:00
Alexander Morozov 4d622a9775 Merge pull request #22218 from HackToday/fixcpu
Make cpu validation correct
Upstream-commit: 86a6acf0715020412fe322e040749a9cea6c2c7a
Component: engine
2016-04-22 10:56:01 -07:00
Michael Crosby c197f20a8a Reset restart timeout if execution longer than 10s
Restore the 1.10 logic that will reset the restart manager's timeout or
backoff delay if a container executes longer than 10s reguardless of
exit status or policy.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b6db56b5eba00c4e8ad7a6f6c5b018e15dc883eb
Component: engine
2016-04-22 10:37:34 -07:00
Tibor Vass 09985717bc Merge pull request #22015 from endophage/pkcs11_debs
add pkcs11 build tag to deb and rpm builds
Upstream-commit: 4377a58c1235c1f207a28f8ffb0599d7b3adeedf
Component: engine
2016-04-22 13:29:44 -04:00
Michael Holzheu 95b25f51f9 Create "src" symlink for building notary with gcc 5
With gcc 5 version 1.4.2 of go is included. This version does not support
go's "native vendoring" which is needed to build notary since git commit
51dc1747e4ab5 ("Move the godeps workspace to the vendor directory to be
compliant with Go 1.6").

As a workaround create a symlink "vendor/src" that points to "vendor/".
This allows to compile notary with gcc 5.

Closes #22007

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 241898d136e41f80ab2dda95078f971a8248675d
Component: engine
2016-04-22 19:28:08 +02:00
Kenfe-Mickael Laventure cab428e780 Use absolute path for rootfs in OCI config.json
This avoid an extra bind mount within /var/run/docker/libcontainerd

This should resolve situations where a container having the host
/var/run bound prevents other containers from being cleanly removed
(e.g. #21969).

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 313587454334f455334dac8d32cfb96f949a29a0
Component: engine
2016-04-22 10:07:33 -07:00
Ben Firshman 313a5e3ec8 Remove out-of-date client libraries
For each language, if there is one library which is clearly the
best or most active, I've removed the other libraries so users
aren't mislead.

I've removed the web UIs because they're not really client
libraries.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: bb94cfce62b5b07f7ec00bfbbc229c7f87b7a6e8
Component: engine
2016-04-22 10:00:53 -07:00
Michael Crosby de7c442d63 Bump containerd to v0.2.1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 199472c75a8e0c60108399de2da0247af1a0bdab
Component: engine
2016-04-22 09:39:02 -07:00
Daniel Nephin dcd6f9747a Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9e7651db4d464649bc32cf346fdee8c6900ebe0f
Component: engine
2016-04-22 11:26:01 -04:00
Antonio Murdaca b1397d2034 api: server: check for unauthorized error
This functionality has been fixed by
7bca93218291767c5dd8782de0ad630dbcda9995 but then it has been broken
again by a793564b2591035aec5412fbcbcccf220c773a4c and finally refixed
here.

Basically the functionality was to prompt for login when trying to pull
from the official docker hub.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4316ae2ed33d158e1d8d994646a75e25a70d9320
Component: engine
2016-04-22 17:14:02 +02:00
Sven Dowideit 3e3ec58c45 Merge pull request #22196 from thaJeztah/add-mac-address-note
docs: add note about MAC addresses not being unique
Upstream-commit: 9b00817dc692458f9e27e375a870ecd0dcbd0b75
Component: engine
2016-04-22 11:26:17 +10:00
Kai Qiang Wu(Kennan) 0f14718379 Make cpu validation correct
There was an error in validation logic before, should use period
instead of quota, and also add check for negative
number here, if not with that, it would had cpu.cfs_period_us: invalid argument
which is not good for users.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 62cb06a6c1db5599f1f5b9b95b298be83c509860
Component: engine
2016-04-22 01:18:03 +00:00
Ben Firshman 07010d4ac6 Fix lasote/docker_client link
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 91fe274dcf09dfd580aaa1c88fa2ddbb4758bf66
Component: engine
2016-04-21 16:24:51 -07:00
Alexander Morozov 48d9e2d24a Merge pull request #22234 from tonistiigi/safer-writes
Safer file io for configuration files
Upstream-commit: 0b67f4c8951bccfecc8bafba66e7248309fb0c7c
Component: engine
2016-04-21 16:00:47 -07:00
Tonis Tiigi 50fc6aee46 Fix config cleanup on canceling restartmanager
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7bf07737b90f087271b5a9a3a1c8d262c154554f
Component: engine
2016-04-21 15:33:09 -07:00
Tonis Tiigi e3c27e0ed4 Safer file io for configuration files
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ea3cbd3274664f5b16fce78d7df036f6b5c94e30
Component: engine
2016-04-21 11:31:15 -07:00
Michael Crosby 0c742e4666 Merge pull request #22213 from yongtang/22210-docker-http-panics
Docker http panics caused by container deletion with empty names.
Upstream-commit: 6f67c13d20b207e5ab9a038b04ccc44d337131ed
Component: engine
2016-04-21 10:37:24 -07:00
Justin Cormack 5305b5b601 Remove mlock and vhangup from the default seccomp profile
These syscalls are already blocked by the default capabilities:
mlock mlock2 mlockall require CAP_IPC_LOCK
vhangup requires CAP_SYS_TTY_CONFIG

There is therefore no reason to allow them in the default profile
as they cannot be used anyway.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: e7a99ae5e16f8688a0735c91856d13633f48185c
Component: engine
2016-04-21 18:23:59 +01:00
Alexander Morozov 4e42d86b8b Merge pull request #22172 from cpuguy83/fix_nosapce_test
Containerize `TestDaemonNoSpaceLeftOnDeviceError`
Upstream-commit: 228759fd42fdb2014b2e16e15f4452bb1d5f8227
Component: engine
2016-04-21 09:41:31 -07:00
Alexander Morozov 6ad54358a5 Merge pull request #22227 from kencochrane/bump_go_1.6.2
Bump Go version to 1.6.2 from 1.6.1 where it was used
Upstream-commit: f8945836e1f9124a8ce75820b710e4cb3f26e1e1
Component: engine
2016-04-21 09:40:04 -07:00
Brian Goff f8ddc00d73 Add refcounts to graphdrivers that use fsdiff
This makes sure fsdiff doesn't try to unmount things that shouldn't be.

**Note**: This is intended as a temporary solution to have as minor a
change as possible for 1.11.1. A bigger change will be required in order
to support container re-attach.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7342060b070df67481f8da4f394a57cac1671d56
Component: engine
2016-04-21 12:19:57 -04:00
Brian Goff dd79541d6f Merge pull request #21683 from mYmNeo/growFS
call growFS when size is a mismatch
Upstream-commit: b006f7f64020c814b2eab2c7d2f59e1539894449
Component: engine
2016-04-21 12:02:44 -04:00
Vivek Goyal 4847a4f337 Export Mininum Thin Pool Free Space through docker info
Right now there is no way to know what's the minimum free space threshold
daemon is applying. It would be good to export it through docker info and
then user knows what's the current value. Also this could be useful to
higher level management tools which can look at this value and setup their
own internal thresholds for image garbage collection etc.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 55a9b8123d7e89692b5c25c846cf6707a8ce463a
Component: engine
2016-04-21 15:42:23 +00:00
David Calavera c289b3f431 Merge pull request #22193 from panyufeng920/master
optimise docs
Upstream-commit: 01dd64cd107b2a7d4c01be9074da155d65a79c57
Component: engine
2016-04-21 08:38:27 -07:00
Vincent Demeester bff21245b0 Merge pull request #22219 from leonhartX/zsh-completion-add-disable-content-trust
Add zsh completion for 'docker {build,create,run} --disable-content-trust'
Upstream-commit: c931a7c576ff09acb44be7857775dd58f0ad04ab
Component: engine
2016-04-21 17:08:38 +02:00
Yong Tang b0c0884b1f Docker http panics caused by container deletion with empty names.
This fix tries to fix the http panics caused by container deletion
with empty names in #22210.

The issue was because when an empty string was passed, `GetByName()`
tried to access the first element of the name string without checking
the length. A length check has been added.

A test case for #22210 has been added.

This fix fixes #22210.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9d8071a74db20556d0fc1b6ef3270326b3583de9
Component: engine
2016-04-21 07:53:49 -07:00
Brian Goff 0f8b8ed30c Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
Fix daemon.json storage-opts settings example
Upstream-commit: 70746f4c38322ca14cb62321ce73b08b18422a14
Component: engine
2016-04-21 09:53:03 -04:00
Ken Cochrane 08e66af0b3 Bump Go version to 1.6.2 from 1.6.1 where it was used
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: 09ca4dd32232cdbbe04628e5647922002d9df175
Component: engine
2016-04-21 09:43:32 -04:00
Sven Dowideit b54ef9a586 Merge pull request #22216 from HackToday/fixolddoc
Fix the old exit status example
Upstream-commit: 7bfe5408a1a627f193fec0cfae693232a83efb21
Component: engine
2016-04-21 21:31:09 +10:00
Dimitry Andric 5b79c087d8 The daemon.json storage-opts settings is actually a list.
Signed-off-by: Dimitry Andric <d.andric@activevideo.com>
Upstream-commit: e3eb24fc21fa6f6002eef081278333f9e5e16614
Component: engine
2016-04-21 10:56:35 +02:00
Ke Xu ac79d29757 add zsh completion for 'docker {build,create,run} --disable-content-trust'
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
Upstream-commit: da90fe0218411933d53daac7366ce4353cd5b665
Component: engine
2016-04-21 16:06:09 +09:00
Kai Qiang Wu(Kennan) a659558dcf Fix the old exit status example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 896ebb1ca2a6ae23d7511678aaab1d4e32c54ff9
Component: engine
2016-04-21 03:24:10 +00:00
搏通 8c00bd5332 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
2016-04-21 09:34:28 +08:00
Sebastiaan van Stijn aeb44b5505 Merge pull request #22171 from mlaventure/always-disable-metrics
Always disable containerd metrics when started by docker
Upstream-commit: ccf83c94d18df4b27ca3d46ffbe008df76aa3275
Component: engine
2016-04-21 01:38:07 +02:00
Sebastiaan van Stijn 1563e3998f Merge pull request #22200 from jfrazelle/remove-self
Remove Jess from Maintainers
Upstream-commit: 0f14b566d98304e3bd7e24d87bb509e2e18ca7ca
Component: engine
2016-04-21 01:14:56 +02:00
Michael Crosby 9a6bda4bd8 Merge pull request #22173 from amitkris/uprev_dbus
Update godbus/dbus to v4.0.0
Upstream-commit: 24076ed4d9c82d387029b8a65e21873db5676f6a
Component: engine
2016-04-20 15:39:00 -07:00
Vincent Demeester 1542891d6f Merge pull request #22203 from alimate/name-gen-patch
Added Lamport & Agnesi to the list of scientists
Upstream-commit: 483063ad85f7eff587f6dbf99a71f31def8d4c76
Component: engine
2016-04-20 21:03:18 +02:00
Sebastiaan van Stijn a63f858c5e docs: add note about MAC addresses not being unique
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 763aceeb733cdd927eb2de6232f0257267b6f71e
Component: engine
2016-04-20 19:24:39 +02:00
Ali Dehghani 6418621ca6 Added Lamport & Agnesi to the list of scientists
Leslie B. Lamport is an American computer scientist. Lamport is
best known for his seminal work in distributed systems and as the
initial developer of the document preparation system LaTeX.
Maria Gaetana Agnesi was an Italian mathematician, philosopher,
theologian and humanitarian. She was the first woman to write a
mathematics handbook and the first woman appointed as a Mathematics
Professor at a University.

Signed-off-by: Ali Dehghani <ali.dehghani.g@gmail.com>
Upstream-commit: 85e880205f305aa7b566ac4d7dc6280d5015c2b2
Component: engine
2016-04-20 21:44:22 +04:30
Sebastiaan van Stijn daff11e0d3 Merge pull request #22201 from moxiegirl/update-readme
Removing ref to old google group; adding forum
Upstream-commit: 3022a43f420588a5809332f284f27ec6e3ca4611
Component: engine
2016-04-20 18:42:47 +02:00
Mary Anthony 4d75557ec6 Removing ref to old google group; adding forum
Adding email notice
user > dev and an > a

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 344784707918b39f2d23d1117b09e5a0cbbb6eb8
Component: engine
2016-04-20 09:34:49 -07:00
Jess Frazelle 823e3f54b6 Remove Jess from Maintainers
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Upstream-commit: 145fb8de9ee2f57fdec74a1ea27432c68cd5820a
Component: engine
2016-04-20 08:50:42 -07:00
David Calavera 60ca663014 Merge pull request #22191 from mavenugo/jp
Initialize activateWait for plugins activated by json spec
Upstream-commit: cf03e17c5cfb7617d91aa4177f4bb4a5112496ad
Component: engine
2016-04-20 08:37:20 -07:00
Sebastiaan van Stijn 9ddd4e8416 Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers
Add Madhu Venugopal to maintainers
Upstream-commit: afbe2869f02d4891ab1dc3feeadd47fd3be2c340
Component: engine
2016-04-20 17:17:41 +02:00
moxiegirl f7b3af0900 Merge pull request #21389 from chenchun/resize_direct_lvm
Resize direct lvm
Upstream-commit: f96d15d3c361a08ad892759d5e885625b0d48302
Component: engine
2016-04-20 06:33:37 -07:00
moxiegirl 698cbdd3a4 Merge pull request #22189 from thaJeztah/restructure-plugin-docs
docs: use tables for available plugins
Upstream-commit: fc25376762cdbab6e738742586e752478b80171e
Component: engine
2016-04-20 06:32:23 -07:00
Madhu Venugopal ee5a4917fb Initialize activateWait for plugins activated by json spec
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: de806a672b0810e48facc74e198e6728c1fe2c6d
Component: engine
2016-04-20 05:59:19 -07:00
Sebastiaan van Stijn a1c0412063 docs: use tables for available plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 79351caec1b413c9da1080fceff49eb994323734
Component: engine
2016-04-20 13:45:31 +02:00