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
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
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
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
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
5c8645e25c
Merge pull request #24705 from thaJeztah/update-flag-descriptions
...
Improve flag help consistency, and update docs
Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c
Component: engine
2016-07-18 16:07:23 +00:00
3172da7b30
Merge pull request #24599 from vdemeester/small-zsh-completion-fix
...
Small zsh completion fix on --pretty & --no-resolve
Upstream-commit: ff1040bafc6a01d46c50b004f10d24a180c5f319
Component: engine
2016-07-16 02:55:32 +02:00
c4e34ed5c5
Improve flag help consistency, and update docs
...
This adds the `--live-restore` option to the documentation.
Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
13710c5963
Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
...
Update zsh completion for 'docker service {create,update} {--endpoint…
Upstream-commit: 983fc995093e10ca816283debc136291e74d07fb
Component: engine
2016-07-15 14:40:45 +02:00
124e74e433
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2e6922a6d3295857ae73fe7df7aa452d220f869d
Component: engine
2016-07-15 14:36:18 +02:00
9ee16a1c14
Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
...
Add zsh completion for 'dockerd --oom-score-adjust'
Upstream-commit: a968f83c5583cf42008fcd88c5491946d6eb2dcd
Component: engine
2016-07-15 13:47:39 +02:00
9806cec69f
Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
...
Add zsh completion for 'docker service {create,update} --registry-auth'
Upstream-commit: 2a888c02a65c483e51f5fc8cf462d3ec6a15ab47
Component: engine
2016-07-15 11:15:55 +02:00
8da911193c
Merge pull request #24665 from sdurrheimer/zsh-completion-run-network
...
Rename zsh completion for 'docker {create,run} --net --net-alias' to …
Upstream-commit: d69fcf10cb2b751afe8b9468ac8636687b1861d7
Component: engine
2016-07-15 11:15:35 +02:00
9188889f22
Add zsh completion for 'docker service {create,update} --registry-auth'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 64f08906a2429ac0b2192e263ca86574f7f0dded
Component: engine
2016-07-15 08:23:57 +02:00
bc5b09206f
Add zsh completion for 'dockerd --oom-score-adjust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 5d29732bdf8f6b3a52a8272c4549982a95727ef8
Component: engine
2016-07-15 08:16:15 +02:00
a7e7e20b17
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba5d9f63a3b5c39fdbb89778782367a55ce74809
Component: engine
2016-07-15 08:09:20 +02:00
8e4507da93
Change $prog back to docker in sysvinit-redhat
...
(and set $exec to dockerd instead)
This ensures end users do not need to make any configuration changes
due to the rename from docker to dockerd in version 1.12.
Signed-off-by: Paul Furtado <pfurtado@hubspot.com >
Upstream-commit: acb41ddc9df80894d2ff84c34a98cc904b9241fa
Component: engine
2016-07-14 17:21:59 -04:00
1382e56d1b
Merge pull request #24598 from albers/completion-daemon--oom-score-adjust
...
bash completion for `docker daemon --oom-score-adjust`
Upstream-commit: 7925de9098e6ce5d7e5c2a8a19926f1f90105090
Component: engine
2016-07-13 23:34:54 +02:00
ccca651e58
Small zsh completion fix on --pretty & --no-resolve
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 698bd5ab65ddc3db9679aa27b79c89ba1ca1fe23
Component: engine
2016-07-13 22:03:11 +02:00
4c71a2a9b6
bash completion for docker daemon --oom-score-adjust
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e1e310ea1fc47488a7404e3fa52fa606fe270ed0
Component: engine
2016-07-13 12:31:55 -07:00
bb985637e2
Remove shorthand flags for "mount", "pretty", and "no-resolve"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
2016-07-13 18:47:29 +02:00
f08872faee
Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
...
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
345782c0fa
Merge pull request #24583 from albers/completion-run--network
...
Change bash completion for `docker run --net*` to `--network*`
Upstream-commit: a9a8d807f09014162d63503a5d36a42f6d64b796
Component: engine
2016-07-13 12:46:58 +02:00
0a5f2230dd
Change bash completion for docker run --net* to --network*
...
Ref: https://github.com/docker/docker/pull/23324
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c4846f697271d2990cca8481338f4827b2558112
Component: engine
2016-07-13 12:42:33 +02:00
3c899b8740
Merge pull request #24301 from coolljt0725/add_dummy_to_check_config
...
Add IPVLAN and DUMMY to check-config.sh
Upstream-commit: 5d11a7987b2987921e436d88dd57ead07a64b030
Component: engine
2016-07-13 12:38:27 +02:00
6e8f820ea2
Merge pull request #24581 from albers/completion-service--endpoint-mode
...
Update bash completion for `docker service {create,update} {--mode,--…
Upstream-commit: ae1a809c39c72d50554740e42bb1a4af3a9dbfb1
Component: engine
2016-07-13 09:52:52 +00:00
70db2efccc
Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a394490d3895fe0122b44a3f89acc04946b83bda
Component: engine
2016-07-13 11:37:31 +02:00
97f6147543
bash completion for docker service {create,update} --registry-auth
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a44e71c4274cd311e99722277cb674b2bc84d86e
Component: engine
2016-07-13 11:20:02 +02:00
b9f07879e0
use tabs for indentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fa077f74969b2c11f1ccfb4c5777c98b5e123013
Component: engine
2016-07-12 23:16:55 +02:00
1a5af00ee4
Merge pull request #24119 from albers/completion-swarm-mode
...
Fix & improve bash completion for swarm mode commands
Upstream-commit: 2664f374527d160b14f55b5547fef14f0e813eec
Component: engine
2016-07-08 15:34:51 -04:00
e803cd4aff
Add IPVLAN and DUMMY to check-config.sh
...
This commit add DUMMY and IPVLAN to check-config.sh
because they are need for ipvlan and macvlan network
driver.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: f5940ef7255a0a387baa6e20e09f86473ddf6d08
Component: engine
2016-07-07 21:21:57 -04:00
f5a13a7cbe
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
bc3a0408d7
Remove unmatched bracket from _docker for zsh
...
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca >
Upstream-commit: 7631dc80a6b1549b857192f44322fcee5e754254
Component: engine
2016-07-06 08:57:28 -07:00
026db8e18b
Merge pull request #24307 from cyphar/remove-systemd-rlimits
...
contrib: systemd: set Limit* to infinity
Upstream-commit: 34a9e9d051824ef9ff2bb6147cec23ef03558b5c
Component: engine
2016-07-05 16:02:47 -04:00
1e37a43b53
Add zsh completion for 'docker service' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: f5d768e2c53f777e1add70f0e367e58db561842e
Component: engine
2016-07-04 15:14:58 +02:00
ec59bad07c
contrib: systemd: set Limit* to infinity
...
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if systemd
sets rlimits on the main Docker daemon process (because the limits
propogate to all children).
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: 8db61095a3d0bcb0733580734ba5d54bc27a614d
Component: engine
2016-07-04 23:00:28 +10:00
c1be799486
Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
...
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
Upstream-commit: d97233ca886d50afd060f3a4fe584ac8e51ea998
Component: engine
2016-07-04 14:40:56 +02:00
6291373a90
Add zsh completion for 'docker plugin' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 7ae3caa4e9762b5b74ed0885a3a2782531256281
Component: engine
2016-07-03 23:45:23 +02:00
99daf837b2
Add zsh completion for 'docker swarm' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2086663abdcfe793aeef3e64655df833c144d024
Component: engine
2016-07-03 23:28:38 +02:00
90180f1f3d
Merge pull request #24272 from sdurrheimer/zsh-completion-node
...
Add zsh completion for 'docker node' commands
Upstream-commit: df3e3a227b8b8f93aa72673a09e7a83548b7c1b7
Component: engine
2016-07-03 13:58:14 -07:00
6a2679b647
Add zsh completion for 'docker ps --last'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 1dc9cf49019d8efa510e691aba72427b0c32ceec
Component: engine
2016-07-03 20:38:54 +02:00
219d193b75
bash completion for default port on docker swarm {init,join}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 009d50e2d8c4f74f38ebefe89b8dd44b69b46660
Component: engine
2016-07-03 10:48:37 -07:00
8b06f8a5b3
bash completion can be configured to show node and service IDs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 715754ee61a83a710f5c0c3974cfed6b453d5595
Component: engine
2016-07-03 10:48:37 -07:00
7b31cc7b25
bash completion for docker {service,node} filters
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2b34fa0511a5193b1cb07493555872cfd6b70442
Component: engine
2016-07-03 10:48:37 -07:00
03817e7b70
Add bash completion for docker ps --last
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dd883b0ce249961c5d498ebb03fc0f2911ca2586
Component: engine
2016-07-03 10:36:34 -07:00
511bd3e7fa
Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a5c7eb607e5cbd46b72e21d2af084e83573688f5
Component: engine
2016-07-03 10:03:53 +02:00
ae3394e263
Add zsh completion for 'docker node' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 024698718f3004d654e46fc2a7732ab35ab3ca5f
Component: engine
2016-07-03 01:10:30 +02:00
939b820305
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
