Commit Graph

25015 Commits

Author SHA1 Message Date
Tonis Tiigi 01c5b208e8 Update daemon to new swarmkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit a83bba467a8bd24924b1a0cf55b954ac49937b5b)
2016-06-16 23:36:57 -07:00
Tonis Tiigi 528f3ab668 Update swarmkit to 310f1119
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2783568284a0c84bbb53df3c40295d27a151889e)
2016-06-16 23:36:57 -07:00
Derek McGowan 56b253fb3c Do not show empty tags for digest references in output
When a repository has a tag and digests, show tag for each digest value.
Do not duplicate rows for the same image name with both tag and digest.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit 79eada38141dca71f5195df59882f1cb46657640)
2016-06-16 23:36:57 -07:00
Sebastiaan van Stijn b3387e96ed fix "overlay" -> "overlay2" in error message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2d4b285a75621604f31058a43cb5ef1d4618533e)
2016-06-16 23:36:57 -07:00
Vincent Demeester 42f445565d Update ServiceInspectWithRaw
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 4a70cb55710a76ee7dfa059c440c34fd6cb84f16)
2016-06-16 23:36:57 -07:00
Vincent Demeester d9d24b6605 Update docker plugin install code…
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2c82337b0490dc0a5b8329d1f23c6bad00d8551b)
2016-06-16 23:36:57 -07:00
Vincent Demeester 7444bb2c25 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 58529a15535ee2accafdde740214c0d5b595d6e1)
2016-06-16 23:36:56 -07:00
Sebastiaan van Stijn fdb5324595 Update docker info output example
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42)
2016-06-16 23:36:56 -07:00
Madhu Venugopal ed01cfc6db Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54)
2016-06-16 23:36:56 -07:00
Justin Cormack 213adac2ea Add the seccomp build tag for s390x now runc updated
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603

Fixes #23171

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit f8d970169a7ae6dcf46beb69c0367d35d019294e)
2016-06-16 23:36:56 -07:00
Lei Jitang 83fbaa3cb4 Fix restore active sandbox
we store the active sandbox after daemon.containerd.Restore, but there
is a chance the `Restore` will set the container to exit see
(https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469).
so we should check if the container is really running before add it to
activesandbox.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 78f3094518b1f3f498bd2629667877f9a87d452f)
2016-06-16 23:36:56 -07:00
Yong Tang 1ad7b517fa Add security info to `docker info`
The security infomation has already been added to `GET /info` in #21172.
However, it is not part of the output of `docker info` yet.

This fix adds the security information to `docker info`.

Additional tests has been added to cover changes.

This fix fixes #23500. This fix is related to #20909, #21172.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit eee20b564ffae0b8c8043115c959f0f9d1869fed)
2016-06-16 23:36:56 -07:00
Stephen J Day 6c3d080e83 api/client/service: fix minor spelling error in service inspect
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 920e65ccbca0423c43579c9ce3b9331efe14c97b)
2016-06-16 23:36:55 -07:00
Kai Qiang Wu(Kennan) 82453c84ba Add ecryptfs check for overlay2
We added docs about ecryptfs check but not in code side.
Also refactor code to make it clean.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
(cherry picked from commit 136323b04315eceffbed61d680878ed23cecc015)
2016-06-16 23:36:55 -07:00
Sebastiaan van Stijn c73e56fd7f docs: move "advisory" to general metadata
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aadd88c306d43b401a18a29efafa714f64f87894)
2016-06-16 23:36:55 -07:00
Sainath Grandhi 1e5ee1dd37 Fixes #23596-returns empty string for NetworkID in response to /containers/json
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
(cherry picked from commit ad85d299066e87cd40afc43ffee8cb73dcc79eb4)
2016-06-16 23:36:55 -07:00
Stephen J Day c3015a22cb api/client/service: list running services over replicas
To provide users a view of service status, list the number of running
task over the requested number of replicas.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit b86cb293ecc67e76ec90ec60766f52dad6903eac)
2016-06-16 23:36:55 -07:00
Tonis Tiigi 01d26abd5c Add api tests for secret update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit aed7667bee243b0e0d1aa480e3bb52bae894cfe5)
2016-06-16 23:36:55 -07:00
Victor Vieux 7f4bca0f90 use same hash for same secret
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit a579ce8ed307024ededd527819bfdbf38e970fbf)
2016-06-16 23:36:55 -07:00
Victor Vieux 7cc76facba fix docker swarm init/update --secret
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 085895342c7f797f0eef7ec956438e33489f211f)
2016-06-16 23:36:54 -07:00
Michael Crosby e491dbb38a Set systemd KillMode
Change the kill mode to process so that systemd does not kill container
processes when the daemon is shutdown but only the docker daemon

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit db435f526ac5703276ad1add28188c0c8c6e4c2a)
2016-06-16 23:36:54 -07:00
Sebastiaan van Stijn dd5573bc60 Update release script installation instructions
Instructions for installing the static binaries
has changed, so updated the instructions.

