cf80bd3fa8
daemon: ensure systemd cgroup is passed down to runtimes
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7f88fca48ed34370238ee1b16a262be3ecea8cbe
Component: engine
2016-08-26 15:33:26 +02:00
908de2cc1b
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
Upstream-commit: 91fdafb79f1532de33e2e258446d6eab80fd0d53
Component: engine
2016-08-26 12:06:58 +02:00
2056c2799d
Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes
...
Update docker remote api to mention restart policy validation
Upstream-commit: 48ff20c79527096ab8ca9c4be6773e4133afc617
Component: engine
2016-08-26 07:57:53 +02:00
2aa34a7405
Merge pull request #25919 from yuexiao-wang/fix-refer
...
Remove the redundant words in reference for swarm
Upstream-commit: 72e7cd75c1f7a636b48774c3ba189cc8fd510138
Component: engine
2016-08-26 07:57:07 +02:00
c482fb6e34
Remove the redundant description
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8bcc8ebaccee981330a2e9b2bc9ad17c3a460d5d
Component: engine
2016-08-26 08:36:34 +08:00
de17e6a998
Merge pull request #25354 from dnephin/remove-mflag-from-dockerd
...
Convert docker and dockerd commands to spf13/cobra
Upstream-commit: 25587906d122c4fce0eb1fbd3dfb805914455f59
Component: engine
2016-08-25 17:19:19 -04:00
96bd4464ee
Merge pull request #25992 from anusha-ragunathan/legacy_cleanup
...
Cleanup handleLegacy logic.
Upstream-commit: 5761d8b342f0d6352f591968fbe20b4298c4de22
Component: engine
2016-08-25 17:13:47 -04:00
de5170b89d
Fixes #25918 - Changed --permissive to --privileged.
...
Signed-off-by: Rich Moyse <rich@moyse.us >
Upstream-commit: b63ce3305c1dd3aec307bbe3bfe0aead295137cb
Component: engine
2016-08-25 16:49:37 -04:00
4cad859c7a
Merge pull request #25978 from justincormack/no-no-gccgo
...
Remove gccgo support
Upstream-commit: 8d99dfbc69a18cbf1e604b845df76fdedcf2e853
Component: engine
2016-08-25 12:12:29 -07:00
9aa1f9aa60
Merge pull request #25896 from raksonibs/fix/docs_step_6
...
Email deprecation for step 6 of tutorial
Upstream-commit: 4e4ebbe34040f557775b59d111a8127f1f7df9a2
Component: engine
2016-08-25 21:06:20 +02:00
9f32495eeb
Cleanup fallback to V1 plugins logic.
...
handleLegacy is a flag to indicate whether daemon is supporting legacy
plugins. When the time comes to remove support for legacy plugins,
flipping this bool is all that will be needed to remove legacy plugin
support. This can be a global variable rather than be embedded in the
manager, thereby cleaning up code.
Also rename to allowV1PluginsFallback for clarity.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 031a2a5c4b58a153e6e76a573abfa6359d1c321a
Component: engine
2016-08-25 11:39:47 -07:00
e00aee44c1
Remove Username and Password prompt with login for Step six.
...
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com >
Upstream-commit: fbe222a35b764025f2585e65fd9119fa92359d4c
Component: engine
2016-08-25 14:23:45 -04:00
49618f0083
All supported Go versions have -cover now
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: f243bfbc9d3879be33946d92801cc0f3e7290b17
Component: engine
2016-08-25 18:24:35 +01:00
d02e9ecdd8
Merge pull request #25750 from talex5/spec
...
Document Healthcheck in image spec
Upstream-commit: 46cb1f2601afc2eb99cc31ced362d874c8c3c192
Component: engine
2016-08-25 17:23:51 +00:00
f0bf8347ee
Merge pull request #25888 from vdemeester/listcontainerfornode-refactoring
...
Move ListContainersForNode into cluster package
Upstream-commit: 29232a5d8e621ad2503b205cb5068cc14b2ee42b
Component: engine
2016-08-25 19:10:18 +02:00
8ad0a6fe8f
Fix tests and windows service.
...
Support args to RunCommand
Fix docker help text test.
Fix for ipv6 tests.
Fix TLSverify option.
Fix TestDaemonDiscoveryBackendConfigReload
Use tempfile for another test.
Restore missing flag.
Fix tests for removal of shlex.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6e7405ebd4df360bc84f651c977ece31283eb3ee
Component: engine
2016-08-25 13:09:36 -04:00
e263ef28d9
Remove old cli framework.
...
Also consolidate the leftover packages under cli.
Remove pkg/mflag.
Make manpage generation work with new cobra layout.
Remove remaining mflag and fix tests after rebase with master.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 14712f9ff0d20a3b64a60103608b8cc998909242
Component: engine
2016-08-25 13:09:04 -04:00
9d7fdddb73
Update unit tests for new cobra root command.
...
Cleanup cobra integration
Update windows files for cobra and pflags
Cleanup SetupRootcmd, and remove unnecessary SetFlagErrorFunc.
Use cobra command traversal
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 31bf9ca0c8cf29c1ba6cdc044e81c574161a0392
Component: engine
2016-08-25 13:09:04 -04:00
501f88a28e
Add testutil/tempfile
...
Improve error messages raised by assert.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7c556849aa7362cfa81ae316275e17eeb50bb52b
Component: engine
2016-08-25 13:09:03 -04:00
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
d13d215017
Update docker remote api to mention restart policy validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a011a94be7448ee86e28396246de73f646af3a93
Component: engine
2016-08-25 17:03:18 +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
4d71bb6be2
Remove gccgo support
...
Since Go 1.7, s390x uses upstream Go, so we have no reason to
support gccgo any more.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: eda90f63446253f97d2011926555306f2417d208
Component: engine
2016-08-24 11:09:35 +01: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
