1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
e24421a6ef Move sysctls to correct API version
Commit 067b510dfc move the
sysctls feature to the right API version, but
missed this one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7cdd693d5d2094f73383145eb74d81c6b9bb9b24)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn
e2c8597c8f Add X-Registry-Auth header to service API docs
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.

This adds the missing information about passing
a X-Registry-Auth header.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bde35ef18a408a297b960c439dc029cfb5e15464)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Akihiro Suda
f436a41d0c Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Close #25409
Update #10180

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit aab101a770a88cdbde5012dc7eb5b4439cf57192)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
lixiaobing10051267
fc8a0f4786 command "docker service remove" not insistant
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 078e2aa1571ad402f0a9599e6fac2286a3d35f54)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Sven Dowideit
9bc8e7858c James' site has been dead for a while - removing links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit a9b08f3102e946df44337deb65c99b41570754d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
David Lechner
a30a0b07a4 Move export from image commands to container commands
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
(cherry picked from commit 43c8cc7bb4dd42bebabf68e509a3596ef7a642cd)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Matt Bentley
05e1e65ca7 Add install of virtual kernel extras for AUFS
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
(cherry picked from commit e715ca506f41b22cde21187328fcb416cec5e6a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith
4534b9e6c3 add overlay networking guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Charles Smith
3da4ac64af add overlay networking security model node
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e8621358721eb860c07f33f8b83d684)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 23:21:59 +02:00
Tonis Tiigi
13e82f23c8 Skip always pulling images on integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e2226223e614716749cdb7701a130c7449f5f854)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 14:19:31 -07:00
Aaron Lehmann
74cdda0333 Add swarm section to 1.12.1 changelog
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-08-17 14:10:42 -07:00
Dong Chen
c3b9a533bc Reschedule with overlay network
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-17 11:41:08 -07:00
Nathan LeClaire
da301e5b7e Merge pull request #551 from bbodenmiller/patch-1
improve proxy variables check
2016-08-17 11:25:59 -07:00
Dong Chen
5243531291 Fix link to discovery.md.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-17 10:02:49 -07:00
Ben Bodenmiller
895536880f clear all_proxy if not socks address
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-08-17 00:14:48 -07:00
Ben Bodenmiller
5712450bd0 improve proxy variables check
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-08-17 00:06:06 -07:00
Tibor Vass
236317fa56 Bump VERSION to v1.12.1-rc2
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 21:30:11 -07:00
Tibor Vass
f806ae4838 Merge pull request #25767 from tiborvass/1.12.1-rc2-cherrypicks
1.12.1 rc2 cherrypicks
2016-08-16 21:26:03 -07:00
Tibor Vass
a544fe4b38 Vendor swarmkit to change root key to P-256
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Anusha Ragunathan
09dc9a2a9e Debugging issue #25511
Volumes and other content created under a bind mount should be
recursively propagated using rshared, not shared. This could be
the reason for EBUSY during removal. Override options with rbind,
rshared and see if CI errors are fixed.

