Commit graph

29778 commits

Author SHA1 Message Date
Brian Goff
0ece5c788f Merge pull request #33284 from mlaventure/17.03.2-cherry-picks
17.03.2 cherry picks
2017-05-19 10:16:24 -04:00
Antonio Murdaca
adbb5b4d39 profiles: seccomp: allow clock_settime when CAP_SYS_TIME is added
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 3ab4961032)
2017-05-18 22:39:26 -07:00
Kenfe-Mickaël Laventure
69e798217c Merge pull request #33273 from cpuguy83/update_libnet_vendor_17.03
[17.03] Update libnetwork vendor
2017-05-18 13:01:19 -07:00
Brian Goff
9ef54c654b Update libnetwork vendor
Pulls in docker/libnetwork#1750

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-18 13:08:10 -04:00
Sebastiaan van Stijn
8b9c66e80d Merge pull request #33236 from cpuguy83/17.03.2_cherry_picks
17.03.2 cherry picks
2017-05-17 11:56:44 +02:00
Brian Goff
85847adadc Merge pull request #33232 from aaronlehmann/vendor-swarmkit-2591ac3
[17.03] Vendor swarmkit 2591ac3
2017-05-16 19:39:34 -04:00
Sebastiaan van Stijn
8f0684b0f6 add d_type warning to docker info, and optimize output
The overlay(2) drivers were moved up in the list of storage drivers,
and are known to have problems if the backing filesystem does not
support d_type.

Commit 2e20e63da2 added a warning,
which is logged in the daemon logs, however, many users do not
check those logs, and may overlook this warning.

This patch adds the same warning to the output of `docker info`
so that the warning is more easily found.

In addition, the output of warnings printed by `docker info` is
optimized, by;

- moving all warnings to the _end_ of the output, instead of
  mixing them with the regular output
- wrapping the storage-driver warnings, so that they are more
  easily readable

Example output with this patch applied
============================================

devicemapper using loopback devices:

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: devicemapper: usage of loopback devices is strongly discouraged for production use.
             Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.
    WARNING: bridge-nf-call-iptables is disabled
    WARNING: bridge-nf-call-ip6tables is disabled

overlay2 on xfs without d_type support;

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: overlay2: the backing xfs filesystem is formatted without d_type support, which leads to incorrect behavior.
             Reformat the filesystem with ftype=1 to enable d_type support.
             Running without d_type support will not be supported in future releases.
    WARNING: bridge-nf-call-iptables is disabled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1921559798)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:19:49 -04:00
Anusha Ragunathan
3c78938494 Add non-nil check before logging volume errors.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
(cherry picked from commit b1570baadd)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:16:32 -04:00
Brian Goff
54f75814d9 Fix panic on error looking up volume driver
(-‸ლ)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 5baf8a4118)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:14:48 -04:00
Vivek Goyal
ac7820f779 Volumes should have default propagation property "rprivate"
Until and unless user has specified a propagation property for volume, they
should default to "rprivate" and it should be passed to runc.

We can't make it conditional on HasPropagation(). GetPropagation() returns
default of rprivate if noting was passed in by user.

If we don't pass "rprivate" to runc, then bind mount could be shared even
if user did not ask for it. For example, mount two volumes in a container.
One is "shared" while other's propagation is not specified by caller. If
both volume has same source mount point of "shared", then second volume
will also be shared inside container (instead of being private).

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
(cherry picked from commit af8a1430f1)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:13:41 -04:00
Brian Goff
3600abb7aa Make sure plugin rootfs is unmounted on upgraded
In some cases, if a user specifies `-f` when disabling a plugin mounts
can still exist on the plugin rootfs.
This can cause problems during upgrade where the rootfs is removed and
may cause data loss.

To resolve this, ensure the rootfs is unmounted
before performing an upgrade.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 83f44d232d)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:11:55 -04:00
Brian Goff
9e241de40b Remove undeeded and broken selinux relabel call
The call is not needed here and wouldn't really work since `Source` in
this case is a volume name.
Further we don't neccessarily even have a volume path at this time since
the volume hasn't been mounted yet.

