d6994eb3cb
Fixing dangling link in docs/reference/commandline/run.md
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: ee685dca0da66a8525e97e7ced4e7b5cbcb91a96
Component: engine
2015-07-11 14:10:54 -04:00
8e13e89b0b
Merge pull request #14537 from stevvooe/allow-one-character-repository-names
...
Allow one character repository names
Upstream-commit: 9264d384244d7334a45c4e3d46c639683993a077
Component: engine
2015-07-10 15:41:53 -07:00
e92413dd0d
Merge pull request #14371 from Microsoft/10662-graphdriver
...
Windows: Graph driver implementation
Upstream-commit: 4aeb84612f530d01e0b4f5b3fff40d2a6978f6f4
Component: engine
2015-07-10 15:35:00 -07:00
6b5ea18f12
Merge pull request #13986 from tg123/master
...
prompt a cli login if receive 401 from registry v2 auth server
Upstream-commit: ff8cef332663584504c24a1e4968069b1fcdc29c
Component: engine
2015-07-10 15:33:42 -07:00
9f9bda0c57
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
Upstream-commit: 703248da20566f707b8290662805a9264629e2e0
Component: engine
2015-07-10 15:32:13 -07:00
914754c805
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
Upstream-commit: 892ac93ec9fce417dfca9ce397c8e1d771b604e8
Component: engine
2015-07-10 15:21:29 -07:00
f177b87b50
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
Upstream-commit: a828415286202343e680aa8372c01d062056dc4b
Component: engine
2015-07-10 15:20:52 -07:00
1296feade8
Windows: Graph driver implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 52f4d09ffb376ffaa6677cb1e0413c6a97f53f24
Component: engine
2015-07-10 14:33:11 -07:00
576b45a55d
Merge pull request #13554 from Microsoft/10662-winexec
...
Windows: The real Windows exec driver is here.
Upstream-commit: b7e8169274ba4b897601e1025b91ebd361902213
Component: engine
2015-07-10 17:13:10 -04:00
5b7992c914
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
Upstream-commit: 5bf98dd997bbc4db2a70594669457417498212bd
Component: engine
2015-07-10 23:05:49 +02:00
c3450bd95b
Windows: Exec driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9ae9d4c87af8b04eb80006aca9f760ffdb1052bb
Component: engine
2015-07-10 13:36:56 -07:00
c4e83663e0
Allow one character repository name components
...
The docker/distribution dependency was updated in the previous commit to allow
repository name components to only consist of a single letter. The unit tests
have been updated to cement this change.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 451789cf88d678ed887a29b0aeeeccab5d6c735a
Component: engine
2015-07-10 14:06:15 -06:00
6198a7df78
Update docker/distribution dependency
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: bfd5202c17969d728e69972ad6adaf2aa7c79a91
Component: engine
2015-07-10 14:05:38 -06:00
3e1377983b
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: daced1d30345aca06857f874dfb48b7e90cb409b
Component: engine
2015-07-10 12:51:34 -07:00
3a1c206f9b
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
Upstream-commit: 20ac0e61643ec185052b8f29272aba1e95be76ec
Component: engine
2015-07-10 15:43:01 -04:00
44b29b0ccc
update reference to config file
...
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.
Signed-off-by: Nate Brennand <nate.brennand@clever.com >
Upstream-commit: 6827782bef07afe440acc46676e4850734fcc991
Component: engine
2015-07-10 18:55:47 +00:00
d67b6b5d43
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
Upstream-commit: 5bf335d0a22542a3b70ba879bc69333385efd749
Component: engine
2015-07-10 11:15:02 -07:00
9c232ce453
Merge pull request #14478 from atilacamurca/patch-1
...
Update run.md
Upstream-commit: 471fbc9b9984b6f6dd8303363655adc360388f7d
Component: engine
2015-07-10 11:13:51 -07:00
2371d5e9ce
Merge pull request #13312 from hqhq/hq_enable_cgroupfs
...
Add cgroup bind mount by default
Upstream-commit: 1dd2fda394923ab6c64d58d7d3b91043f16b72c2
Component: engine
2015-07-10 10:45:05 -07:00
e5af478260
More extensive testing of new GC of execs
...
This is a follow-on to PR #14520 .
PR #14520 is the quick fix to get the testing working again.
This PR makes sure that the list of execs associated with a container goes
from zero to one (as a new exec is run), then back to zero when the exec is
finished. However, we should be able to query the exec while the container
is still around, and even though the exec isn't listed in the container's
inspect data.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 72b75cd4e764e25cecd3f0c100597b8868c68120
Component: engine
2015-07-10 07:27:11 -07:00
b0c29eba8b
Minor fix to the exec inspect test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 899c85b40538ff75aa5c8b8f92dff55e3bff0d0b
Component: engine
2015-07-10 06:19:03 -07:00
c770b13f1f
Add cgroup bind mount by default
...
Libcontainer already supported mount container's own cgroup into
container, with this patch, we can see container's own cgroup info
in container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f18fb5b3efd59d54c00d4e1b1d4b88c4b21e96be
Component: engine
2015-07-10 13:12:09 +08:00
aae04e2dff
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
Upstream-commit: 6e64e0548f30fd9d1a368ac5ea5bde9dec38c162
Component: engine
2015-07-09 21:52:59 -04:00
01e9709b3d
Merge pull request #14512 from Microsoft/10662-fixdockerinfo
...
Windows: Fix docker info not to SIGSEGV
Upstream-commit: 4893ecc112213d3dcdb5421c1a605dbc0e339854
Component: engine
2015-07-09 17:16:49 -07:00
8595d62a4c
Windows: Fix docker info not to SIGSEGV
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4348ad68f818ed72752bcf66d30f53cf15598bb4
Component: engine
2015-07-09 16:37:54 -07:00
0f6e3890ae
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
Upstream-commit: 56e8a99b617588f6fce5b8a311fa7d01db67c7e6
Component: engine
2015-07-09 16:37:41 -07:00
92adaadd4b
Merge pull request #14505 from kostickm/12905-port-container-attach-tests
...
Port POST container attach tests
Upstream-commit: e64af7a70ea1220d08bc2d11ad0d3974ee043aa0
Component: engine
2015-07-09 16:27:03 -07:00
4269f6c0bd
Merge pull request #14509 from Microsoft/10662-remove-linux
...
Windows: Remove linux
Upstream-commit: 7df186dac7422464aca0052232a6754e3f8125fa
Component: engine
2015-07-09 15:42:53 -07:00
18d3d40382
Merge pull request #14476 from crosbymichael/execid-growth-fix
...
Prevent uncontrolled exec config growth
Upstream-commit: 382799a64253a1da46613a2290a2f59d02710df8
Component: engine
2015-07-09 15:36:11 -07:00
b9f61dea35
Windows: Remove linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7d3bbe9d34e3fc7351c8b612c6f0c9438d360a7a
Component: engine
2015-07-09 15:15:25 -07:00
cf30b7f14e
Merge pull request #14507 from estesp/remove-old-roadmap
...
No need for the old project/ROADMAP.md
Upstream-commit: a29af0cc429769bc2514a37f44e64c9ebb04be56
Component: engine
2015-07-09 15:11:26 -07:00
f217526e9e
No need for the old project/ROADMAP.md
...
Now that we have ROADMAP.md in the root of the project, the outdated and
non-specific ROADMAP.md in project/ can be removed.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 548caddaf670fd6837e4e74a38e58a58ed6088b3
Component: engine
2015-07-09 18:05:09 -04:00
e0ffc7b501
Use mark and sweep for exec command removal
...
This takes the final removal for exec commands in two steps. The first
GC tick will mark the exec commands for removal and then the second tick
will remove the config from the daemon.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 34ab8c432691934745d66ee94ff4aec1120518e0
Component: engine
2015-07-09 14:51:10 -07:00
c104f21d9a
Merge pull request #14484 from LK4D4/check_dockerinit_lxc
...
Check dockerinit only if lxc driver is used
Upstream-commit: c9e2a71509743ea38baafb71d7efa8b205af14b4
Component: engine
2015-07-09 14:47:03 -07:00
39f872f4ab
Merge pull request #14457 from Djelibeybi/oraclelinux-rpms
...
Add support for building docker-engine RPM on Oracle Linux 7.
Upstream-commit: 0f9c458730103cacc5568f05272be48213535ab8
Component: engine
2015-07-09 14:44:42 -07:00
68020cd75e
Change generate.sh so that the yum command for packages remains generic across distros.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: f18c4f23cc98ba4fd4fb3241571ce31062eda717
Component: engine
2015-07-10 07:34:47 +10:00
fc8053f2ba
Help the release captain to announce the released packages.
...
Add a few links to the release output that the release captain can use to announce the release.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: eae99e9da70ddd1d2d452abb063199d78ca65fb9
Component: engine
2015-07-09 14:19:05 -06:00
5b5bcdcb21
Align 'docker commit' docs with the code
...
It was missing some variants and 'maintainer' isn't actually supported.
Also sorted the list of allowed cmds in the code just to make it easier
to diff with the docs.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0bf0e5a6efb6d4718f18db11084295aaba2062e3
Component: engine
2015-07-09 13:17:47 -07:00
f35886e35f
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: a8715ea2207966e649e66a4fafcf34517234061f
Component: engine
2015-07-09 12:52:45 -07:00
448d2ef599
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c1b524486c80932f0c97b935f1ff9e41d30eab4e
Component: engine
2015-07-09 10:09:45 -07:00
10798d6350
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
Upstream-commit: 37771c122b3d1cf1e68ef2887586361e48792fef
Component: engine
2015-07-09 12:34:27 -04:00
f6f9fbadc6
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
Upstream-commit: 5369b6cf29aafce9f335e8ab77a41575ac66ad5f
Component: engine
2015-07-09 09:56:53 -06:00
81d1e83005
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3d029c3bf335bc2867d1efc803096d2912b81799
Component: engine
2015-07-09 09:01:57 -06:00
9c6eed3d0d
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: d28b0ba115f44f7a49cfc442d5eff146e57c3167
Component: engine
2015-07-09 18:52:18 +08:00
d48369012b
Merge pull request #14381 from Mashimiao/cleanup-client-unused-code
...
api/client: unify format of args check
Upstream-commit: 0afd7bde02c7f03b9e8ebca6a7d8953b8697e55a
Component: engine
2015-07-09 06:42:57 -04:00
8ed1a187ce
Merge pull request #13989 from squaremo/netplugin_docs
...
Mention network driver plugins and point to protocol docs
Upstream-commit: f0e90606cdf272407e0d79d4746039da60c60df2
Component: engine
2015-07-09 09:27:05 +02:00
d257ad21f6
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
Upstream-commit: ca3e4ccb809dc283c91deb304876a211eb546265
Component: engine
2015-07-09 08:23:26 +02:00
228bda77d9
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: 54ac3ad736d633956a89aa478c6eb89d648a34df
Component: engine
2015-07-09 02:40:47 +00:00
6867b43d70
Merge pull request #14456 from Djelibeybi/issue14042
...
Remove RPM specific dependencies
Upstream-commit: cab02a5bbcb6f6bc0d1cfd61820a8134bd5ed525
Component: engine
2015-07-08 17:17:55 -07:00
c6bfbb6e7e
Merge pull request #14479 from LK4D4/fix_test_inspect
...
Remove prefix dots from inspects in tests
Upstream-commit: 885e7f2a1ec9964fac09f77b0de3a9e0c09dd7c1
Component: engine
2015-07-08 15:10:51 -07:00
