b0da494aa3
Merge pull request #14559 from Microsoft/10662-todo1
...
Windows: Move daemon check back centrally
2015-07-12 21:22:43 -07:00
b58565e9d6
Merge pull request #14568 from runcom/test-vet-fixes
...
Add minor vet fixes
2015-07-12 14:00:44 -07:00
26ce3f4c90
Add minor vet fixes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-12 19:16:38 +02:00
62a75fca68
Windows: Move daemon check back centrally
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-11 12:42:46 -07:00
9264d38424
Merge pull request #14537 from stevvooe/allow-one-character-repository-names
...
Allow one character repository names
2015-07-10 15:41:53 -07:00
4aeb84612f
Merge pull request #14371 from Microsoft/10662-graphdriver
...
Windows: Graph driver implementation
2015-07-10 15:35:00 -07:00
ff8cef3326
Merge pull request #13986 from tg123/master
...
prompt a cli login if receive 401 from registry v2 auth server
2015-07-10 15:33:42 -07:00
703248da20
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
2015-07-10 15:32:13 -07:00
892ac93ec9
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
2015-07-10 15:21:29 -07:00
a828415286
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
2015-07-10 15:20:52 -07:00
52f4d09ffb
Windows: Graph driver implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-10 14:33:11 -07:00
b7e8169274
Merge pull request #13554 from Microsoft/10662-winexec
...
Windows: The real Windows exec driver is here.
2015-07-10 17:13:10 -04:00
5bf98dd997
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
2015-07-10 23:05:49 +02:00
9ae9d4c87a
Windows: Exec driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-10 13:36:56 -07:00
451789cf88
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 >
2015-07-10 14:06:15 -06:00
bfd5202c17
Update docker/distribution dependency
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-10 14:05:38 -06:00
daced1d303
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 >
2015-07-10 12:51:34 -07:00
20ac0e6164
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
2015-07-10 15:43:01 -04:00
6827782bef
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 >
2015-07-10 18:55:47 +00:00
5bf335d0a2
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
2015-07-10 11:15:02 -07:00
471fbc9b99
Merge pull request #14478 from atilacamurca/patch-1
...
Update run.md
2015-07-10 11:13:51 -07:00
1dd2fda394
Merge pull request #13312 from hqhq/hq_enable_cgroupfs
...
Add cgroup bind mount by default
2015-07-10 10:45:05 -07:00
c4b85baf3d
Merge pull request #14527 from duglin/MoreExecTests
...
More extensive testing of new GC of execs
2015-07-10 10:42:28 -07:00
72b75cd4e7
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 >
2015-07-10 07:27:11 -07:00
469e234ded
Merge pull request #14520 from duglin/FixExecTest
...
Minor fix to the exec inspect test
2015-07-10 09:57:43 -04:00
899c85b405
Minor fix to the exec inspect test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-10 06:19:03 -07:00
f18fb5b3ef
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 >
2015-07-10 13:12:09 +08:00
6e64e0548f
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
2015-07-09 21:52:59 -04:00
4893ecc112
Merge pull request #14512 from Microsoft/10662-fixdockerinfo
...
Windows: Fix docker info not to SIGSEGV
2015-07-09 17:16:49 -07:00
4348ad68f8
Windows: Fix docker info not to SIGSEGV
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 16:37:54 -07:00
56e8a99b61
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
2015-07-09 16:37:41 -07:00
e64af7a70e
Merge pull request #14505 from kostickm/12905-port-container-attach-tests
...
Port POST container attach tests
2015-07-09 16:27:03 -07:00
7df186dac7
Merge pull request #14509 from Microsoft/10662-remove-linux
...
Windows: Remove linux
2015-07-09 15:42:53 -07:00
382799a642
Merge pull request #14476 from crosbymichael/execid-growth-fix
...
Prevent uncontrolled exec config growth
2015-07-09 15:36:11 -07:00
7d3bbe9d34
Windows: Remove linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 15:15:25 -07:00
a29af0cc42
Merge pull request #14507 from estesp/remove-old-roadmap
...
No need for the old project/ROADMAP.md
2015-07-09 15:11:26 -07:00
548caddaf6
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)
2015-07-09 18:05:09 -04:00
34ab8c4326
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 >
2015-07-09 14:51:10 -07:00
c9e2a71509
Merge pull request #14484 from LK4D4/check_dockerinit_lxc
...
Check dockerinit only if lxc driver is used
2015-07-09 14:47:03 -07:00
0f9c458730
Merge pull request #14457 from Djelibeybi/oraclelinux-rpms
...
Add support for building docker-engine RPM on Oracle Linux 7.
2015-07-09 14:44:42 -07:00
f18c4f23cc
Change generate.sh so that the yum command for packages remains generic across distros.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-10 07:34:47 +10:00
dce90c0bdd
Merge pull request #14502 from calavera/help_release_announce_text
...
Help the release captain to announce the released packages.
2015-07-09 14:27:24 -07:00
eae99e9da7
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 >
2015-07-09 14:19:05 -06:00
0bf0e5a6ef
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 >
2015-07-09 13:17:47 -07:00
a8715ea220
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-07-09 12:52:45 -07:00
c1b524486c
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 10:09:45 -07:00
37771c122b
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
2015-07-09 12:34:27 -04:00
5369b6cf29
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
2015-07-09 09:56:53 -06:00
3d029c3bf3
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-09 09:01:57 -06:00
d28b0ba115
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-09 18:52:18 +08:00
Arnaud Porterie