The volume will be relabled either:

1. When data gets copied to it from the image (if applicable) -- https://github.com/docker/docker/blob/master/container/container_unix.go#L196
2. When the container is started -- https://github.com/docker/docker/blob/master/daemon/oci_linux.go#L737

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 898e84d5fd)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:10:40 -04:00
Dan Walsh
928420b95e We need to fix labels if the user requests on volumes
Currently local volumes and other volumes that support SELinux do
not get labeled correctly.  This patch will allow a user to specify
:Z or :z when  mounting a volume and have it fix the label of the newly
created volume.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
(cherry picked from commit 0c791c8e9f)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:09:45 -04:00
Antonio Murdaca
39372e619c daemon: relabel secrets path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit b11af7b2f6)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-16 16:08:35 -04:00
Aaron Lehmann
472485ea93 Vendor swarmkit 2591ac3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-16 12:06:06 -07:00
Sebastiaan van Stijn
d33342725b Merge pull request #33207 from cpuguy83/cherry_pick_mpsec_backport
[17.03] Fix issue backporting mount spec to pre-1.13 obj
2017-05-16 01:03:32 +02:00
Brian Goff
d772750271 Fix issue backporting mount spec to pre-1.13 obj
In some cases a mount spec would not be properly backported which could
lead to accidental removal of the underlying volume on container remove
(which should never happen with named volumes).

Adds unit tests for this as well. Unfortunately I had to add a daemon
depdency for the backport function due to looking up `VolumesFrom`
specs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 3cf18596e9)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-15 15:53:19 -04:00
Victor Vieux
696df0376f Merge pull request #33118 from aaronlehmann/vendor-swarmkit-e680722
[17.03] Vendor swarmkit e680722
2017-05-10 10:37:43 -07:00
Victor Vieux
4843bdced5 Merge pull request #33120 from cpuguy83/backport_lazy-unmount-volume
[17.03.x] Backport lazy unmount volume
2017-05-10 10:37:24 -07:00
Sebastiaan van Stijn
7f394b8b35 Merge pull request #33117 from aaronlehmann/digest-pin-context-17.03
[17.03.2] cluster: Renew the context after communicating with the registry
2017-05-10 15:45:27 +02:00
Brian Goff
2dfb31c228 Use lazy unmount for local volume unmount
This is a spiritual backport of acbfe6bc56
The afformentioned commit was not cherry-picked because it is a broader
change to the codebase, whereas this is the same basic fix but localized
to the local volume driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-09 14:17:10 -04:00
Brian Goff
6aac9ab3c7 Ensure unmount before removing local volume.
When there is an error unmounting a local volume, it is still possible
to call `Remove()` on the volume causing removal of the mounted
resources which is generally not desirable.

This ensures that resources are unmounted before attempting removal.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db3576f8a0)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-05-09 13:48:45 -04:00
Aaron Lehmann
387707f03e Vendor swarmkit e68072200ebbba6ce9745b3a3e49fdba3eb71ff8
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-09 10:25:27 -07:00
Brian Goff
1bf3b68a4b Merge pull request #33028 from thaJeztah/17.03-remove-unused-filter-param
[17.03.x] Remove unused filter params from Swagger
2017-05-05 09:25:12 -04:00
Sebastiaan van Stijn
2bdaab759f
Remove unused filter params from Swagger
Commit 745795ef2e added
a `filter` query-parameter to all "prune" endpoints,
however the parameter was only used when pruning
images.

