docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,867 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

23867 Commits

Author SHA1 Message Date
Brian Goff 1521a41fc5 centos:7/OL:7 now includes libseccomp 2.2.1 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-04-26 20:48:26 -04:00
Sebastiaan van Stijn e8708f3049 Merge pull request #22294 from allencloud/fix-Insecure-registries-uppercase-in-docker-info 
Fix insecure registries upppercase in docker info
 2016-04-25 16:21:04 +02:00
Lei Jitang 66eb91463a Merge pull request #22287 from hqhq/hq_add_blk_check 
Add CONFIG_CFQ_GROUP_IOSCHED check
 2016-04-25 20:15:31 +08:00
allencloud e78884dafd make Insecure registries uppercase like other keys in docker info 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-04-25 18:44:34 +08:00
Qiang Huang 192387198d Add CONFIG_CFQ_GROUP_IOSCHED check 
blkio.weight depends on this config.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-04-25 14:08:29 +08:00
Tibor Vass 1e9b2355e4 Merge pull request #22184 from yongtang/22036-label-set 
Labels set on the command line don't override labels in Dockerfile
 2016-04-24 08:37:00 -04:00
Vincent Demeester 4e5ad97f5b Merge pull request #22138 from wenchma/deprecated_since_before 
Deprecated of docker ps since and before options for v1.12
 2016-04-24 11:23:21 +02:00
Yong Tang 5844736c14 Labels set on the command line always override labels in Dockerfile 
This fix tries to address the inconsistency in #22036 where labels
set on the command line will not override labels specified in
Dockerfile, but will override labels inherited from `FROM` images.

The fix add a LABEL with command line options at the end of the
processed Dockerfile so that command line options labels always
override the LABEL in Dockerfiles (or through `FROM`).

An integration test has been added for test cases specified in #22036.

This fix fixes #22036.

NOTE: Some changes are from #22266 (@tiborvass).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-04-23 18:49:17 -07:00
John Howard 35963cae80 Merge pull request #22274 from tiborvass/fix-tgz-binary-split 
Add dockerd daemon binary to tgz and zip archives
 2016-04-23 16:54:00 -07:00
Tibor Vass 44ff216985 Add dockerd daemon binary to tgz and zip archives 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-04-23 18:26:05 -04:00
John Howard 27f44b8af6 Merge pull request #20639 from dnephin/split_client 
Split the binary into two: client and daemon
 2016-04-23 14:14:20 -07:00
Daniel Nephin c0acfccc7b Cleanup from CR. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-23 15:05:15 -04:00
Sebastiaan van Stijn 7a2a8344e3 Merge pull request #22128 from FWirtz/master 
Removed the outdated Node.js documentation as requested
 2016-04-23 16:05:32 +02:00
Florian d9c0d67b51 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>
 2016-04-23 14:10:24 +02:00
Antonio Murdaca 885e5eb5f7 Merge pull request #22256 from mlaventure/use-abs-rootfs-path 
Use absolute path for rootfs in OCI config.json
 2016-04-23 13:21:21 +02:00
Antonio Murdaca b2926152d0 Merge pull request #22255 from crosbymichael/containerd-bump 
Bump containerd to v0.2.1
 2016-04-23 12:28:01 +02:00
David Calavera 8a0d2d8e57 Merge pull request #22168 from cpuguy83/22116_hack_in_layer_refcounts 
Add refcounts to graphdrivers that use fsdiff
 2016-04-22 15:17:12 -07:00
David Calavera 8c17d58eb8 Merge pull request #22253 from runcom/restore-bug 
api: server: check for unauthorized error
 2016-04-22 15:02:47 -07:00
Brian Goff 717f0c95b5 Merge pull request #22237 from tonistiigi/fix-config-removal-on-restartmanager-cancel 
Fix config cleanup on canceling restartmanager
 2016-04-22 14:31:55 -04:00
Alexander Morozov 86a6acf071 Merge pull request #22218 from HackToday/fixcpu 
Make cpu validation correct
 2016-04-22 10:56:01 -07:00
Tibor Vass 4377a58c12 Merge pull request #22015 from endophage/pkcs11_debs 
add pkcs11 build tag to deb and rpm builds
 2016-04-22 13:29:44 -04:00
Kenfe-Mickael Laventure 3135874543 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>
 2016-04-22 10:07:33 -07:00
