Commit Graph

4937 Commits

Author SHA1 Message Date
3276f20bd0 Update links to Docker Hub
Updates links to Docker Hub with their new
URLs to prevent redirects.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69004ff67eed6525d56a92fdc69466c41606151a
Component: engine
2016-03-04 15:48:52 +01:00
6f468d5dd9 Adds clarification to behavior of missing directories.
Closes #20920

Signed-off-by: Micah Zoltu <micah@zoltu.net>
Upstream-commit: 889d06178adef05d9f9d34a2098f0e6023b84bed
Component: engine
2016-03-03 23:41:13 +00:00
c06747671b Merge pull request #20262 from cpuguy83/implemnt_mount_opts_for_local_driver
Support mount opts for `local` volume driver
Upstream-commit: c4be28d6a81ce480a24fdba04dc78a3a5c8a1f08
Component: engine
2016-03-03 09:02:12 -08:00
8bbce28a1d Support mount opts for local volume driver
Allows users to submit options similar to the `mount` command when
creating a volume with the `local` volume driver.

For example:

```go
$ docker volume create -d local --opt type=nfs --opt device=myNfsServer:/data --opt o=noatime,nosuid
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b05b2370757d7143d761e5e6abb8c0f9b009f737
Component: engine
2016-03-03 10:32:25 -05:00
4dd14aa176 Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
Add KernelMemory to "info" and show warning
Upstream-commit: 15e68dc8eefad6b5b125209438a04d1d443e5b26
Component: engine
2016-03-03 13:14:51 +01:00
fdf616950e docs: security: seccomp: mention Docker needs seccomp build and check config
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dc0397c9a8ae7b5074dfbbad71ed7dd37b163a48
Component: engine
2016-03-03 12:04:09 +01:00
7f5a363deb Add KernelMemory to "info" and show warning
This change adds "KernelMemory" to the /info endpoint and
shows a warning if KernelMemory is not supported by the kernel.

This makes it more consistent with the other memory-limit
options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 747a486b4aac2ebbbb28bd713b9a4a929f89353b
Component: engine
2016-03-02 23:32:25 +01:00
576af48c09 Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
Add CgroupDriver to docker info
Upstream-commit: 508a17baba3c39496008fc5b5e3fe890b8a1b31b
Component: engine
2016-03-02 23:17:27 +01:00
e53352c54a docs: improve note for Fedora 22
Move the note more up, to prevent people from starting
the daemon with --userns-remap before touching the files.

Also clarify that these steps must be done *before* enabling
userns-remap and starting the daemon.

Also fixed some minor Markup formatting issues.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 069da069cb5386e6a441f34d5813a94fc738de59
Component: engine
2016-03-02 14:46:18 +01:00
17d0f2d01e Add CgroupDriver to docker info
Fixes: #19539

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ca89c329b9f0748da74d08d02a47bc494e7965e2
Component: engine
2016-03-02 20:07:06 +08:00
79fb33ace9 Merge pull request #18766 from mikedanese/gcplogs
Add logging driver for Google Cloud Logging
Upstream-commit: 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3
Component: engine
2016-03-02 02:09:44 +01:00
461ed7624b daemon/logger: Add logging driver for Google Cloud Logging
Signed-off-by: Mike Danese <mikedanese@google.com>
Upstream-commit: ed1b9fa07a0b34315d2fa624b978d3f8627319c2
Component: engine
2016-03-01 08:06:10 -08:00
afc4d63ffe Merge pull request #20565 from kencochrane/remove_email_on_login
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00
90fcd77c32 Merge pull request #20310 from hqhq/hq_cgroup_parent_docs
Add docs for cgroup-parent of systemd cgroup
Upstream-commit: 87fb26bc42afa4650fce88f8130fb7660ff898db
Component: engine
2016-03-01 13:20:23 +01:00
42a4bb9e98 Add docs for cgroup-parent of systemd cgroup
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c7f2079a9b3d8b38a6a933524766aa77a2658393
Component: engine
2016-03-01 18:31:17 +08:00
ede5a6202a Remove the duplication
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f8f28684f196ff3790ff1c738e81743821fc860
Component: engine
2016-03-01 17:53:36 +08:00
414f40cb7a Merge pull request #20754 from lyndaoleary/docker-terminology
Changed Docker references to Docker Engine in docs
Upstream-commit: 89f6d3b0416fa3055724099d6eaa774403480ada
Component: engine
2016-03-01 05:30:45 +01:00
2919d69a0c Remove email address field from login
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5
Component: engine
2016-02-29 17:53:27 -08:00
9c67867382 Changed Docker references to Docker Engine in docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 0b882cc0140bc03dfe79462c5cdf77b972c94067
Component: engine
2016-03-01 00:57:23 +00:00
2180969e3a Merge pull request #20107 from calavera/client_auth_store
Client credentials store.
Upstream-commit: 29ce086e38384c54f6f2d8f09578a75c4c9d9593
Component: engine
2016-02-29 22:31:34 +01:00
7d62a9ef68 Merge pull request #20780 from runcom/revert-sudo-user
Revert sudo user
Upstream-commit: a5d98b82ea641349640d07b2f62a047b94592a5e
Component: engine
2016-02-29 11:48:24 -08:00
8a7585ce8e Client credentials store.
This change implements communication with an external credentials store,
ala git-credential-helper. The client falls back the plain text store,
what we're currently using, if there is no remote store configured.

It shells out to helper program when a credential store is
configured. Those programs can be implemented with any language as long as they
follow the convention to pass arguments and information.

There is an implementation for the OS X keychain in https://github.com/calavera/docker-credential-helpers.
That package also provides basic structure to create other helpers.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: cf721c23e715e545eccf8484e145c2d18d6a6a23
Component: engine
2016-02-29 13:01:31 -05:00
a2d2add430 Merge pull request #20787 from itsthenetwork/Fix-Seccomp-Readme
Update seccomp.md
Upstream-commit: b1955a66f536dfb8fe15d00059ae527f49c35ba9
Component: engine
2016-02-29 09:54:48 -08:00
2932936552 Update seccomp.md
Corrected titles to use title case. Added link to default.json and some numerical detail. Changed example JSON to a portion of the actual default file, with the correct defaultAction.

Signed-off-by: Steven Iveson <steven.iveson@infinityworks.com>
Upstream-commit: 244e5fc51653b47a974ad111022ea923ddebaf05
Component: engine
2016-02-29 16:32:45 +00:00
4cc9b2c995 Merge pull request #20777 from Anonymooseable/document-plugin-types
Document interfaces a plugin can implement
Upstream-commit: c0c10daebf2372fdc2ca46c6535e1daac628ab48
Component: engine
2016-02-29 17:31:06 +01:00
1de8cdf35e Remove experimental GraphDriver plugin type
Signed-off-by: Linus Heckemann <anonymouse2048@gmail.com>
Upstream-commit: 3ef13258289ef01102c0ae01a8d9af49d36441fb
Component: engine
2016-02-29 15:59:54 +00:00
cee58ed27a Merge pull request #20629 from wallnerryan/intro-volumes
Intro volume drivers in dockervolumes.md
Upstream-commit: 6c01d2a0cf4feb24bddf6830fd1683060c0ff309
Component: engine
2016-02-29 16:59:43 +01:00
47e8179868 intro volume plugins in userguide volumes
NOTE should be lowercase

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

add link to list of plugins

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

address changres

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
Upstream-commit: b6fdcd3a342dc882955253e0a39711ed4ac078fc
Component: engine
2016-02-29 10:56:32 -05:00
c247f38736 Merge pull request #20736 from elchris82/master
Changed the Example request in Remote API reference to connect a container to a network
Upstream-commit: 79c24a082004251bd899b8bd549da43e3abca10d
Component: engine
2016-02-29 15:06:20 +01:00
c762170458 Revert "resolve the config file from the sudo user"
This reverts commit afde6450ee7bd4a43765fdc0a9799b411276d9e4.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 863b5716173db320ddc03847a639964f495a7953
Component: engine
2016-02-29 13:51:43 +01:00
cbd8a29659 Document interfaces a plugin can implement
Signed-off-by: Linus Heckemann <lheckemann@twig-world.com>
Upstream-commit: dd729efe028667b2180922e2c7e649a5b8ec52e9
Component: engine
2016-02-29 09:43:44 +00:00
b26295c87c Merge pull request #20776 from terryding77/doc_changes
change container word spell in docs
Upstream-commit: ffd8a0e0fbaaf4f8dbaea66c3e06a8dc24dc22ca
Component: engine
2016-02-29 10:38:06 +01:00
7294d486c4 change container word spell in docs
Signed-off-by: terryding77 <550147740@qq.com>
Upstream-commit: adda1060aa3c7a41fddc4cdeaac92f946c40e2d8
Component: engine
2016-02-29 16:59:53 +08:00
5f0c16d34d Merge pull request #20604 from coolljt0725/fix_reload
Fix configuration reloading
Upstream-commit: 20a038eca68e4188e1cd812293aea8cb220cf08f
Component: engine
2016-02-29 07:14:15 +01:00
bd7351183c fixed formatting; added handy -y to apt-get install
Signed-off-by: Pavel Sutyrin <pavel.sutyrin@gmail.com>
Upstream-commit: 30c2770a736e6c731f4046431f0f4275dadbd536
Component: engine
2016-02-28 20:37:04 +03:00
345f6f4c72 Changed the Remote API reference to connect a container to a network in v1.22
and v1.23

Signed-off-by: Christian Böhme <development@boehme3d.de>
Upstream-commit: 2bd365ae2f9c80aa03db30c817ced6ee1d80aa45
Component: engine
2016-02-27 01:31:03 +01:00
ae16b13956 Merge pull request #20515 from raesene/patch-1
Update security.md with basic User Namespace info.
Upstream-commit: 9792308b840c017f5772cee026f9537b2efe33f1
Component: engine
2016-02-26 14:02:46 +01:00
7adb67365b remove leftover Ubuntu 15.04 from install docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1ca064cb62a88366bc13af67a112aff8992b6b68
Component: engine
2016-02-26 13:00:27 +01:00
d0fa8c5e37 Merge pull request #20572 from runcom/sudo-user
resolve the config file from the sudo user
Upstream-commit: 61d24e769d9f7a075f6881ba8b4523d5db9dcd6d
Component: engine
2016-02-25 16:05:25 +01:00
8bd4c1506d docs: simplify some steps of the overlay network guide
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: db5ded0dfc28c71276acf8500fabe3c64c15fbe1
Component: engine
2016-02-25 13:17:26 +01:00
ae2cbbdd21 Add the Local Persist plugin
I wasn't 100% sure if it was appropriate to add plugin here, but @thaJeztah invited me to do so, so here it is!

(see https://github.com/CWSpear/local-persist/issues/17#issuecomment-188523784)

Signed-off-by: Cameron Spear <cameronspear@gmail.com>
Upstream-commit: cc085be7cc19d2d1aed39c243b6990a7d04ee639
Component: engine
2016-02-24 23:29:58 -08:00
ba3d7fd0c4 Fix configuration reloading
There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts'
and 'cluster-advertise' that can be reconfigured, configure any of these
options should not affect other options which may have configured in flags.
But this is not true, for example, I start a daemon with -D to enable the
debugging, and after a while, I want reconfigure the 'label', so I add a file
'/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon
to reconfigure the daemon, it work, but the debugging of the daemon is also diabled.
I don't think this is a expeted behaviour.
This patch also have some minor refactor of reconfiguration of cluster-advertiser.
Enable user to reconfigure cluster-advertiser without cluster-store in config file
since cluster-store could also be already set in flag, and we only want to reconfigure
the cluster-advertiser.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b9366c9609166d41e987608041b5a2079726aa5f
Component: engine
2016-02-24 21:12:14 -05:00
9933657e25 Docs: add note about CMD and ENTRYPOINT commands
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 1ed84770c52b0abd026fe9c1acc51f19d94fad12
Component: engine
2016-02-24 22:57:25 +01:00
12a0699a2c Update security.md with basic User Namespace info.
Just some suggested wording to update this page to take account of User Namespaces being available as of 1.10.

Signed-off-by: Rory McCune <rorym@mccune.org.uk>
Upstream-commit: c1e53ad1aa9d82568efc045444a5df76b1471905
Component: engine
2016-02-24 20:53:00 +00:00
97222044b9 docs: reference: commandline: daemon: fedora 23+ has mapping files
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: eb902ef25773ca670eee126351547e77f384ad9d
Component: engine
2016-02-24 15:43:28 +01:00
008e491a8c resolve the config file from the sudo user
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: afde6450ee7bd4a43765fdc0a9799b411276d9e4
Component: engine
2016-02-24 15:41:00 +01:00
34876f5fef Merge pull request #20017 from calavera/expose_volumes_in_ps
Add mounts to docker ps.
Upstream-commit: 034a1a8dfd17d89123bf0405f898e880575ed775
Component: engine
2016-02-24 11:08:21 +01:00
d7e2b23289 Merge pull request #20610 from justechn/fix_docs
Fix docs
Upstream-commit: 2ed1806b2c563e2276d81066cc492aaf7bcb145b
Component: engine
2016-02-23 13:45:29 -08:00
e61c546929 fixing the path of the key pair
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
2016-02-23 11:32:28 -07:00
edf220176a Add mounts to docker ps.
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bd4fb00fb6241d35537b460a2d9f48256111ae7a
Component: engine
2016-02-23 12:10:24 -05:00