Commit Graph

25853 Commits

Author SHA1 Message Date
a5f27f2a75 Merge pull request #24507 from sfsmithcha/doc_node_labels
add ref docs for node label
Upstream-commit: 724c69f060ccf21088843ff00c3a8ba4dd966da8
Component: engine
2016-07-20 00:46:51 +02:00
d263002db2 add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9594ac97ce0c6e0777716be2a35b47208d440e8e
Component: engine
2016-07-19 15:41:00 -07:00
c9d322ff3f Merge pull request #24653 from dongluochen/testrollingupdate
Add integration test for rolling update
Upstream-commit: a9b392014f1ced4af6d3834a5e9f040c2eb6c8c2
Component: engine
2016-07-19 16:51:40 -04:00
4af08896ba Merge pull request #24049 from tophj-ibm/remove-lingering-volume-from-tests
DockerExternalVolumeSuite: add daemon to test
Upstream-commit: f2afd1a9062f47432afe858f9fc3fa5ad221003b
Component: engine
2016-07-19 22:39:39 +02:00
6c22592de6 Test rolling update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: d327765a62a99dc63e9a8c16ac291861cee066f3
Component: engine
2016-07-19 12:09:30 -07:00
fb96034315 Merge pull request #24801 from anusha-ragunathan/plugin-lookup
Remove extra map lookup for volume drivers.
Upstream-commit: 4498214a2adc16662d3ba1b40139a84412a5ec57
Component: engine
2016-07-19 20:52:39 +02:00
fcffdb424a Merge pull request #24802 from vdemeester/stack-docs-and-flags
Add documentation for stack commands
Upstream-commit: 2ee828aac25495e2ff61d48bd81a5d70d955a06a
Component: engine
2016-07-19 14:30:49 -04:00
257d1bc3de Merge pull request #24648 from mlaventure/fix-kill-test
Fix TestDaemonRestartWithKilledRunningContainer failures on RHEL systems
Upstream-commit: ffba13f43539ff58a0021c9353229507d50b66d5
Component: engine
2016-07-19 18:24:34 +00:00
4fa1dcc683 Merge pull request #23825 from dnephin/auto-gen-man-page
Generate man pages from the Command description
Upstream-commit: ac26ee15df4d0e8f406b69f9179b489aa5126ebb
Component: engine
2016-07-19 18:22:01 +00:00
74d8c449cf Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
Upstream-commit: 39327a67e89b88ce60eb6edd2c63b0cf07810993
Component: engine
2016-07-19 11:18:22 -07:00
f139b64ef8 Remove extra map lookup for volume drivers.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5d4627331ee0c685116b083e9f25f2644f0d1bd0
Component: engine
2016-07-19 09:35:56 -07:00
918c17adbd Add documentation for stack commands
Also removes the `-f` flags of bundle to follow the single-letter flags
evaluation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 10919e890942cbdaa65f180dbcd475d21b9c6713
Component: engine
2016-07-19 18:32:44 +02:00
02e14246d7 Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 04104c3a1e6cad30cb41b762e8832215466c0e95
Component: engine
2016-07-19 09:31:43 -07:00
a764e64f97 Dont run man generation as part of test-unit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb
Component: engine
2016-07-19 12:00:35 -04:00
b77059c741 Set Long text for volume commands so they can be used to generate man pages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 25e9b06ac0750396f35d3f52f71c44b1072f0972
Component: engine
2016-07-19 12:00:21 -04:00
9ed298d21b Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 00a8a40398263429f99b1a5f0be59048e1c6f38d
Component: engine
2016-07-19 12:00:21 -04:00
ac1b563dd3 Update libcontainerd.AddProcess to accept a context
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: c02f82756e914081543bf05cb1815a48c02b1ebd
Component: engine
2016-07-19 08:24:39 -07:00
32ecbd59e9 Do not rely on "live" event anymore
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 64483c3bdaa1887b8b932e0564362fbbff025dc0
Component: engine
2016-07-19 08:24:39 -07:00
766219b46e Merge pull request #24776 from anusha-ragunathan/plugins-connect
Add only legacy plugins to the legacy lookup map.
Upstream-commit: 6875f71d7c6a01b918fcc372ac2c17c5a0d65418
Component: engine
2016-07-19 17:11:50 +02:00
8bb6df73dc Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
Don't automagically add "[OPTIONS]" to usage
Upstream-commit: 68e52febdee553c2768ac7ea54817e0657d5ce8a
Component: engine
2016-07-19 11:01:33 -04:00
91c5d7692b Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
Upstream-commit: be2e2fca089029d1fb0d8dc73e5046cfb1c62bdf
Component: engine
2016-07-19 15:22:29 +02:00
592e3864dd Merge pull request #24792 from albers/completion-service-log-drivers
bash completion for `docker service {create,update} --log-{driver,opt}`
Upstream-commit: ebca26b4b19ff7744c211e0859cb6155ed24bb7b
Component: engine
2016-07-19 15:19:55 +02:00
6bac955e23 Merge pull request #24741 from dsau/24704-create-zfs-directory
Create zfs directory if it doesn't exist at startup.
Upstream-commit: 8a766b859ff2be52119087d55cdd4895326646ec
Component: engine
2016-07-19 13:22:54 +01:00
a525842279 bash completion for docker service {create,update} --log-{driver,opt}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 823e161de73e2df04cd3905b72b7916c49091af4
Component: engine
2016-07-19 13:20:40 +02:00
3ac251def6 bash completion for docker node update --label-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bc6e3c0b5e415f09957955782b4d51e94a5ff2b9
Component: engine
2016-07-19 13:09:28 +02:00
7785523be1 Merge pull request #24784 from doronp/UseHTTPCodes
Use const http status code instead of just numbers see #24783
Upstream-commit: 5c53fd468b86244f74c753feae02297fc46ff1cc
Component: engine
2016-07-19 19:02:42 +08:00
793c74560e Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
Bump Go to 1.6.3
Upstream-commit: cf8f2a5037d2795cbcd21eb095ace66bbd9b1c93
Component: engine
2016-07-19 09:42:25 +02:00
7f898cc8b4 Use const http status code instead of just numbers see #24783
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
Upstream-commit: 6bec735c91c378e1c9cde1744e7c8aca7397104a
Component: engine
2016-07-19 10:40:20 +03:00
02b713e818 Merge pull request #24782 from tonistiigi/load-sec
Update docker load security docs
Upstream-commit: 5fe3e006e4d15cc3742719800c4c6157809e4e70
Component: engine
2016-07-19 09:06:27 +02:00
2a8da813b8 Merge pull request #24397 from dongluochen/nodelabels
support node label update
Upstream-commit: dc0d6040e48bcb715ee35fae23e85d50034b483e
Component: engine
2016-07-19 07:55:24 +02:00
77d0030a64 Merge pull request #24755 from thaJeztah/fix-error-message
update "image delete" error to match actual behavior
Upstream-commit: f49fdb9d0b6345422a77c550b6d06ea7442f3f28
Component: engine
2016-07-18 22:47:55 -04:00
1c460604bb Update docker load security docs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f17469e890c1fd2ea9d63e7bfe1025df9754c97b
Component: engine
2016-07-18 19:16:15 -07:00
a9e33b5e83 Merge pull request #24476 from stevvooe/services-log-driver-support
swarm: add log driver support for services
Upstream-commit: 1796680381e7cb35eda14243a3fba1ac911ff908
Component: engine
2016-07-18 19:08:12 -07:00
5da3c90cb2 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1
Component: engine
2016-07-18 18:39:52 -07:00
ae77cef214 Create zfs directory if it doesn't exist at startup.
Signed-off-by: Damian Smyth <damian@dsau.co>
Upstream-commit: 205bc6fc99872ba852fa7a158c106514d5b64179
Component: engine
2016-07-19 10:12:22 +10:00
7078c249a4 Merge pull request #23878 from jstarks/fix_windows_console
Windows: Always enable VT emulation
Upstream-commit: e6a97db2c932a2b80180c10f2896d7594108a406
Component: engine
2016-07-18 16:23:04 -07:00
32c154633c Merge pull request #24692 from anusha-ragunathan/plugins-ux
Print plugin name on successful install, enable and disable.
Upstream-commit: 340964db1c8f161a2ad156023eb47dcc93bf804b
Component: engine
2016-07-19 01:09:35 +02:00
0228458e3c Add only legacy plugins to the legacy lookup map.
Legacy plugin model maintained a map of plugins. This is
not used by the new model. Using this map in the new model
causes incorrect lookup of plugins. This change uses adds
a plugin to the map only if its legacy.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 8fd779dc28a11d8727d76e9553379b0c854f7c4c
Component: engine
2016-07-18 15:43:44 -07:00
3962d8ce71 Merge pull request #24754 from cpuguy83/24749_better_err_not_a_dir
Improve error message for ENOTDIR errors
Upstream-commit: bceacfa57f6386d908e91168cb4525ddc259ee63
Component: engine
2016-07-19 00:30:40 +02:00
6103a02b12 Merge pull request #24701 from dperny/test-leader-proxy
Added test for leader proxying
Upstream-commit: 6fc46474fbcba6a554526f8c27554a1793e13aab
Component: engine
2016-07-18 22:15:16 +00:00
24235167aa Don't automagically add "[OPTIONS]" to usage
This removes the logic to automatically
add [OPTIONS] to the usage output.

