Commit Graph

19150 Commits

Author SHA1 Message Date
Anusha Ragunathan 8d7d152b87 Fix devmapper backend in docker info
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit fdc2641c2b329c48cf1d1c8c0b806bec8784b3e0)
2015-11-20 07:24:48 -05:00
David Calavera 04c702f617 Make NormalizeLocalName to not reach the network to normalize names.
Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit b665730d2c76cf991c123ad3387d6ba736a7515a)
2015-11-20 07:24:47 -05:00
Harald Albers 842733a582 bash completion for docker {run,create} --volume-driver
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d411c47139e9a6d94c54bfb4052e7d12bf4295f0)
2015-11-20 07:24:47 -05:00
pidster f1d9a79214 Add Weave Network Plugin to docs/extend/plugins.md
Signed-off-by: pidster <pid@pidster.com>
(cherry picked from commit f57073c72bfb30b083730be0623210ad5381ec58)
2015-11-20 07:24:47 -05:00
Flavio Castelli f97b8f403f Update SUSE/openSUSE installation script
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.

Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
(cherry picked from commit 400ac8a66c)
2015-11-20 07:24:47 -05:00
Sebastiaan van Stijn b5cc212e75 docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f2705fa6ede76ad8b307ca184d3e146f5d69f7e6)
2015-11-12 15:13:00 -05:00
Steve Durrheimer 45dbc03636 Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9)
2015-11-12 15:13:00 -05:00
Anusha Ragunathan a22e1dd557 Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1)
2015-11-12 15:13:00 -05:00
Vivek Goyal ad0298c5a1 devmapper: Switch to xfs as default filesystem if supported
If platform supports xfs filesystem then use xfs as default filesystem
for container rootfs instead of ext4. Reason being that ext4 is pre-allcating
lot of metadata (around 1.8GB on 100G thin volume) and that can take long
enough on AWS storage that systemd times out and docker fails to start.

If one disables pre-allocation of ext4 metadata, then it will be allocated
when containers are mounted and we will have multiple copies of metadata
per container. For a 100G thin device, it was around 1.5GB of metadata
per container.

ext4 has an optimization to skip zeroing if discards are issued and
underlying device guarantees that zero will be returned when discarded
blocks are read back. devicemapper thin devices don't offer that guarantee
so ext4 optimization does not kick in. In fact given discards are optional
and can be dropped on the floor if need be, it looks like it might not be
possible to guarantee that all the blocks got discarded and if read back
zero will be returned.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
(cherry picked from commit 07ff17fb850e5ddae6f38cc21776ebb9b1690f3e)
2015-11-12 15:13:00 -05:00
Vivek Goyal 039cf28484 devmapper: Warn if user specified a filesytem and base device already has fs
If user wants to use a filesystem it can be specified using dm.fs=<filesystem>
option. It is possible that docker already had base image and a filesystem
on that. Later if user wants to change file system using dm.fs= option
and restarts docker, that's not possible. Warn user about it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
(cherry picked from commit 83a34e000b2332d9a1b4214a77fae021ed144acb)
2015-11-12 15:13:00 -05:00
Dave Tucker 6702fac9af Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
(cherry picked from commit 44a527d877faf0ef62bc9b0221f656041833ae66)
2015-11-12 15:13:00 -05:00
Mary Anthony 94ef56b8b3 Adding in Contiv plugins
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap

Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 40fc3a8bcf39e52e45c2aac3808987a5499094d8)
2015-11-12 15:12:59 -05:00
David Currie 5b0ca7c58a Updates to Get started with multi-host networking
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.

