Commit graph

26777 commits

Author SHA1 Message Date
Daniel Nephin
fb83394714 Convert dockerd to use cobra and pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-25 13:09:03 -04:00
Daniel Nephin
ac40179e8a Update spf13/cobra vendor to v1.4.1
Support command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-25 13:09:03 -04:00
Charles Smith
dee3044336 Merge pull request #25781 from sfsmithcha/add_ingress_guide
author merge: add ingress / publish port guide
2016-08-25 10:06:11 -07:00
Vincent Demeester
0c6926070f Merge pull request #25816 from anusha-ragunathan/vol-plugin-list
Make `docker volume list` lookup plugins installed using new model.
2016-08-25 19:02:25 +02:00
Vincent Demeester
a36016cd3a Merge pull request #25481 from keloyang/build-args-docker-env
Add DOCKER_BUILD_ARGS to DOCKER_ENVS in Makefile
2016-08-25 18:56:08 +02:00
Brian Goff
95fca642a1 Merge pull request #26008 from resin-os/fix-btrfs-check
check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
2016-08-25 12:39:35 -04:00
Charles Smith
465fd93f1c add ingress / publish port guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-25 09:24:45 -07:00
Brian Goff
15f3d060ac Merge pull request #24153 from frodenas/syslog-fix
Syslog Driver: RFC 5425 Message Framing should be used only when protocol is TCP+TLS
2016-08-25 12:15:06 -04:00
Alexander Morozov
78771b6225 Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
2016-08-25 09:12:31 -07:00
Vincent Demeester
aff33055ac Merge pull request #25996 from yuexiao-wang/fix-docker-daemon
Replace docker command from 'docker daemon' to 'dockerd'
2016-08-25 17:58:00 +02:00
Vincent Demeester
d13ad3ef76 Merge pull request #24073 from johnharris85/move-restart-policy-check-to-daemon
Move restart-policy validation from client to daemon.
2016-08-25 17:02:30 +02:00
Vincent Demeester
8ebb7dba8b Merge pull request #25920 from coolljt0725/fix_inspect_dead
Fix inspect Dead container
2016-08-25 17:00:59 +02:00
Brian Goff
7250dd4222 Merge pull request #26013 from ShawnHe711/correct-nit-in-command-annotation
correct command annotation
2016-08-25 10:39:42 -04:00
Brian Goff
e32e0a6cdc Merge pull request #26010 from allencloud/fix-rm-plugin-arg-num
fix rm plugin arg number to be min 1
2016-08-25 10:38:49 -04:00
shawnhe
b642282990 correct command annotation
Signed-off-by: shawnhe <shawnhe@shawnhedeMacBook-Pro.local>
2016-08-25 21:29:59 +08:00
allencloud
d527149064 fix rm plugin arg number to be min 1
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-25 20:53:49 +08:00
Andrei Gherzan
1c886a70df 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>
2016-08-25 13:20:18 +01:00
yuexiao-wang
530668cb22 Replace docker command from 'docker daemon' to 'dockerd'
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-25 17:04:44 +08:00
Brian Goff
4844d13bd7 Merge pull request #25933 from dtrott/25932-container-name
Added the word "container" to clarify the error message.
2016-08-24 16:15:10 -04:00
Vincent Demeester
4d590ba44a Merge pull request #25967 from valgaze/feat/lewin
Add Daniel Lewin to names collection
2016-08-24 20:28:55 +02:00
Vincent Demeester
cb26cfd07c Merge pull request #25883 from justincormack/manpages-s390x
Add a Dockerfile for generating manpages on s390x
2016-08-24 20:23:52 +02:00
Vincent Demeester
4a1b048c15 Merge pull request #25959 from estesp/fail-on-graphdir-perms
Don't start daemon in userns mode if graphdir inaccessible
2016-08-24 20:15:58 +02:00
Michael Crosby
c8b55c19cf Merge pull request #24969 from runcom/fix-network-info
daemon: no map[string]bool from GetNetworkDriverList
2016-08-24 09:49:06 -07:00
Daniel Nephin
b29558ed5d Merge pull request #25426 from dnephin/better-int-testing-cmd
Remove duplicate RunCommand functions used for integration-cli
2016-08-24 11:34:24 -04:00
Phil Estes
43a1df6be2
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>
2016-08-24 11:25:30 -04:00
Phil Estes
76a416ac37
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>
2016-08-24 11:25:26 -04:00
Antonio Murdaca
7ca635a1ec
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>
2016-08-24 16:02:15 +02:00
Justin Cormack
a110512e38 Merge pull request #25963 from yuexiao-wang/fix-repo
Modify incorrect repository URL
2016-08-24 10:57:10 +01:00
Justin Cormack
fe125adb0f Merge pull request #25905 from yongtang/25000-docker-stats-NetworkDisabled
Fix issue in `docker stats` with `NetworkDisabled=true`
2016-08-24 10:53:56 +01:00
Justin Cormack
f77dfd591b Merge pull request #25965 from yongtang/25927-authz-plugin-headers
Fix AuthZ plugins headers change issue
2016-08-24 10:52:27 +01:00
Victor Algaze
479b793a3e Add Joan Clarke to name collection
Signed-off-by: Victor Algaze <valgaze@gmail.com>
2016-08-24 01:58:48 -07:00
Victor Algaze
bc0e2f1a6e Add Daniel Lewin to names collection
Signed-off-by: Victor Algaze <valgaze@gmail.com>
2016-08-23 23:24:29 -07:00
Yong Tang
9cb8fb6ea0 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>
2016-08-23 21:08:23 -07:00
yuexiao-wang
ad4efd3349 Modify incorrect repository URL
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-24 10:09:33 +08:00
Brian Goff
8c5c2842ba Merge pull request #25903 from anusha-ragunathan/windows_plugin_spec
Add spec file support for Windows plugin discovery.
2016-08-23 19:45:54 -04:00
Yong Tang
7bb9c5397e 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>
2016-08-23 16:04:06 -07:00
Justin Cormack
b5b8ec9aeb Merge pull request #25956 from LK4D4/vet_embedded
Dockerfile: do not install vet and cover
2016-08-24 00:01:29 +01:00
Vincent Demeester
602b238136 Merge pull request #25948 from lixiaobing10051267/masterImages
get a redis-cli image while using docker pull
2016-08-23 21:44:26 +02:00
Vincent Demeester
c009e1b6ce Merge pull request #25941 from imnuh/patch-1
Change TMPDIR to DOCKER_TMPDIR
2016-08-23 21:44:03 +02:00
Daniel Nephin
243885808f 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>
2016-08-23 15:12:36 -04:00
Daniel Nephin
d7022f2b46 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>
2016-08-23 15:11:46 -04:00
Daniel Nephin
fb42e84772 Remove unnecessary json.Unmarshal wrapper.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-08-23 15:11:46 -04:00
Tõnis Tiigi
0b2ff0ccde Merge pull request #25946 from lixiaobing10051267/masterDockerImages
Incorrect response field name for command "docker images"
2016-08-23 11:19:52 -07:00
Alexander Morozov
08c16f8abf 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>
2016-08-23 11:08:31 -07:00
Alexander Morozov
20213c6588 Merge pull request #25954 from michael-holzheu/PR-s390x-gccgo61-to-golang17
Dockerfile.s390x: Switch to golang 1.7
2016-08-23 11:00:50 -07:00
Michael Crosby
684d3f0c9c Merge pull request #24740 from jizhilong/devmapper-deferred-remove
devmapper: prevent libdevmapper from deleting /dev/mapper/docker-xxx symbolic links in RemoveDeviceDeferred
2016-08-23 10:23:37 -07:00
Ji.Zhilong
5e505d101f 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>
2016-08-23 23:58:53 +08:00
Michael Holzheu
ee59f25c2d 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>
2016-08-23 08:20:20 -04:00
Vincent Demeester
b97f985054 Merge pull request #25939 from YuPengZTE/printf
It is better to add "\n" in printf
2016-08-23 10:26:54 +02:00
Vincent Demeester
442da0d8aa Merge pull request #25793 from yuexiao-wang/clean-makefile
Clean up the Makefile
2016-08-23 09:43:25 +02:00