The current logic was broken if a command
only has deprecated or hidden flags, and
in many cases put the [OPTIONS] in the
wrong location.

Requiring the usage string to be set
manually gives more predictable results,
and shouldn't require much to maintain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f0b5105524649169d765bb94c2806209ab21904
Component: engine
2016-07-19 00:07:19 +02:00
4be1849e85 update "image delete" error to match actual behavior
The error message;

    unable to delete .... (must be forced) - image is referenced in one or more repositories

Looks to be incorrect

Given the following images:

    docker images | grep 2d36b1c0ea40
    registry                           2                                     2d36b1c0ea40        7 weeks ago         171.2 MB
    registry                           2.4.1                                 2d36b1c0ea40        7 weeks ago         171.2 MB

Removing the image by *id* fails:

    docker rmi 2d36b1c0ea40
    Error response from daemon: conflict: unable to delete 2d36b1c0ea40 (must be forced) - image is referenced in one or more repositories

However, after untagging one image:

    docker rmi registry:2
    Untagged: registry:2

Removing the image works:

    docker rmi 2d36b1c0ea40
    Untagged: registry:2.4.1
    Deleted: sha256:2d36b1c0ea40159adc8b36f7563f1d7a6d443384fe2611e8b393c1cb3ae2e6ad
    Deleted: sha256:7abfddbf4e61927307b6646010845eeb7513ecc6541f33ea6103b2493e36aa4e
    Deleted: sha256:f512d7699dbb2994fe15d30ee1d404e57b58c3c310617b4471db649680b4cfa0
    Deleted: sha256:7291e34714908270aeda93f1dc681485f9734d41314e2fdc6c11f32ffa782a21
    Deleted: sha256:548f6562929484f3d78267e4b1e31dcfeb9f303059668888b4423ce5501c7fbc
    Deleted: sha256:afe56b46629e6d8e0bfc36fed13395a7cfa2bd83b58bb489976ef13553eff20b
    Deleted: sha256:cf0c3bd5d6a0a14ebf96cc7d3df79a37774a70f3086273e09da71a86fe74fec2
    Deleted: sha256:c5fdaf8b055f544d0211043e687905315c3a0b71c1c08df07e473dd0a30e43c8

    docker images | grep 2d36b1c0ea40
    <empty>

