Commit Graph

25145 Commits

Author SHA1 Message Date
3b8068c818 Check for non-nil container after match
There can be a race between getting the container ids for matches and
getting the actual container.  This makes sure that we check that the
container returned by `Get` is non-nil before adding it to the list of
matches.

Fixes #25991

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a020ec4c8b476a814eb137e216fe9d723524fc3b
Component: engine
2016-08-26 10:02:10 -07:00
be2930b6c9 Merge pull request #26045 from runcom/systemd-cgroup-fix
daemon: ensure systemd cgroup is passed down to runtimes
Upstream-commit: 1dc87122ccb69741a6de2c933aed2d48b0b482a8
Component: engine
2016-08-26 09:59:22 -07:00
a2fd7a06e8 Merge pull request #25650 from pwzgorilla/master
replace `handleWithGlobalMiddlewares` with `handlerWithGlobalMiddlewa…
Upstream-commit: e875370af81474d9df09433404ef79e403ba1b2f
Component: engine
2016-08-26 09:51:51 -07:00
54cfd027ab Merge pull request #24514 from cpuguy83/fix_log_follow_rotate
Fix issues with tailing rotated jsonlog file
Upstream-commit: cbd4e4d48ae2edda79be962f6136c6ae9edad7b9
Component: engine
2016-08-26 09:47:40 -07:00
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
7f172d7bce change comment
Signed-off-by: mgniu <mgniu@dataman-inc.com>
Upstream-commit: c5ecf1e6fe98cbf9a20d59f9ca5eb69f9c72210b
Component: engine
2016-08-26 18:30:41 +08: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
7045275ed8 Update documentation for validation of --ip and ip6.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 5118dd2992aef27890203b7e8eb62fc5f507d931
Component: engine
2016-08-25 22:11:56 -07:00
6068b202c6 Validate --ip and --ip6 for docker create
This fix tries to fix the issue raised in 25863 where `--ip` value
is not validated for `docker create`. As a result, the IP address
passed by `--ip` is not used for `docker create` (ignored silently).

This fix adds validation in the daemon so that `--ip` and  `--ip6`
are properly validated for `docker create`.

An integration test has been added to cover the changes.

This fix fixes 25863.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c7045eb93523df76feb9f3e00540e69471a1855e
Component: engine
2016-08-25 22:11:23 -07:00
0c629aa456 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
Update docs for `docker create` to include `--rm` flag
Upstream-commit: 91ec7fa811c7476b7c20e3b95a92ea9062d498fa
Component: engine
2016-08-26 09:06:30 -04:00
da5307e5c4 Merge pull request #26035 from sakeven/fmt_dockerfile_error_message
Fmt dockerfile error message
Upstream-commit: 06829ce8d65d8dc581f3a62adf3fe8d189439ed4
Component: engine
2016-08-26 14:47:22 +02:00
cf918862de fmt dockerfile error message
Signed-off-by: sakeven <jc5930@sina.cn>
Upstream-commit: 7d75e42bc9d0f19f8829b65634495965f02e89a3
Component: engine
2016-08-26 18:36:30 +08:00
32f7fca331 Update docs for docker create to include --rm flag
Since 20848 has been merged and both `docker create` and
`docker run` share the same `runconfig` parser, now both
`docker run` and `docker create` allow to specify the
`--rm` flag. However, docs for `docker create` has not
been udpated yet.

This fix updates docs for `docker create` so that `--rm`
flag has been included.

This fix is related to 20848 and 25577.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d7468cff4d672f118cb12a6b169c3098ea620b7e
Component: engine
2016-08-25 22:05:38 -07: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