565ec12cc7
add how pki works topic
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 5ca3e6e61f5537fa637de9436881402a929bea77
Component: engine
2016-09-06 10:39:52 -07:00
300565157d
Merge pull request #26225 from yongtang/26173-docker-import-quoted-change
...
Fix issue in `docker import -c` with quoted flags
Upstream-commit: 2e0bc0393a7a8f912e0d05d1806c770c1c8c6790
Component: engine
2016-09-02 13:34:25 -04:00
5aa0a2b82e
Merge pull request #26254 from tophj-ibm/change-ppc64le-dockerfile-to-golang
...
ppc64le: change dockerfile base from gcc to golang
Upstream-commit: 75f589a97945a31a5d36b8d348eeeb36e412151d
Component: engine
2016-09-02 10:05:39 -04:00
4f402c4255
Merge pull request #26264 from q384566678/test-two
...
Modify docker-restart.1.md
Upstream-commit: b98e918248f4d4880b707e24bf2f72878ffbb8d6
Component: engine
2016-09-02 15:53:19 +02:00
deca0aec9f
Merge pull request #26261 from Microsoft/jjh/morebuildtests
...
Windows CI: Enable some more build tests
Upstream-commit: 84ebbb52314433d4724ad9c75c7d04e886fb59bd
Component: engine
2016-09-02 09:41:08 -04:00
7f24fbc8dc
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
Upstream-commit: 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55
Component: engine
2016-09-02 12:39:31 +02:00
c789417f1c
update docs/reference/commandline/service_create.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aa479616822e4e6ecd9d90425f11f76cd26ce70d
Component: engine
2016-09-02 09:59:20 +00:00
e92f9d7cac
Merge pull request #24510 from runcom/new-seccomp-format
...
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
2016-09-02 09:14:01 +01:00
6a651a8e95
Modify docker-restart.1.md
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: b99cf0de47420794049f8a208b78fb8be8398f77
Component: engine
2016-09-02 13:06:08 +08:00
e2707394d0
Fix issue in docker import -c with quoted flags
...
This fix tries to address the issue in 26173 where `docker import -c`
with quoted flags returns an error.
The issue was that in `api/client/image/import.go` the flag
`--change/-c` was handled by `StringSliceVarP` which does not handle
the quote well.
The similiar issue was enountered for 23309 (`docker commit`).
This fix takes the same approach as 23309 where `StringSliceVarP`
was replaced with `VarP` and `opts.ListOpts`.
An integration test has been added to cover the changes.
This fix fixes 26173.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a
Component: engine
2016-09-01 16:28:22 -07:00
9968a690ca
Windows CI: Enable some more build tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ede6163ec684efd04faffa8ce6d7f4213fe08c75
Component: engine
2016-09-01 16:27:04 -07:00
949c541343
ppc64le: change dockerfile base from gcc to golang
...
Now that gccgo isn't supported, change the ppc64le dockerfile base image
from a debian:jessie based + gccgo image to a debian:jessie + golang image.
Also includes a go path change to be more consistent across Dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: a243f35cf8906dc6d541dc3dd779a0a2c90cfa12
Component: engine
2016-09-01 16:51:11 -04:00
9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
a7538f7929
Merge pull request #26242 from YuPengZTE/devEG
...
"eg." should be "e.g."
Upstream-commit: baf2108baf8f4ff504847224cfb00794dfea5c20
Component: engine
2016-09-01 20:46:46 +02:00
19ba10b1b0
Merge pull request #26172 from Microsoft/jjh/testinspect
...
Windows: Enable multiple TestInspect tests
Upstream-commit: a19bdec6f0f2ca1b7539f701583f2f33f1923a2c
Component: engine
2016-09-01 19:46:19 +02:00
a1893f6374
Merge pull request #26077 from runcom/fix-TestImportBadURL
...
integration-cli: fix TestImportBadURL w/o network
Upstream-commit: 83fc63f9678cd1233bb0f86591a558acada621ac
Component: engine
2016-09-01 09:30:02 -07:00
9c1528efb8
Merge pull request #26226 from YuPengZTE/devTest
...
The first letter should be small in errors.New
Upstream-commit: 8abaf62715fab8422f20a28af2ff848223898839
Component: engine
2016-09-01 17:28:32 +02:00
009555a4b2
New seccomp format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
2016-09-01 11:53:07 +02:00
a03ebc79ee
Merge pull request #26200 from runcom/engine-api-vendor
...
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
2016-09-01 10:51:34 +01:00
ec1fcdb2ef
eg. should be e.g.
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e4ac375fdbf331a8474c3b9a33be21a6434d5eb6
Component: engine
2016-09-01 17:44:35 +08:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
d73fb19f36
Merge pull request #26180 from yongtang/25943-validate-ip6
...
Fix issue in `--ip6` validation for `docker create`
Upstream-commit: f173555de8201d8b4a6578a52d405655212fbb5d
Component: engine
2016-09-01 11:02:16 +02:00
861fb5fa76
Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon
...
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
Upstream-commit: b8d510e86ad6a70aad09442b89e0e984b14e0c72
Component: engine
2016-09-01 09:42:59 +02:00
c484c505e6
The first letter should be small in errors.New
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: e7935da2390bf458f07e9898f08a332ef9f53255
Component: engine
2016-09-01 11:26:40 +08:00
be784b745a
Merge pull request #26186 from ywk253100/master
...
Fixes #25654 , a bug in implements of loading image
Upstream-commit: 7776a0ebd76d7d69fb8198554e30a51d94edf056
Component: engine
2016-08-31 22:07:01 -04:00
436151d741
Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
...
cluster: Do not autodetect advertise address on join
Upstream-commit: beba6ea311fdff128ac2f1de78138c5da71d0f23
Component: engine
2016-08-31 17:19:23 -07:00
d6cc83cde2
Merge pull request #26208 from talex5/fix-health-test
...
Fix exec form of HEALTHCHECK CMD
Upstream-commit: 5a56f29c64ab1a2bb4f70ba65f248cd8fcebc57f
Component: engine
2016-08-31 23:27:39 +00:00
17a1a5ab1b
Merge pull request #26214 from tonistiigi/revert-daemonsuite-fix
...
Revert "Change related tests from DockerSuite to DockerDaemonSuite in…
Upstream-commit: bdae52a23dd69be29f0d5b871ee791180329e458
Component: engine
2016-08-31 14:16:39 -07:00
1965814a4e
vendor docker/engine-api@f9cef59044
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
2016-08-31 22:39:13 +02:00
5fcc71ddc8
Merge pull request #26206 from crosbymichael/py-xunit
...
Output docker-py test results in xunit format
Upstream-commit: 243d4dcc7e9ea3eb665301d5e3756afa4adb04f7
Component: engine
2016-08-31 21:48:47 +02:00
6366d986f8
Merge pull request #26191 from runcom/fix-unknownflag-exit-code
...
api: client: container: update: fix help text
Upstream-commit: 6ac30e57d0c3060478a04352b19e4188a8d0cc3e
Component: engine
2016-08-31 21:15:51 +02:00
9a5643d969
Merge pull request #26058 from anusha-ragunathan/add-pluginstore
...
Reorganize plugin package into sub packages.
Upstream-commit: e3bc989a9d14f2c47eab7874fad2865d0906b9ea
Component: engine
2016-08-31 11:58:34 -07:00
5b72529835
Revert "Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go"
...
This reverts commit 0ce5ef279cee13e92d696ae871fe81de37cec253.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f0e99972877f06904e0327e9537de8390b5cfb4b
Component: engine
2016-08-31 11:52:22 -07:00
b88197c265
cluster: Do not autodetect advertise address on join
...
On join, remote addresses are supposed to be detected by the manager
that receives the join request. However, the daemon is interfering with
this by automatically detecting an advertise address and specifying that
to the remote manager. Fix this so that an advertise address is only
specified while joining a cluster if one was given by the user.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: b1d2b088533187954d3b98ed5951ec2dbbb422e9
Component: engine
2016-08-31 11:44:32 -07:00
22f7fc770f
Fix exec form of HEALTHCHECK CMD
...
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.
Added a test to detect this.
Fixes #26174
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com >
Upstream-commit: e95b6b51daed868094c7b66113381d5088e831b4
Component: engine
2016-08-31 17:50:12 +01:00
abf975f617
Output docker-py test results in xunit format
...
This adds a `results.xml` to the test-docker-py output folder.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a9e513867cd9eb327ae56877886ed18a5ad5b691
Component: engine
2016-08-31 09:35:49 -07:00
161e8a294e
Merge pull request #25616 from rhatdan/overlay_selinux
...
Linux upstream kernel Overlay file systems support SELinux
Upstream-commit: b42ab41b8f0c9077180686191c0dccda9fb1a5b6
Component: engine
2016-08-31 09:25:20 -07:00
c03a13f697
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
Upstream-commit: ad6f5a49d5f24f8b64def11176b6c8df162d839f
Component: engine
2016-08-31 16:37:50 +01:00
6f341d34b6
Windows: Enable multiple TestInspect tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3ae6cd453ece9761a951efd839cf917078b03718
Component: engine
2016-08-31 08:12:50 -07:00
5645fa8e4e
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
Upstream-commit: ba23bf202adab9f4b8c9dcaffeddfd130674fb15
Component: engine
2016-08-31 14:45:42 +02:00
f9a92ea425
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
Upstream-commit: cf699ad427084076c7ca1ea5fbab78cd77597f2a
Component: engine
2016-08-31 14:42:03 +02:00
a2a77498bf
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
Upstream-commit: 37fd1416daac0b3963dc812a820b844e9e854e59
Component: engine
2016-08-31 14:41:49 +02:00
33fbdef4b0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
Upstream-commit: 670eaa71a0629323327cb5604c44abf14890d4b4
Component: engine
2016-08-31 14:41:22 +02:00
4b86079014
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
Upstream-commit: 0414a2c1a960832cc6d3df8641f23952c3700084
Component: engine
2016-08-31 14:41:03 +02:00
d8db57f8be
make command "docker plugin inspect" complete
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d022bb208461dd1ed9702d8528eed627bc364258
Component: engine
2016-08-31 19:59:23 +08:00
7cfdadb657
api: client: container: update: fix help text
...
Before:
$ docker update --cpu-period
Status: flag needs an argument: --cpu-period
See 'docker update --help'., Code: 125
After:
$ docker update --cpu-period
flag needs an argument: --cpu-period
See 'docker update --help'.
Also remove flagErrorFunc function which isn't needed anymore.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c2c2617534685917c4a1c2367af861c598cc050a
Component: engine
2016-08-31 12:46:40 +02:00
3dedb3cd52
provide actual command format for docker network create
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 18a9600fb15b057af9d3574210b92cb107eefb24
Component: engine
2016-08-31 17:40:13 +08:00
8de2c11691
Update description for docker plugin inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: fdedc38f0c398a81360a90b627493872ef3c8a56
Component: engine
2016-08-31 16:57:44 +08:00
91ff731c41
Merge pull request #26188 from albers/completion-volume-create-name
...
Remove bash completion for `docker volume create --name`
Upstream-commit: 4e7cbb91f8bde7ca07db7d338c73f7dc7cd9c536
Component: engine
2016-08-31 16:57:32 +08:00
589e937fbd
Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
...
some fixes to clean up new plugin system docs
Upstream-commit: c1b82df74042a0290b995283c504b60ac6b4bc95
Component: engine
2016-08-31 10:43:02 +02:00