This changes the error message to reflect that behavior

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0988dd39598a46d911abc54c19fc3377698d630
Component: engine
2016-07-18 23:17:55 +02:00
b9565b1842 bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589bafddf391cbf6aff8b22044266dc819cdcaeb
Component: engine
2016-07-18 23:15:03 +02:00
ecd1805a72 Added test for leader proxying
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: d305aa48ddcd17244ca408c59a40e2ef2392f414
Component: engine
2016-07-18 13:18:02 -07:00
628a2430c9 Merge pull request #24764 from aaronlehmann/vendor-go-events
Update vendored go-events
Upstream-commit: e7b96102ff4df9209ca721e13f8f088d4da4c734
Component: engine
2016-07-18 22:09:31 +02:00
0b31b4284a Merge pull request #24659 from justyntemme/master
Fix for issue #23884 (Documentation clarification)
Upstream-commit: 8ef820b53925a7600ee5485d8acf14cc3e35fc11
Component: engine
2016-07-18 21:58:55 +02:00
a9b08686d4 suggested improvements for Debian install doc issue #23884
Signed-off-by: Justyn Temme <justyntemme@gmail.com>
Upstream-commit: b74b46b26a8a8fcacc1fdea080c0bebe70194e9f
Component: engine
2016-07-18 14:38:58 -05:00
7262ef8faa Vendor in new containerd
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 29b2714580d085533c29807fa337c2b7a302abb6
Component: engine
2016-07-18 11:44:24 -07:00
6b6ea81208 Update vendored go-events
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: db9bc51cbeb40204ff15ea1a40db8d3736ad3845
Component: engine
2016-07-18 10:38:27 -07:00
adb3025793 Print plugin name on successful install, enable and disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 6dca1e6d3f875de7a6652390f65fdb8ec2623e3b
Component: engine
2016-07-18 09:47:12 -07:00