Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

…fest

@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in distribution/distribution#1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit c18d03a)

Docker 1.11 added a feature to set labels on volumes,
networks and images (during build), but these changes
were not documented in the API documentation.

This adds the new features to the documentation.

Also fixes some minor formatting, and options that
were not used in the examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ba353f3)

RPC connection closing error will be reported every time we shutdown
daemon, this error is expected, so we should remove this error to avoid
confusion to user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
(cherry picked from commit a02ae66)

…tainer

Don't throw "restartmanager canceled" error for no restart policy container
and add the container id to the warning message if a container has restart policy
and has been canceled.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 494297b)

Auto-creation of non-existing host directories
is no longer deprecated (9d5c26b),
so this warning is no longer relevant.

This removes the deprecation warning.

Also removes the "system" package here, because it's only used
on non-Windows, so basically just called os.MkdirAll()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1d02ad2)

Fixes moby#22030

Because the publisher uses this same value to all the
stats endpoints we need to make a copy of this as soon as we get it so
that we can make our modifications without it affecting others.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit d17ee4b)

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 84d1701)

It should not be an error to call a common option to cancel restarts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit fc2e223)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit de806a6)

Why? Because the `mount` here will sometimes fail when run in
`debian:jessie`, which is what the environrment hosting the test suite
is running if run from the `Makefile`.
Also, why the heck not containerize it, all the things.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 59b83d8)

This fix tries to fix the http panics caused by container deletion
with empty names in moby#22210.

The issue was because when an empty string was passed, `GetByName()`
tried to access the first element of the name string without checking
the length. A length check has been added.

A test case for moby#22210 has been added.

This fix fixes moby#22210.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 9d8071a)

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)

(cherry picked from commit 829d188)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7bf0773)

This functionality has been fixed by
7bca932 but then it has been broken
again by a793564 and finally refixed
here.

Basically the functionality was to prompt for login when trying to pull
from the official docker hub.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 4316ae2)

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 199472c)

This avoid an extra bind mount within /var/run/docker/libcontainerd

This should resolve situations where a container having the host
/var/run bound prevents other containers from being cleanly removed
(e.g. moby#21969).

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 3135874)

This fix tries to address the inconsistency in moby#22036 where labels
set on the command line will not override labels specified in
Dockerfile, but will override labels inherited from `FROM` images.

The fix add a LABEL with command line options at the end of the
processed Dockerfile so that command line options labels always
override the LABEL in Dockerfiles (or through `FROM`).

An integration test has been added for test cases specified in moby#22036.

This fix fixes moby#22036.

NOTE: Some changes are from moby#22266 (@tiborvass).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 5844736)

commit 20a038e changed
daemon configuration reloading to check if a value
was actually set, however, it checked for the wrong
property ("label" instead of "labels"), which resulted
in the labels only to be loaded from daemon.json if both
a "label" -and- a "labels" property was present.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 455858f)

This fix tries to address the issue in moby#22244 where the remote
API `/auth` will not set the default value of `serveraddress`
if not provided. This behavior happens after only in 1.11.0
and is a regression as in 1.10.3 `serveraddress` will be assigned
with `IndexServer` if no value is provided.

The default value `IndexServer` is assigned to `serveraddress` if
no value provided in this fix.

An integration test `TestAuthApi` has been added to cover this change

This fix fixes moby#22244.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 9397319)

Restore the 1.10 logic that will reset the restart manager's timeout or
backoff delay if a container executes longer than 10s reguardless of
exit status or policy.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit b6db56b)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
(cherry picked from commit e0f98c6)
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>