Signed-off-by: David Currie <david_currie@uk.ibm.com>
(cherry picked from commit f16dceb63233bd2c1fd327b92d7112e8012347ac)
2015-11-12 15:12:59 -05:00
Lei Jitang 5d417ee6e8 Test to verify --mac-address doesn't get applied to new endpoint
created on network connect.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit 451b79d69102ad95f1b91a52bb4b17c240f41e56)
2015-11-12 15:12:59 -05:00
Santhosh Manohar 9a1d077d9c Allow port mapping only for endpoint created on docker run
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit dedcf6a6ff6d3aa75efaeb31c197b1c3a19305be)
2015-11-12 15:12:59 -05:00
Alessandro Boch a2f92e92b5 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 095a8ac5451de25a91fc569a6633fdd8d4cabb3f)
2015-11-12 15:12:59 -05:00
Alessandro Boch 3950ab5741 Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 43b3b6ecb4f838023478c484d32957386b7dd666)
2015-11-12 15:12:59 -05:00
Alessandro Boch 200258c2a0 Fix fixed-cidr daemon option
- Logic is broken when gateway ip falls in ip-range
  and ip-range is not the first block in the network

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit c7cd65962448888ceb1cec6a355fc7fd04f3be53)
2015-11-12 15:12:58 -05:00
Alessandro Boch e0d0582d97 Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
- To bring in ip-range fix

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 9c395537bce1e787ae34d90b2de81df3a47c5ff9)
2015-11-12 15:12:58 -05:00
Harald Albers da9b925066 Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 211e3b0df67d17989c7aff63d1a0098ad61f07a3)
2015-11-12 15:12:58 -05:00
Justin Cormack 736ba2937e Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
(cherry picked from commit 4fca870212ea11010e9dc5ecc802d076dcc1c683)
2015-11-12 15:12:58 -05:00
Kai Qiang Wu(Kennan) fe5baaf228 Fixing wrong volume doc format
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
(cherry picked from commit a874ce08f3742d219f105a8b3d5cb7f37544824b)
2015-11-12 15:12:58 -05:00
Christopher Jones 5fd7bc0d74 Fixed broken links in docker_remote_api
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit 93939c3f9fda70930ec2d3af4c6231ccfbc6b8ef)
2015-11-12 15:12:58 -05:00
Lei Jitang 2d6c4af15e Prevent connecting to host and prevent disconnecting from host
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit a2d8c93fc690c2244a3bed32a2bbeb8dae449f90)
2015-11-10 12:50:34 -05:00
Bryan Boreham 3f089980e4 Fix typo in error message
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
(cherry picked from commit 93405dd037ffb54e7e72d9d36be4a16d1d76fa50)
2015-11-10 12:37:39 -05:00
Alexander Morozov 25493c674b Speedup container list
Remove all unneeded disk operations (reload TagStore, umarshal image)
for checking if image still points to same ID. Now slowest part is
queries to sqlite which hopefuly will be removed soon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit f256d8ad2d)
2015-11-10 12:37:39 -05:00
Anthony Dahanne fe7768f54d Implicitly use swarm:latest so that master and agent use the same version of swarm
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
(cherry picked from commit 4efe0def0ac2a8b6b74a818d23864f62abfaa521)
2015-11-09 19:12:38 -05:00
Tonis Tiigi c7055ebf84 Fix opq whiteouts problems for files with dot prefix
Fixes #17766

Previously, opaque directory whiteouts on non-native
graphdrivers depended on the file order, meaning
files added with the same layer before the whiteout
file `.wh..wh..opq` were also removed.

If that file happened to have subdirs, then calling
chtimes on those dirs after unpack would fail the pull.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit db3070ab1b9e394e45b1db22b8ed8352272d4410)
2015-11-09 19:06:59 -05:00
David Calavera ed95e3d325 Use an empty slice as default value for DNS, DNSSearch and DNSOptions
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit f1a74a89f89affcfbe311e89aa752b3d551e0340)
2015-11-09 19:06:59 -05:00
Dan Walsh 4f23c44a68 Fix relabel for SELinux
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.

If the user does not specify Z or z on the volume mount we should
not attempt a relabel.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
(cherry picked from commit d9011b36176d6245bdc25401633c213d73e14ea0)
2015-11-09 18:36:30 -05:00
Alexander Morozov e35ac39418 Update runc to introduce RelabelNeeded function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 00bcc924fa64b16484beeeabbd2969572d03d30d)
2015-11-09 18:36:29 -05:00
Tonis Tiigi f4dbb093eb Fix symlink handling in builder ADD/COPY commands
Fixes #17290

Fixes following issues:

- Cache checksums turning off while walking a broken symlink.

- Cache checksums were taken from symlinks while targets were actually copied.

- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 47da59f7ec4ee0f49d47a9b32abb137bb30b2c48)
2015-11-09 18:36:29 -05:00
Nathan LeClaire 6aa14d58ff Revise commands in Compose section of multi-host quickstart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
(cherry picked from commit 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5)
2015-11-09 18:36:29 -05:00
Alexander Morozov f3827116a3 Return nice client-side message for docker logs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit e37e329074517f48db8468affc62beb595ab090e)
2015-11-09 18:36:29 -05:00
Guilhem Lettron be83aacf80 Fix missing -d flag in docker.fish
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
(cherry picked from commit 4a3cd881721ff7986fcdc3544e67b66a259c2ca6)
2015-11-09 18:36:29 -05:00
John Howard a58b402fc8 Windows: Fix docker login
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 9c765040a5638429384b56a1b77139c6d4049c75)
2015-11-09 18:36:29 -05:00
Anton Polonskiy 56cc398564 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
(cherry picked from commit 3f331eaa4092ff3a612a275351b82b44c778d9fa)
2015-11-09 18:36:28 -05:00
Zhang Wei 7aa5d784d7 Fix --cluster-store option parser
`--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes
sure that KV-URL contains no "://"

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
(cherry picked from commit 0ebdac8bee0c587a8a10e3bcdec46e9d8360e2fb)
2015-11-09 18:36:28 -05:00
Sebastiaan van Stijn 5f285e4df4 Docs: add "Linux kernel extra" to manual install
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8e2b20580b82c3d63d4dbbff1d6bee5640a46a8b)
2015-11-09 18:36:28 -05:00
Brian Goff 67d34cebf7 Reutrn immediately when inspect connection failed
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 72aeb63a47bcdffe15380302ff09ab3f0447e476)
2015-11-09 18:36:28 -05:00
Jessica Frazelle b633af5875 add fedora 23 for all the crazies who already want it
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
(cherry picked from commit 45788bb62d6dcdc5b429b5ba10216d2af0402119)
2015-11-09 18:36:28 -05:00
Antonio Murdaca 2c3d4a7f15 graph: do not error out if images can't be restored
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit eaa4047792d2495276383332c4ad4c573e5e8275)
2015-11-09 18:36:28 -05:00
Mary Anthony 2c20ae1fef Fixing BTRFS > Btrfs
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit 90e16ab8f97fc5146aab2e77a0fa6ec2d225ba32)
2015-11-09 18:36:27 -05:00
Jana Radhakrishnan 8a30a35b11 Fix a corner case issue when daemon panics
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 79cffa5ce4a71b29eed66e26c1fb7f153be5c045)
2015-11-09 18:36:27 -05:00
harold cooper 7e485e614c fix documentation inconsistency for volume create
the example command uses `/world` but the description refers to `/src`

Signed-off-by: Harold Cooper <hrldcpr@gmail.com>
(cherry picked from commit f67da614e9963e626d4ec12fd624249947b97d6a)
2015-11-09 18:36:27 -05:00
Alessandro Boch e1f59b5987 Verify Endpoint.Info() before accessing it
- During concurrent operations in multihost environment,
  it is possible that the implementer of `EndpointInfo`
  is nil. It simply means the endpoint is no longer
  available in the datastore.

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 54d22cbd9a04a965c935a693bf403d2c87109b5a)
2015-11-09 18:36:27 -05:00
David Calavera 04c79bb941 Make the stats collector to collect network stats.
Currently, we get the network stats each time per subscriber, causing a
high load of cpu when there are several subscribers per container.

This change makes the daemon to collect once and publish N times, where N is the
number of subscribers per container.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 453473d6a964e58f4a61599bd90d62d0088f0cc2)
2015-11-09 18:36:27 -05:00
Stephen J Day 4158c70f58 Avoid panic on write after close in http
By adding a (*WriteFlusher).Close, we limit the Write calls to possibly
deallocated http response buffers to the lifetime of an http request.
Typically, this is seen as a very confusing panic, the cause is usually a
situation where an http.ResponseWriter is held after request completion. We
avoid the panic by disallowing further writes to the response writer after the
request is completed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit ec2289b2d9ac79fd5e0f69f56f023dfe8ee78bf8)
2015-11-09 18:36:27 -05:00
Alessandro Boch a9450f35cc Fix bug in initializeNetwork()
- On `docker run --net <network id> ...`
  the bug would cause the container to attempt
  to connect to the network two times
- Also made sure endpoint creation rollback will
  be executed on failures in `func (container *Container) connectToNetwork()`

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 45e71a79840887b7974387bedba0544015ab4e3b)
2015-11-09 18:36:26 -05:00
David Calavera 08091ba9fb Turn IPC unmount errors into warnings.
And do not try to unmount empty paths.

Because nobody should be woken up in the middle of the night for them.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit a54d5932e3a644317c77d59bc5aee562841d5c20)
2015-11-09 18:36:26 -05:00