May fix #25511

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit e58028d078077dc566639ff52ece09ad6c481e44)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Tonis Tiigi
f21cdf48f9 Add retry checks to TestSwarmPublishAdd
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7bd1c1195998c10c732ccfa67c568e634d58166e)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 16:11:10 -07:00
Jana Radhakrishnan
651c53f020 Vendoring libnetwork @82fb373e3eaa4e
- Fixes a SNAT issue in loadbalancer when multiple networks are involved
  - Fixes an issue with SRV query forwarding in DNS
  - Fixes a map race

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 56c98226955d98a2ba6a99bffd3a9a80d691e4a7)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Dieter Reuter
64f62a6703 Improve systemd config for Raspbian
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 3c7ae431e08af7a53ebfe4fbb2eaf279fb3993b6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Tibor Vass
460d8d80ca release-rpm: fix bad destination paths for rpms
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e1c7ad871f6fd41a7682cf7effb02838ab679ae3)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:43 -07:00
Sebastiaan van Stijn
dd08342103 Add note about new binaries to changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 32b8a6e735ef674e1ea2415915e41531bcd4a9c8)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:42 -07:00
Dieter Reuter
07e0380379 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
(cherry picked from commit 5907e4a872c7d586ab594972fa24bf4fa4e83207)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-16 15:37:42 -07:00
Sebastiaan van Stijn
0c369b1a5c Merge pull request #25761 from thaJeztah/update-changelog
Update 1.12.1 changelog for networking fixes
2016-08-16 21:51:27 +02:00
Sebastiaan van Stijn
6927a7b263 Update networking section in changelog
- Add 25550 to 1.12.1 changelog
- Add 25739 to 1.12.1 changelog

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-16 17:18:10 +02:00
Tibor Vass
8dae3ecff0 Merge pull request #25713 from thaJeztah/update-changelog
[1.12.1] Add removal of "--network-add" / "--network-rm" to changelog
2016-08-15 10:34:16 -07:00
Sebastiaan van Stijn
12ab1ca5eb Add removal of "--network-add" / "--network-rm" to changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-15 14:31:39 +02:00
Dong Chen
0a0ebb16fe Add test output to debug failure.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-15 00:47:42 -07:00
Joao Fernandes
6323fc172c Merge pull request #2635 from sarahlynnpark/auth-docs
Remove all links / mentions of LDAP auth config from DTR docs
2016-08-12 11:49:14 -07:00
Tibor Vass
7889dc71a2 Bump VERSION to v1.12.1-rc1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 10:59:21 -07:00
Tibor Vass
705ebd6fac Merge pull request #25659 from thaJeztah/update-1.12.1-changelog
rewording and changes in 1.12.1 changelog for 1.12.1-GA
2016-08-12 10:58:41 -07:00
sarahlynnpark
2ca2b82f35 Remove all links / mentions of LDAP config 2016-08-12 10:54:32 -07:00
Sebastiaan van Stijn
eae4ba51e5 Minor rewording and changes in 1.12.1 changelog
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-12 18:15:14 +02:00
Tibor Vass
e005053797 Merge pull request #25653 from tiborvass/i-hate-rpm
Changelog: Add placeholder date for 1.12.1
2016-08-12 01:36:22 -07:00
Tibor Vass
7646aba651 Changelog: Add placeholder date for 1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-12 01:29:09 -07:00
Tibor Vass
c4428f84d0 Merge pull request #25651 from tiborvass/changelog-1.12.1
Update CHANGELOG for 1.12.1
2016-08-12 00:14:37 -07:00
Tibor Vass
5680192346 Merge pull request #25632 from SvenDowideit/more-docs-1.12.1-cherry-picks
More docs 1.12.1 cherry picks
2016-08-12 00:14:30 -07:00
Tibor Vass
a019407d3e Update CHANGELOG for 1.12.1
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 22:48:24 -07:00
Tibor Vass
5dc0715cd2 Merge pull request #25637 from tiborvass/cherry-picks-1.12.1
Cherry picks 1.12.1
2016-08-11 22:27:32 -07:00
Tibor Vass
235d897aaf Merge pull request #25647 from tiborvass/fix-network-flag-on-service-update-1.12.1
[1.12.1] Remove --network-add and --network-rm flags from service update
2016-08-11 21:08:40 -07:00
Santhosh Manohar
42fed93a89 Vendoring libnetwork for 1.12.1-rc1
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit b9c9fa2855cd5c7391cd026ef13a7d9d061214ee)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 20:26:04 -07:00
Anusha Ragunathan
a3f2c03ef0 Fix deadlock on plugin shutdown.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 4d009084de8cad94a180130eb57efa2a98df6d98)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 19:40:06 -07:00
Yong Tang
af0f7ad792 Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029.

Basically this fix adds a check to wait until 3 containers has already up,
before processing `node tasks ...`.

This might fix 25029.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 63c0366bc9a7f326ad61cdfa69fa860cf844a2c7)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 19:39:52 -07:00
John Howard
16a0c1c374 Windows: Fix RO test cases
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 03816ad5b5a060449243d0e30fa396c2255ddacb)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 19:39:52 -07:00
Tibor Vass
9623f45fce Remove --network-add and --network-rm flags from service update
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3a7e90c743f6fdccb8aecb9d6d9afd42232fa736)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 19:37:41 -07:00
Davanum Srinivas
3048098843 Adding /proc/timer_list to the masked paths list
/proc/timer_list seems to leak information about the host. Here is
an example from a busybox container running on docker+kubernetes.

 # cat /proc/timer_list | grep -i -e kube
 <ffff8800b8cc3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2497
 <ffff880129ac3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3478
 <ffff8800b1b77db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3470
 <ffff8800bb6abdb0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2499

Signed-Off-By: Davanum Srinivas <davanum@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
(cherry picked from commit 03bd00b68f28062ef6b09a43a4c381af63b91673)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 17:56:51 -07:00
Thomas Tanaka
7b95154474 Add Oracle Linux distro specific selinux policy
With the latest OL7.2, selinux policy that is shipped
might not be the latest for it to work or build with
selinux policy for docker-1.12.

To be able to achieve that here is what is done:
1. Added systemd_machined policy which is part of systemd.
2. Temporarily comment out unconfined_typebounds because the
current OL7's selinux doesn't have unconfineduser selinux policy,
to include this will be too much. Will revisit this once we have
updated the selinux policy.

Fixes: #24612

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
(cherry picked from commit d6cae872c704c6cf36ee7d5c9b472e33280af202)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 17:56:51 -07:00