Vincent Demeester
86ba0e29f5
Merge pull request #20866 from suiyuan2009/20801-add-ubuntu-notice
...
add ubuntu arch note
2016-03-06 11:50:18 +01:00
Antonio Murdaca
11b9d7f1ad
Merge pull request #20967 from calavera/fix_stop_hanging_on_dead_process
...
Do not wait for container on stop if the process doesn't exist.
2016-03-06 11:37:59 +01:00
Ziming Dong
b2f1f7ee00
add ubuntu arch note
...
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com >
2016-03-06 14:19:58 +08:00
menglingwei
40939942a1
add Aliyun ECS Docker Machine Driver Plugin
...
Signed-off-by: 治世 <xiaobing.meng@alibaba-inc.com >
2016-03-06 13:55:28 +08:00
John Starks
53b8b8f058
Windows: Revendor github.com/Microsoft/hcsshim
...
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.
Signed-off-by: John Starks <jostarks@microsoft.com >
2016-03-05 19:10:32 -08:00
Jess Frazelle
91cafaadac
Merge pull request #20981 from justincormack/seccomp_ipc
...
Add ipc syscall to default seccomp profile
2016-03-05 15:29:19 -08:00
Justin Cormack
31410a6d79
Add ipc syscall to default seccomp profile
...
On 32 bit x86 this is a multiplexing syscall for the system V
ipc syscalls such as shmget, and so needs to be allowed for
shared memory access for 32 bit binaries.
Fixes #20733
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-03-05 22:12:23 +00:00
Doug Davis
beb17c096d
Merge pull request #20978 from allencloud/fix-typo
...
fix typos
2016-03-05 12:41:37 -05:00
allencloud
2736f77a94
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
2016-03-06 00:59:11 +08:00
Dimitar Bonev
81b7fba33e
Allowing null for build args
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com >
2016-03-05 15:57:06 +02:00
Brian Goff
160abfbeea
Merge pull request #20803 from WeiZhang555/empty-stats-no-stream
...
Bug fix: stats --no-stream always print zero values
2016-03-05 08:47:41 -05:00
Zhang Wei
ea86c30a4a
Bug fix: stats --no-stream always print zero values
...
`docker stats --no-stream` always print zero values.
```
$ docker stats --no-stream
CONTAINER CPU % MEM USAGE / LIMIT MEM %
NET I/O BLOCK I/O
7f4ef234ca8c 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
f05bd18819aa 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
```
This commit will let docker client wait until it gets correct stat
data before print it on screen.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-03-05 13:22:26 +08:00
Aaron Lehmann
33c4a6522e
Merge pull request #1511 from dmcgowan/fix-oauth-cross-repo-push
...
Fix oauth cross repository push
2016-03-04 15:29:08 -08:00
Derek McGowan
a8aa2f78de
Fix oauth cross repository push
...
Cross repository push tokens were not being cached and could not be used,
now any returned token will be used and the caching is hidden in the getToken function.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-03-04 15:13:27 -08:00
Aaron Lehmann
274825f403
Merge pull request #1510 from dmcgowan/oauth-offline-access
...
Add offline token option
2016-03-04 14:47:48 -08:00
Derek McGowan
efd7ea4624
Add offline token option
...
Login needs to add an offline token flag to ensure a refresh token is returned by the token endpoint.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-03-04 14:32:51 -08:00
Derek McGowan
1126e32234
Add post token implementation
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-03-04 13:53:06 -08:00
Sebastiaan van Stijn
44fb8fa588
Merge pull request #20946 from thaJeztah/update-registry-links
...
Update links to Docker Hub
2016-03-04 22:37:57 +01:00
Doug Davis
45865bc4f5
Merge pull request #20963 from tophj-ibm/properly-close-test-file
...
Properly close and remove file in daemon test
2016-03-04 16:27:07 -05:00
David Calavera
1a729c3dd8
Do not wait for container on stop if the process doesn't exist.
...
This fixes an issue that caused the client to hang forever if the
process died before the code arrived to exit the `Kill` function.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-03-04 16:00:58 -05:00
Richard Scothern
5b8592b72c
Merge pull request #1475 from dmcgowan/oauth-registry-client
...
Add oauth support to registry client auth
2016-03-04 11:51:53 -08:00
Nathan LeClaire
1a0a740e27
Merge pull request #3111 from jsirois/jsirois/amazoneec2/multiple_sgs
...
Support multiple `--amazonec2-security-group`s.
2016-03-04 11:48:49 -08:00
David Calavera
e7cbae9fd6
Merge pull request #20959 from Microsoft/jjh/bumptimeout
...
Windows CI: Bump timeout for tests
2016-03-04 11:44:25 -08:00
Derek McGowan
2ef7a872de
Add options struct to initialize handler
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-03-04 11:32:48 -08:00
Christopher Jones
66e558c16c
Properly close and remove file in daemon test
...
Fixes a bug where a file would be created and not deleted in
DockerSuite.TestDaemonDiscoveryBackendConfigReload
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2016-03-04 14:22:30 -05:00
David Calavera
2af84d8875
Merge pull request #20934 from icecrime/20543_debugging
...
Fix race condition on daemon shutdown (#20543 )
2016-03-04 11:08:50 -08:00
Vincent Demeester
ea738c633f
Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
...
Enhancement of TestDockerNetworkInternalMode
2016-03-04 20:00:35 +01:00
Darren Stahl
ad7398e664
Reenabled TestPsListContainers* tests and increased sleep time
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-03-04 10:53:04 -08:00
Lynda O'Leary
3b74be8ab7
Edited content in the Hello World section
...
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
2016-03-04 18:50:48 +00:00
Nishant Totla
1da3c25c06
Merge pull request #1927 from allencloud/fix-typos-in-test-and-annotation
...
fix typos in a test file and a function annotation
2016-03-04 10:03:38 -08:00
John Howard
6a1ae187d0
Windows CI: Bump timeout for tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-03-04 09:36:46 -08:00
Brian Goff
c08b674d56
Merge pull request #20843 from calavera/plugin_any_transport
...
Call plugins with custom transports.
2016-03-04 11:59:32 -05:00
Sun Hongliang
c34a45023f
fix typos in a test file and a function annotation
...
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io >
2016-03-05 00:39:15 +08:00
Antonio Murdaca
44b56341d9
Merge pull request #20943 from vdemeester/20942-fix-containerPsContext
...
Fix #20942 TestContainerPsContext unit test
2016-03-04 16:49:47 +01:00
Erik M. Bray
24fcb7e83a
Remove the DOCKER_TOOLBOX_INSTALL_PATH registry when docker toolbox is uninstalled (it is no longer useful, and confuses programs that might check it for a docker toolbox installation)
...
Signed-off-by: Erik M. Bray <erik.bray@lri.fr >
2016-03-04 15:57:58 +01:00
Sebastiaan van Stijn
69004ff67e
Update links to Docker Hub
...
Updates links to Docker Hub with their new
URLs to prevent redirects.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-03-04 15:48:52 +01:00
Sebastiaan van Stijn
29bade2cd0
Merge pull request #20938 from runcom/split-daemon
...
integration-cli: move daemon stuff to its own file
2016-03-04 15:09:35 +01:00
Vincent Demeester
2787072a65
Try to fix #20942 TestContainerPsContext unit test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-03-04 14:20:41 +01:00
Antonio Murdaca
8142ebb0be
Merge pull request #20834 from rhatdan/relabelvolume
...
Do not relabel if user did not request it for non local volumes
2016-03-04 13:17:54 +01:00
Vijaya Kumar K
7d80d64ca5
arm64: Use gccgo as bootstrap for compiling golang
...
The issue is armv6 released binaries are used as a GOROOT_BOOTSTRAP.
This might work on arm64 platforms that support 32-bit mode.
However not all arm64 platforms support 32-bit mode. 32-bit mode
is optional for ARMv8. So use gccgo as bootstrap.
The build image is bumped to use ubuntu wily.
Signed-off-by: Vijaya Kumar K <vijayak@caviumnetworks.com >
2016-03-04 15:36:20 +05:30
Vincent Demeester
5f7941e412
Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs
...
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
2016-03-04 09:47:56 +01:00
Vincent Demeester
9bc62e6031
Merge pull request #20872 from duglin/Issue20470
...
Optimize .dockerignore when there are exclusions
2016-03-04 09:45:19 +01:00
Derek McGowan
c9880e6b05
Fetch token by credentials and refresh token
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-03-04 00:34:17 -08:00
Antonio Murdaca
9a9e2bb61d
integration-cli: move daemon stuff to its own file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-03-04 09:29:24 +01:00
David Gageot
fa986949e0
Merge pull request #3120 from daehyeok/Driver_env
...
DRIVER environment variable
2016-03-04 07:29:26 +01:00
Arnaud Porterie
ad2fa39459
Fix race in container creation
...
Only register a container once it's successfully started. This avoids a
race condition where the daemon is killed while in the process of
calling `libcontainer.Container.Start`, and ends up killing -1.
There is a time window where the container `initProcess` is not set, and
its PID unknown. This commit fixes the race Engine side.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2016-03-03 20:25:03 -08:00
Alexander Morozov
ea5acb08fa
Merge pull request #20854 from inatatsu/reduce-parsing-mountinfo
...
Eliminate redundant parsing of mountinfo
2016-03-03 19:48:32 -08:00
Wen Cheng Ma
312e20bf6c
Enhancement of TestDockerNetworkInternalMode
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-03-04 10:56:10 +08:00
Tatsushi Inagaki
e8513675a2
Aufs: reduce redundant parsing of mountinfo
...
Check whether or not the file system type of a mountpoint is aufs
by calling statfs() instead of parsing mountinfo. This assumes
that aufs graph driver does not allow aufs as a backing file
system.
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
2016-03-04 11:39:59 +09:00
Nishant Totla
313db93c08
Merge pull request #1925 from dongluochen/release-checklist-update
...
Update RELEASE-CHECKLIST.md
2016-03-03 18:22:22 -08:00