Commit Graph

25108 Commits

Author SHA1 Message Date
8c3fcf2de5 Convert docker root command to use pflag and cobra
Fix the daemon proxy for cobra commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0452ff5a4dd1b8fba707235d6f12a4038208f34b
Component: engine
2016-08-25 13:09:03 -04:00
894a7b4b95 Convert dockerd to use cobra and pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fb83394714a9797f8ca5a08023a89560ce6c4aa3
Component: engine
2016-08-25 13:09:03 -04:00
253b72c341 Update spf13/cobra vendor to v1.4.1
Support command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ac40179e8a2780af45eaa78ab18607377ceca0e8
Component: engine
2016-08-25 13:09:03 -04:00
8d1480427f Merge pull request #25781 from sfsmithcha/add_ingress_guide
author merge: add ingress / publish port guide
Upstream-commit: dee30443368b9ed8046733242410b8c32550ce0d
Component: engine
2016-08-25 10:06:11 -07:00
87a50d0cba Merge pull request #25816 from anusha-ragunathan/vol-plugin-list
Make `docker volume list` lookup plugins installed using new model.
Upstream-commit: 0c6926070f775987de19e34e6f8da95cae156195
Component: engine
2016-08-25 19:02:25 +02:00
904fc9b879 Merge pull request #25481 from keloyang/build-args-docker-env
Add DOCKER_BUILD_ARGS to DOCKER_ENVS in Makefile
Upstream-commit: a36016cd3a883aa7603251aeff0a259555235bb5
Component: engine
2016-08-25 18:56:08 +02:00
6d81343bdb Merge pull request #26008 from resin-os/fix-btrfs-check
check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
Upstream-commit: 95fca642a1cdb70f27c01a4595e12e9109bed0f7
Component: engine
2016-08-25 12:39:35 -04:00
96374eb25c add ingress / publish port guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 465fd93f1ca474320f8ef0082483b05c3bb48d7b
Component: engine
2016-08-25 09:24:45 -07:00
385734b9bc Merge pull request #24153 from frodenas/syslog-fix
Syslog Driver: RFC 5425 Message Framing should be used only when protocol is TCP+TLS
Upstream-commit: 15f3d060ace45384ed5f549eecf2bc8919a82f7f
Component: engine
2016-08-25 12:15:06 -04:00
a0d759f31d Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00
8e2011a533 Merge pull request #25996 from yuexiao-wang/fix-docker-daemon
Replace docker command from 'docker daemon' to 'dockerd'
Upstream-commit: aff33055ac138e09ef693c8d07ea005cde55e025
Component: engine
2016-08-25 17:58:00 +02:00
84a36bbfd3 Merge pull request #24073 from johnharris85/move-restart-policy-check-to-daemon
Move restart-policy validation from client to daemon.
Upstream-commit: d13ad3ef7684bf330cec2eaa4a14048e3fbc2d94
Component: engine
2016-08-25 17:02:30 +02:00
33b0fc15a4 Merge pull request #25920 from coolljt0725/fix_inspect_dead
Fix inspect Dead container
Upstream-commit: 8ebb7dba8b25ff3a418791b2df8e3add2b40a669
Component: engine
2016-08-25 17:00:59 +02:00
63791b41d4 Merge pull request #26013 from ShawnHe711/correct-nit-in-command-annotation
correct command annotation
Upstream-commit: 7250dd4222fa253807a5b0f30dda65a97299e80a
Component: engine
2016-08-25 10:39:42 -04:00
897e3717eb correct command annotation
Signed-off-by: shawnhe <shawnhe@shawnhedeMacBook-Pro.local>
Upstream-commit: b642282990fe19f1dd7add0313c05cd139c52819
Component: engine
2016-08-25 21:29:59 +08:00
5d21e92692 fix rm plugin arg number to be min 1
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d5271490649eb60dd705598b072d1bda66d8d16e
Component: engine
2016-08-25 20:53:49 +08:00
776912e30d check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
docker is trying to set system.posix_acl_access but using BTRFS this fails if
CONFIG_BTRFS_FS_POSIX_ACL is not activated.