The comment on top already requires the steps
to be executed as root, so removing the 'sudo'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e233c8dd7208b358b950731a6ba93cf9dcb80eb5)
2016-06-16 23:36:54 -07:00
Daniel Nephin bb8996d62b Fix String() for some option types
and add unit tests for them.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit c26e7d8c9105e16048268a01dd1e556af43902cd)
2016-06-16 23:36:54 -07:00
Adrian Moisey 2401c0223d Fix URL to issue
Signed-off-by: Adrian Moisey <adrian@changeover.za.net>
(cherry picked from commit 88d4da7f422a4ac341efa85541271b1c0e9bcfa3)
2016-06-16 23:36:54 -07:00
Sven Dowideit af3b1c7370 advisory can't be in the [menu] section
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit bc033cb706fd22e3934968b0dfdf93da962e36a8)
2016-06-16 23:36:54 -07:00
Thomas Leonard 979ad07925 Remove out-of-date health test
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
(cherry picked from commit 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8)
2016-06-16 23:36:53 -07:00
Anusha Ragunathan 3e44703cae Add basic integration tests for plugins.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit a2d48c9e4e2abadcba582de47891837b0a80b24c)
2016-06-16 23:36:53 -07:00
Anusha Ragunathan c82f23095a Add accept-permissions flag for install.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit ec4857da485768db8dadda3511122d136d896dde)
2016-06-16 23:36:53 -07:00
Arnaud Porterie (icecrime) 187b6607a4 Service `--update-parallelism` defauls to 0
The `--update-parallelism` flaag should default to 0, which is
interpreted by the backend as unlimited. In other words, by default all
services should update simultaneously.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
(cherry picked from commit f22d0174f33e084445c5845c95aca346e187fb02)
2016-06-16 23:36:53 -07:00
Tom Barlow 5e41ec703d Change 'invald' to 'invalid' in volume opts errors
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
(cherry picked from commit bf988fc6ff90e1477d3fdab79cc7239511f32aba)
2016-06-16 23:36:53 -07:00
Justin Cormack ad28216987 Move mlock back into the default ungated seccomp profile
Do not gate with CAP_IPC_LOCK as unprivileged use is now
allowed in Linux. This returns it to how it was in 1.11.

Fixes #23587

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit bdf01cf5deee11deb426eb33e1c8433c410084b6)
2016-06-16 23:36:53 -07:00
Anusha Ragunathan d2a9560e71 Avoid back and forth conversion between strings and bytes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit d6d448aab8e303a351b763f6a77b909fadb7344b)
2016-06-16 23:36:53 -07:00
Daniel Nephin 41d72e28c3 Change SCALE to REPLICAS.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4df03499486a7f62f94bd1fb8e2625b0ef932fe5)
2016-06-16 23:36:52 -07:00
Kenfe-Mickael Laventure e324ec639b Fix TestRunWithRuntime* on arm
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit bd6317031bb8f7e1a82cbfd254fe60e0de703524)
2016-06-16 23:36:52 -07:00
Michael Crosby cdb04519e2 Update libnetwork to 96d45528599c32354230480a1ebc0
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit e927df7b4b58099113b5086371b1d80ff517f564)
2016-06-16 23:36:52 -07:00
Victoria Bialas 38305cb676 fixing links and merge conflicts
updated link to faqs/troubleshoot to point to new location /toolbox

fixed docker-for-mac link error

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 1d80f8ca193139755de935fa6567a32734038cac)
2016-06-16 23:36:52 -07:00
Shoubhik Bose 2b36087597 Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
(cherry picked from commit d3fad80cc7823eddb823dd53424a28ee81043f18)
2016-06-16 23:36:52 -07:00
Sven Dowideit 7af9b80f23 fix links for #23505
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit fa94eb46041ad309468dbbd29faba2053f402096)
2016-06-16 23:36:52 -07:00
Madhu Venugopal 60a86590aa Use service alias and configure container's --net-alias
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f)
2016-06-16 23:36:51 -07:00
Madhu Venugopal 588b76c2a1 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 5af8e2a9c08439049da9a9abc24145c3d1f2e9de)
2016-06-16 23:36:51 -07:00
Madhu Venugopal f1d5c3374c Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f2f97f768e51f817336cd56456158bc32ab3b977)
2016-06-16 23:36:51 -07:00
Tonis Tiigi ca16a4c81d Fix hanging integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 22f827ababc1910bc48762d7980913497dbc915d)
2016-06-16 23:36:51 -07:00
Antonio Murdaca 034d555d30 daemon: allow tmpfs to trump over VOLUME(s)
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 756f6cef4a1379e59d6511ee000e435d23659153)
2016-06-16 23:36:51 -07:00
Akihiro Suda ce6211d252 Update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit fec98ecca1d82ec1f2e0bd4d5e2c180ef834dc52)
2016-06-16 23:36:51 -07:00
Victoria Bialas 92ff142da2 surfacing Learn by example topics to top level of Docker Engine docs
fixing links after moving surfacing tutorials

fixing more links for the newly located tutorials

WIP: merging 3 getting started tutorials into one to cover all platforms, added new files

fixing broken images and links in 3-in-1 getting started, re-wrote story flow, linked to Toolbox, d4mac,d4win

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 0254c12e1e0be7a93e3b28e61586ac66168a9b7c)
2016-06-16 23:36:50 -07:00
Drew Erny c816f2c905 Remove the node leader column, show leader as status.
Removes the leader column from node ls and shows whether a node is the
leader in the manager status column instead.

Signed-off-by: Drew Erny <drew.erny@docker.com>
(cherry picked from commit 4104c1dc131b62c033c702719909815fba679774)
2016-06-16 23:36:50 -07:00
Michael Crosby be67aae778 Merge pull request #23627 from mlaventure/update-runc-on-1.12
Update runc on 1.12
2016-06-16 14:30:54 -07:00
Kenfe-Mickael Laventure 301f3d776f Revert build-{deb,rpm} to cloning from opencontainers repository
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-16 09:06:53 -07:00
Kenfe-Mickael Laventure 9eb6e049bd Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit b675124cf5fc96a6c329b5580ef60304089270c6)
2016-06-16 08:46:23 -07:00
Tibor Vass 1f136c1f85 bump VERSION to v1.12.0-rc1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-15 00:36:32 -04:00