Michael Crosby 199472c75a Bump containerd to v0.2.1 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-22 09:39:02 -07:00
Daniel Nephin 9e7651db4d 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>
 2016-04-22 11:26:01 -04:00
Antonio Murdaca 4316ae2ed3 api: server: check for unauthorized error 
This functionality has been fixed by
7bca932182 but then it has been broken
again by a793564b25 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>
 2016-04-22 17:14:02 +02:00
Sven Dowideit 9b00817dc6 Merge pull request #22196 from thaJeztah/add-mac-address-note 
docs: add note about MAC addresses not being unique
 2016-04-22 11:26:17 +10:00
Kai Qiang Wu(Kennan) 62cb06a6c1 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>
 2016-04-22 01:18:03 +00:00
Alexander Morozov 0b67f4c895 Merge pull request #22234 from tonistiigi/safer-writes 
Safer file io for configuration files
 2016-04-21 16:00:47 -07:00
Tonis Tiigi 7bf07737b9 Fix config cleanup on canceling restartmanager 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-04-21 15:33:09 -07:00
Tonis Tiigi ea3cbd3274 Safer file io for configuration files 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-04-21 11:31:15 -07:00
Michael Crosby 6f67c13d20 Merge pull request #22213 from yongtang/22210-docker-http-panics 
Docker http panics caused by container deletion with empty names.
 2016-04-21 10:37:24 -07:00
Alexander Morozov 228759fd42 Merge pull request #22172 from cpuguy83/fix_nosapce_test 
Containerize `TestDaemonNoSpaceLeftOnDeviceError`
 2016-04-21 09:41:31 -07:00
Alexander Morozov f8945836e1 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
 2016-04-21 09:40:04 -07:00
Brian Goff 7342060b07 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>
 2016-04-21 12:19:57 -04:00
Brian Goff b006f7f640 Merge pull request #21683 from mYmNeo/growFS 
call growFS when size is a mismatch
 2016-04-21 12:02:44 -04:00
David Calavera 01dd64cd10 Merge pull request #22193 from panyufeng920/master 
optimise docs
 2016-04-21 08:38:27 -07:00
Vincent Demeester c931a7c576 Merge pull request #22219 from leonhartX/zsh-completion-add-disable-content-trust 
Add zsh completion for 'docker {build,create,run} --disable-content-trust'
 2016-04-21 17:08:38 +02:00
Yong Tang 9d8071a74d 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>
 2016-04-21 07:53:49 -07:00
Brian Goff 70746f4c38 Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc 
Fix daemon.json storage-opts settings example
 2016-04-21 09:53:03 -04:00
Ken Cochrane 09ca4dd322
Bump Go version to 1.6.2 from 1.6.1 where it was used 
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
 2016-04-21 09:43:32 -04:00
Sven Dowideit 7bfe5408a1 Merge pull request #22216 from HackToday/fixolddoc 
Fix the old exit status example
 2016-04-21 21:31:09 +10:00
Dimitry Andric e3eb24fc21 The daemon.json storage-opts settings is actually a list. 
Signed-off-by: Dimitry Andric <d.andric@activevideo.com>
 2016-04-21 10:56:35 +02:00
Ke Xu da90fe0218 add zsh completion for 'docker {build,create,run} --disable-content-trust' 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-04-21 16:06:09 +09:00
Kai Qiang Wu(Kennan) 896ebb1ca2 Fix the old exit status example 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-21 03:24:10 +00:00
搏通 9abf304c25 optimise docs 
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
 2016-04-21 09:34:28 +08:00
Sebastiaan van Stijn ccf83c94d1 Merge pull request #22171 from mlaventure/always-disable-metrics 
Always disable containerd metrics when started by docker
 2016-04-21 01:38:07 +02:00
Sebastiaan van Stijn 0f14b566d9 Merge pull request #22200 from jfrazelle/remove-self 
Remove Jess from Maintainers
 2016-04-21 01:14:56 +02:00
Michael Crosby 24076ed4d9 Merge pull request #22173 from amitkris/uprev_dbus 
Update godbus/dbus to v4.0.0
 2016-04-20 15:39:00 -07:00
Vincent Demeester 483063ad85 Merge pull request #22203 from alimate/name-gen-patch 
Added Lamport & Agnesi to the list of scientists
 2016-04-20 21:03:18 +02:00
Sebastiaan van Stijn 763aceeb73
docs: add note about MAC addresses not being unique 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-04-20 19:24:39 +02:00