Signed-off-by: Andrei Gherzan <andrei@resin.io>
Upstream-commit: 1c886a70df9820e58caa14789d9ad37c366026d9
Component: engine
2016-08-25 13:20:18 +01:00
c65cef03da Replace docker command from 'docker daemon' to 'dockerd'
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 530668cb2262fc89e60a23d9a0f6555498b0171b
Component: engine
2016-08-25 17:04:44 +08:00
96297e96b5 Merge pull request #25933 from dtrott/25932-container-name
Added the word "container" to clarify the error message.
Upstream-commit: 4844d13bd73bbd35a548d3121d3d87844469b013
Component: engine
2016-08-24 16:15:10 -04:00
3a9a2cf24a Merge pull request #25967 from valgaze/feat/lewin
Add Daniel Lewin to names collection
Upstream-commit: 4d590ba44a983ad881a2b44d8cd6ad6ebc5c6935
Component: engine
2016-08-24 20:28:55 +02:00
b764a5f09c Merge pull request #25883 from justincormack/manpages-s390x
Add a Dockerfile for generating manpages on s390x
Upstream-commit: cb26cfd07c6860b4beefcd254b06a90b3ac2b96d
Component: engine
2016-08-24 20:23:52 +02:00
598c701bb9 Merge pull request #25959 from estesp/fail-on-graphdir-perms
Don't start daemon in userns mode if graphdir inaccessible
Upstream-commit: 4a1b048c1539ca67c8be5fd3d12fe10f65ee600e
Component: engine
2016-08-24 20:15:58 +02:00
5a989822df Merge pull request #24969 from runcom/fix-network-info
daemon: no map[string]bool from GetNetworkDriverList
Upstream-commit: c8b55c19cf92ef98cabec23e20c9244cfc1037f5
Component: engine
2016-08-24 09:49:06 -07:00
3db3e5b8dc Merge pull request #25426 from dnephin/better-int-testing-cmd
Remove duplicate RunCommand functions used for integration-cli
Upstream-commit: b29558ed5d68712a40d840e289ada232f912659f
Component: engine
2016-08-24 11:34:24 -04:00
b5333a8cfd Don't start daemon in userns mode if graphdir inaccessible
Warn the user and fail daemon start if the graphdir path has any
elements which will deny access to the remapped root uid/gid.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 43a1df6be2fa0c76b521680bbd5dc84db2cfd898
Component: engine
2016-08-24 11:25:30 -04:00
bc4f1a4d25 Add system.Stat support for darwin/macOS
darwin had unbuildable support for our system.Stat() implementation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 76a416ac37e5bd184990c93ed19aa6fa544b7b03
Component: engine
2016-08-24 11:25:26 -04:00
de8125122b daemon: no map[string]bool from GetNetworkDriverList
No user of GetNetworkDriverList needs to access the map by key.
The only user of GetNetworkDriverList is in docker info and with a map
the network list is always flipping because loop is not deterministic.
Fix this by returning a string slice which instead is.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 7ca635a1ec2962358a5f7d3c021faca83ff5e55f
Component: engine
2016-08-24 16:02:15 +02:00
9c432cb95d Merge pull request #25963 from yuexiao-wang/fix-repo
Modify incorrect repository URL
Upstream-commit: a110512e38a14e938096fe18b345e8f920605b9f
Component: engine
2016-08-24 10:57:10 +01:00
f52ef9bb09 Merge pull request #25905 from yongtang/25000-docker-stats-NetworkDisabled
Fix issue in `docker stats` with `NetworkDisabled=true`
Upstream-commit: fe125adb0f12121836ec55ebae0723410a9ed790
Component: engine
2016-08-24 10:53:56 +01:00
c95e648ece Add Joan Clarke to name collection
Signed-off-by: Victor Algaze <valgaze@gmail.com>
Upstream-commit: 479b793a3efa1b07a9620ddd60c065c6b06e07c3
Component: engine
2016-08-24 01:58:48 -07:00
cddca309b9 Add Daniel Lewin to names collection
Signed-off-by: Victor Algaze <valgaze@gmail.com>
Upstream-commit: bc0e2f1a6ebf6f9235ee8aa921570533db1ec57a
Component: engine
2016-08-23 23:24:29 -07:00
1a72f2bb5c Fix AuthZ plugins headers change issue
This fix tries to address the issue raised in 25927 where
the HTTP headers have been chaged when AUthZ plugin is in
place.