This patch removes the filter parameter from the other
endpoints, given that it is not used for those, so
there is no reason documenting it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-05-04 14:29:36 -07:00
Doug Davis
9db03bd8cd Merge pull request #32804 from bbodenmiller/patch-1
remove extra word
2017-04-28 18:39:52 -04:00
Ben Bodenmiller
9ed258872a remove extra word
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2017-04-28 15:37:48 -07:00
Vincent Demeester
c3fbca1065 Merge pull request #32724 from PatrickLang/patricklang-win-memory
Adding more on -m and --memory
2017-04-26 15:30:09 +02:00
Patrick Lang
f93270a4bb Adding description for -m, --memory
Signed-off-by: Patrick Lang <patrick.lang@hotmail.com>
2017-04-25 14:32:02 -07:00
Sebastiaan van Stijn
f2fff9d913 Merge pull request #32735 from bhavin192/patch-1
Add note about host-dir in VOLUME
2017-04-25 10:18:16 -07:00
Brian Goff
32a52716b9 Merge pull request #32791 from djalal/patch-1
fix typo
2017-04-24 08:53:30 -04:00
djalal
388ec67426 fix typo
Signed-off-by: djalal <contact@enlamp.com>
2017-04-24 14:33:49 +02:00
Tõnis Tiigi
8310663377 Merge pull request #32684 from scjane/patch-3
Update builder.md
2017-04-20 20:11:26 -07:00
Wang Jie
9b78660ef4 Update builder.md
Fix a invalid link.

Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-20 21:45:35 -05:00
Misty Stanley-Jones
4f769c6bc1 Edits and fixing note stacking
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-20 09:28:01 -07:00
Bhavin Gandhi
b9fe386870 Add note about host-dir in VOLUME
Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
2017-04-20 06:58:23 +00:00
Brian Goff
345fc1bed7 Merge pull request #32432 from thaJeztah/17.03.x-update-install-script
[17.03.x] update get.docker.com install script
2017-04-08 15:14:59 -04:00
Alexander Morozov
e2d541585f
Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
add suggestions in failure message in install script
(cherry picked from commit 002312d6c1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-07 11:20:35 +02:00
Vincent Demeester
8de0ced471
Merge pull request #32425 from tabakhase/patch-1
Fix install.sh of get.docker.com for debian-sudo
(cherry picked from commit daaf9ddfa9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-07 11:15:49 +02:00
Michael Crosby
af72a358fc
Merge pull request #29967 from justincormack/gpg-include-keys
Do not use keyservers to fetch GPG keys for apt
(cherry picked from commit 518945b6bd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-07 11:15:41 +02:00
Vincent Demeester
99d1e7f5b6
Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group
Don't encourage adding user to docker group
(cherry picked from commit 06e3812b6e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-07 11:11:17 +02:00
Sebastiaan van Stijn
ebcd590a03 Merge pull request #32390 from thaJeztah/fixup-docs-cherry-pick
[17.03.x] cli reference fixes
2017-04-06 01:37:45 +02:00
Sebastiaan van Stijn
7b29c9a4ce
Fix docs cherry-pick
commit d7bc6e4e7c
brought in markup fixes in the documentation, but
due to it being cherry-picked from "master", brought
in more changes that are not yet part of the
17.03 release.

This removes the features that are not in
the 17.03 release from the reference docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-06 01:07:46 +02:00
Victor Vieux
c79660699b Merge pull request #32322 from thaJeztah/17.03.1-cherry-picks
[17.03.x] docs cherry picks
2017-04-03 11:47:53 -07:00
Victor Vieux
bcb63f3677 Merge pull request #32298 from thaJeztah/fix-changelog
[17.03.x] fix version of containerd in changelog
2017-04-03 11:45:50 -07:00
Sebastiaan van Stijn
9c3b01cbb3
Merge pull request #32183 from JimGalasyn/delete-h1
Delete extraneous H1 title
(cherry picked from commit 0c59283fc3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:11:55 +02:00
Vincent Demeester
a024e2ad6a
Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc
Updated push.md with progress bar info
(cherry picked from commit a048e131be)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:11:50 +02:00
Sebastiaan van Stijn
6421a8d8c8
Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated
Fix indenting in deprecated engine features toc
(cherry picked from commit 0f8a3dafa4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:11:45 +02:00
John Howard
861311f17d
Merge pull request #31980 from JohnMaguire/doc-update
Add note regarding Windows VOLUME limitations
(cherry picked from commit c33c457852)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:11:39 +02:00
Vincent Demeester
70faa0801c
Merge pull request #31973 from wsong/update_df_docs
Update system df docs to call out performance implications
(cherry picked from commit f453412bd8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-03 17:11:34 +02:00