6ab52f9f00
Add note that seccomp 2.2.1 or higher is required
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 21:26:03 +01:00
1573960dca
Merge pull request #20041 from calavera/missing_debug_client_info_doc
...
Add missing debug client mode info in docs.
2016-02-05 18:35:01 +01:00
4aac8a60b2
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-05 12:29:54 -05:00
e59922a557
Merge pull request #20032 from thaJeztah/fix-systemd-404
...
Fix incorrect alias for systemd docs
2016-02-05 08:26:15 -08:00
039a155ffa
Merge pull request #20031 from hypriot/fix-typo-chocolatey
...
Fix typo in Chocolatey
2016-02-05 16:25:21 +01:00
50dba63845
Fix incorrect alias for systemd docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 16:18:26 +01:00
4688efc3ed
Fix typo in Chocolatey
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-02-05 16:15:20 +01:00
d13e8d8446
Merge pull request #20028 from tomxtobin/fix-man-typo
...
Fix typo in config-json man page
2016-02-05 15:56:06 +01:00
c75581c855
Fix typo in config-json man page
...
In the NAME section: "confg.json" -> "config.json"
Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
2016-02-05 09:52:01 -05:00
98aa1d24a3
Merge pull request #20010 from thaJeztah/update-release-checklist
...
Release checklist - bump versions earlier
2016-02-04 18:07:06 -08:00
d4c8d0519d
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
2016-02-04 18:06:30 -08:00
675fe313ee
Merge pull request #20009 from anusha-ragunathan/to-slash
...
Fix ReadAll to run on Windows.
2016-02-04 19:58:20 -05:00
2da5ad3bb0
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
2016-02-04 16:07:42 -08:00
3f869bfe78
Merge pull request #20013 from thaJeztah/fix-migration-header
...
Fix Header on migration page
2016-02-05 00:51:13 +01:00
0a6e0c43d9
Fix Header on migration page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-05 00:35:49 +01:00
96c5221626
Move base image selection to a utility function
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-04 15:06:34 -08:00
354dabf3ca
Release checklist - bump versions earlier
...
Bump both API and VERSION directly after the release
branch is created. All changes to master after that
are (by default) for the *next* release.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-04 23:45:49 +01:00
691555fc8b
Fix ReadAll to run on Windows.
...
filepath.Clean converts filenames to filenames with native path
separators. Use ToSlash to normalize.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-02-04 14:01:17 -08:00
18204ea616
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
2016-02-04 16:31:12 -05:00
da58ee42bb
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
2016-02-04 16:20:06 -05:00
9a9bbacae5
Merge pull request #20006 from tiborvass/merge_release_v1.10.0
...
Merge release v1.10.0
2016-02-04 12:48:10 -08:00
91028ad8f4
Change version to 1.11.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:44:35 -05:00
05adb0bdbb
Bump version to v1.10.0
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-04 15:39:02 -05:00
4a2122e020
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-04 11:59:13 -08:00
8038e32237
Merge pull request #19918 from WeiZhang555/restarting
...
Fix error for restarting container
2016-02-04 11:36:32 -08:00
fe53be4e17
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
d8355ead9e
Vendor engine-api, go-connections and go-winio.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
61464701fa
Merge pull request #19727 from pandrew/improve_test-deb-install
...
improve test-deb-install
2016-02-04 10:09:47 -08:00
620b8250e8
improve test-deb-install
...
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
add directory test
Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
fix indent
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-02-04 18:14:08 +01:00
60821c6dfd
Merge pull request #19997 from boucher/patch-2
...
Pass KEEPBUNDLE in Docker build environment.
2016-02-04 08:37:12 -08:00
3329c94e25
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
2016-02-04 08:33:07 -08:00
e2bfedbc40
Merge pull request #19998 from estesp/remove-stray-printf
...
Remove stray printf
2016-02-04 08:29:11 -08:00
a1b07a8010
Merge pull request #19999 from thaJeztah/carry-19668-wheezy-journald
...
(carry 19668) don't try to install journald driver on wheezy
2016-02-04 07:44:42 -08:00
6c2b014d5e
dont try to install journald driver on wheezy
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-04 16:22:23 +01:00
77590d4dae
Remove stray printf
...
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-04 10:13:31 -05:00
d23778168d
Pass KEEPBUNDLE in Docker build environment.
...
This is an alternate solution to the problem described in #19969 .
Signed-off-by: Ross Boucher <rboucher@gmail.com>
2016-02-04 09:42:41 -05:00
fe6b88e3fa
integration-cli: fix minimum and default api version test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-04 13:58:08 +01:00
3c0a91d227
Fix error for restarting container
...
Fix error message for `--net container:b` and `--ipc container:b`,
container `b` is a restarting container.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-04 20:14:50 +08:00
38e774d32c
Merge pull request #19949 from Microsoft/jjh/testapiresize
...
Windows CI: Port docker_api_resize_test.go
2016-02-04 10:11:32 +01:00
c199506b59
Display `internal` flag on `network inspect`
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-02-04 15:28:37 +08:00
4080ce35e0
Windows CI: Port docker_api_resize_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-03 20:30:06 -08:00
66a4e557f9
Merge pull request #19702 from tiborvass/host-specific-passthru-token
...
Add test to make sure the new registry pass-thru token is only sent to the intended hosts
2016-02-03 21:57:32 -05:00
a03e85b448
Merge pull request #19877 from HackToday/fixdoc
...
Add support details for storage driver
2016-02-04 03:07:15 +01:00
d47812dd1d
Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
...
Wait to fire start event until socket is created
2016-02-03 17:38:52 -08:00
dcde68b955
Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
...
Fix error message for pause a restarting container
2016-02-03 17:34:19 -08:00
f0a58947ab
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
2016-02-03 20:33:52 -05:00
e74c07b947
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
2016-02-03 17:32:14 -08:00
feab8b179e
Add support details for storage driver
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-04 00:51:02 +00:00
ea4086ea91
Merge pull request #19982 from tianon/seccomp-completion
...
Add some basic bash completion for seccomp values
2016-02-03 16:15:12 -08:00
76a765140e
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-03 14:44:55 -08:00
Sebastiaan van Stijn
Sebastiaan van Stijn
David Calavera
moxiegirl
Stefan Scherer
Tom X. Tobin
Brian Goff
Jess Frazelle
Darren Stahl
Anusha Ragunathan
Tibor Vass
Tibor Vass
John Howard
Tianon Gravi
Paul Liljenberg
Phil Estes
Ross Boucher
Antonio Murdaca
Zhang Wei
Antonio Murdaca
Chun Chen
Kai Qiang Wu(Kennan)
Madhu Venugopal