This issue is that in `FlushAll` (`pkg/authorization/response.go`),
the headers have been written (with `WriteHeader`) before all the
headers have bee copied.

This fix fixes the issue by placing `WriteHeader` after.

A test has been added to cover the changes.`

This fix fixes 25927

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9cb8fb6ea03fcd78010ce7dd33585d96cd73e38c
Component: engine
2016-08-23 21:08:23 -07:00
9759475f7f Modify incorrect repository URL
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: ad4efd334962b21f287cf02f2685403ae64a3659
Component: engine
2016-08-24 10:09:33 +08:00
6f1ee045aa Merge pull request #25903 from anusha-ragunathan/windows_plugin_spec
Add spec file support for Windows plugin discovery.
Upstream-commit: 8c5c2842ba8a6d4ec74b20fc703730eca60aeffb
Component: engine
2016-08-23 19:45:54 -04:00
3a11a917d1 Fix issue in docker stats with NetworkDisabled=true
This fix tries to address the issue in 25000 where `docker stats`
will not show network stats with `NetworkDisabled=true`.

The `NetworkDisabled=true` could be either invoked through
remote API, or through `docker daemon -b none`.

The issue was that when `NetworkDisabled=true` either by API or
by daemon config, there is no SandboxKey for container so an error
will be returned.

This fix fixes this issue by skipping obtaining SandboxKey if
`NetworkDisabled=true`.

Additional test has bee added to cover the changes.

This fix fixes 25000.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7bb9c5397e69866fcb1142cda430b842a710f751
Component: engine
2016-08-23 16:04:06 -07:00
11599d2a8c Merge pull request #25956 from LK4D4/vet_embedded
Dockerfile: do not install vet and cover
Upstream-commit: b5b8ec9aebab072069fe341516183c90e5077f01
Component: engine
2016-08-24 00:01:29 +01:00
c167cd9e31 Merge pull request #25948 from lixiaobing10051267/masterImages
get a redis-cli image while using docker pull
Upstream-commit: 602b2381360cf59fffe46b64bb4bdfa180639c44
Component: engine
2016-08-23 21:44:26 +02:00
75ea7f0fdf Merge pull request #25941 from imnuh/patch-1
Change TMPDIR to DOCKER_TMPDIR
Upstream-commit: c009e1b6cef474075a49e43ef9a38abb548da0fb
Component: engine
2016-08-23 21:44:03 +02:00
0d4234bb46 Change to use c.Assert() instead of result.Assert()
Fix delete containers and make sure it prints errors correctly.
Rename Result.Fails to Result.Assert()
Create a constant for the default expected.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 243885808f5c69143679d094d964d333c47e69bf
Component: engine
2016-08-23 15:12:36 -04:00
eaa727c6e2 Create a unified RunCommand function with Assert()
Remove some run functions and replace them with the unified run command.
Remove DockerCmdWithStdoutStderr
Remove many duplicate runCommand functions.
Also add dockerCmdWithResult()
Allow Result.Assert() to ignore the error message if an exit status is expected.
Fix race in DockerSuite.TestDockerInspectMultipleNetwork
Fix flaky test DockerSuite.TestRunInteractiveWithRestartPolicy

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d7022f2b46589cb9d860219e1d8278351ba147c3
Component: engine
2016-08-23 15:11:46 -04:00
2b0a71c4f1 Remove unnecessary json.Unmarshal wrapper.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fb42e8477208badf0714a9d8ae20946a9b531dba
Component: engine
2016-08-23 15:11:46 -04:00
1c5ac9c7e1 Merge pull request #25946 from lixiaobing10051267/masterDockerImages
Incorrect response field name for command "docker images"
Upstream-commit: 0b2ff0ccdef3327e52699941b2ab888f7fbecb1e
Component: engine
2016-08-23 11:19:52 -07:00
497f1fa7f5 Dockerfile: do not install vet and cover
They're included in go since 1.5.
Also I've removed comment about ancient gofmt version.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 08c16f8abfdc1f91119a35056c92d131b815fbf8
Component: engine
2016-08-23 11:08:31 -07:00
bb0ea3a731 Merge pull request #25954 from michael-holzheu/PR-s390x-gccgo61-to-golang17
Dockerfile.s390x: Switch to golang 1.7
Upstream-commit: 20213c65884d16a8bbe0438df65b8fba3e84a341
Component: engine
2016-08-23 11:00:50 -07:00
57eb7bf948 devmapper: prevent libdevmapper from deleting device symlinks in RemoveDeviceDeferred
if there is no cookie set in dm task, or flag DM_UDEV_DISABLE_LIBRARY_FALLBACK
is cleared for a DM_DEV_REMOVE task, libdevmapper will fallback to clean up the
symlink under /dev/mapper by itself, no matter the device removal is executed
immediately or deferred by the kernel.In some cases, the removal is deferred by the
kernel, while the symlink is deleted directly by libdevmapper, when docker tries to
activate the device again, the deferred removal will be canceld, but the symlink will
not show up again, so docker's attempt to mount the device by the symlink will fail,
and it will eventually leads to a `docker start/diff` error.

Fixes #24671

Signed-off-by: Ji.Zhilong <zhilongji@gmail.com>
Upstream-commit: 5e505d101f0201a4d045510d0a9b0c66697dedfe
Component: engine
2016-08-23 23:58:53 +08:00
f0da791a00 Dockerfile.s390x: Switch to golang 1.7
With golang version 1.7 the s390x architecture is officially supported.
To be in sync with the other architectures now switch also for s390x
from gccgo 6.1 to golang:

 - golang: build and install to /usr/src/go
   * Download golang-1.7 sources
   * Bootstrap with gccgo 6.1
 - go lint: Sync GO_LINT_COMMIT with other Dockerfiles
 - notary: Remove GO15VENDOREXPERIMENT and softlink hack

With this patch the current CI on s390x completes with:

 - OK: 1375 passed, 43 skipped

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: ee59f25c2d503cd68262679250387e140171c685
Component: engine
2016-08-23 08:20:20 -04:00
0a33808f15 Merge pull request #25939 from YuPengZTE/printf
It is better to add "\n" in printf
Upstream-commit: b97f985054b2eea3e9ee10cc8f10c5e61ded4f9b
Component: engine
2016-08-23 10:26:54 +02:00
94a1c4d159 Merge pull request #25793 from yuexiao-wang/clean-makefile
Clean up the Makefile
Upstream-commit: 442da0d8aa0538ec495881016b6516f59b6f4d63
Component: engine
2016-08-23 09:43:25 +02:00
492b23bc87 get a redis-cli image using docker pull
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 4f7195e3c91903c23e9e36c57955ca60fe0e71fa
Component: engine
2016-08-23 14:44:37 +08:00
7eccfab5d7 Incorrect response field name for command "docker images"
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 8eae3ceab8acbbd5b842f642bd12377bec4b5606
Component: engine
2016-08-23 14:24:31 +08:00