toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,860 Commits 3 Branches 295 Tags
76284509d6cf5d733d6bdf640e3869d26c7acee7
Commit Graph
23860 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 76284509d6 Merge pull request #22138 from wenchma/deprecated_since_before 
Deprecated of docker ps since and before options for v1.12
Upstream-commit: 4e5ad97f5b2d9db237546e67de3049649c5ff5e8
Component: engine
 2016-04-24 11:23:21 +02:00
John Howard 3066c6f306 Merge pull request #22274 from tiborvass/fix-tgz-binary-split 
Add dockerd daemon binary to tgz and zip archives
Upstream-commit: 35963cae80b8459b3671bc15c478ec27e2ebf0d2
Component: engine
 2016-04-23 16:54:00 -07:00
Tibor Vass 63034168e4 Add dockerd daemon binary to tgz and zip archives 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 44ff21698580052d037f7b84ef76b7a94567d012
Component: engine
 2016-04-23 18:26:05 -04:00
John Howard 95f6733644 Merge pull request #20639 from dnephin/split_client 
Split the binary into two: client and daemon
Upstream-commit: 27f44b8af63d563f53c04b342cbafc3b8f27cb45
Component: engine
 2016-04-23 14:14:20 -07:00
Daniel Nephin f856b40438 Cleanup from CR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0acfccc7be6c49bf243821e535dfe1122ff5a52
Component: engine
 2016-04-23 15:05:15 -04:00
Sebastiaan van Stijn 87b349078a Merge pull request #22128 from FWirtz/master 
Removed the outdated Node.js documentation as requested
Upstream-commit: 7a2a8344e3d58d5791007206debf61a9ff2fe274
Component: engine
 2016-04-23 16:05:32 +02:00
Florian 0f705c8304 Remove outdated Node.js example - include a link to the new guide later! 
As recommended by @moxiegirl and squashed.

Signed-off-by: FWirtz <florian.wirtz08@gmail.com>
Upstream-commit: d9c0d67b51fc135b2dbf54a152105d124100eb5e
Component: engine
 2016-04-23 14:10:24 +02:00
Antonio Murdaca 423557cc6f Merge pull request #22256 from mlaventure/use-abs-rootfs-path 
Use absolute path for rootfs in OCI config.json
Upstream-commit: 885e5eb5f7784f9e5d218d4446595609f83304a8
Component: engine
 2016-04-23 13:21:21 +02:00
Antonio Murdaca 9037244926 Merge pull request #22255 from crosbymichael/containerd-bump 
Bump containerd to v0.2.1
Upstream-commit: b2926152d00d9a6130395c6c851a9e378d859026
Component: engine
 2016-04-23 12:28:01 +02:00
David Calavera 76c8648306 Merge pull request #22168 from cpuguy83/22116_hack_in_layer_refcounts 
Add refcounts to graphdrivers that use fsdiff
Upstream-commit: 8a0d2d8e57a4825fb21c0f8ef91bef513beebc35
Component: engine
 2016-04-22 15:17:12 -07:00
David Calavera acc7b1d2d7 Merge pull request #22253 from runcom/restore-bug 
api: server: check for unauthorized error
Upstream-commit: 8c17d58eb8a90428078e9228864fa819ef8783f2
Component: engine
 2016-04-22 15:02:47 -07: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
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
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
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
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
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
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