Sebastiaan van Stijn f7df2b4669 Merge pull request #33735 from tonistiigi/force-pull-fix ...

builder: fix copy —from conflict with force pull
Upstream-commit: 795a2fdbcb31fdc80ed5bb1fc8bf01e44b1a961d
Component: engine

2017-06-21 12:07:54 -07:00

..

caps

…

cluster

Redact the swarm's spec's signing CA cert when getting swarm info, because

2017-06-15 18:26:01 -07:00

config

add NamedUlimitOpt implement NamedOption to fix 32528

2017-06-16 10:14:09 +08:00

discovery

The returned err should be printed

2017-03-29 09:00:50 +08:00

events

support cluster events

2017-05-17 11:46:30 -07:00

exec

…

graphdriver

Merge pull request #33587 from bergwolf/aufs

2017-06-20 15:51:42 -07:00

initlayer

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

links

use t.Fatal() to output the err message where the values used for formatting

2017-02-23 10:16:22 +08:00

logger

* standardize timeouts for log reads and writes for logger adapter tests

2017-06-18 18:47:45 -07:00

network

…

stats

Do not treat C.sysconf(C._SC_NPROCESSORS_ONLN) non-zero errno as error

2017-06-01 18:23:49 +03:00

apparmor_default_unsupported.go

…

apparmor_default.go

apparmor: make pkg/aaparser work on read-only root

2017-05-18 00:05:13 +10:00

archive_tarcopyoptions_unix.go

Fix vfs unit test and port VFS to the new IDMappings

2017-06-07 11:44:34 -04:00

archive_tarcopyoptions_windows.go

daemon/archive.go: Fix copy routines to preserve UID.

2017-04-12 10:33:19 +00:00

archive_tarcopyoptions.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

archive_unix.go

Remove CopyOnBuild from the daemon.

2017-06-08 15:06:54 -04:00

archive_windows.go

Remove CopyOnBuild from the daemon.

2017-06-08 15:06:54 -04:00

archive.go

Fix copy when used with scratch and images with empty RootFS

2017-06-08 15:07:16 -04:00

attach.go

Add a restarting check to ContainerAttach

2017-05-20 11:27:45 +08:00

auth.go

…

bindmount_solaris.go

…

bindmount_unix.go

…

build.go

builder: fix copy —from conflict with force pull

2017-06-20 15:45:33 -07:00

cache.go

…

changes.go

…

checkpoint.go

Fix checkpoint ls

2017-05-18 10:57:10 +08:00

cluster.go

Fix race condition between swarm and libnetwork

2017-05-10 21:16:52 -07:00

commit.go

Fix copy when used with scratch and images with empty RootFS

2017-06-08 15:07:16 -04:00

configs_linux.go

Add config support to executor backend

2017-05-11 10:08:21 -07:00

configs_unsupported.go

Add Windows configs support

2017-05-16 14:25:32 -07:00

configs_windows.go

Add Windows configs support

2017-05-16 14:25:32 -07:00

configs.go

Add config support to executor backend

2017-05-11 10:08:21 -07:00

container_linux.go

…

container_operations_solaris.go

…

container_operations_unix.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

container_operations_windows.go

Add Windows configs support

2017-05-16 14:25:32 -07:00

container_operations.go

Lock container while connecting to a new network.

2017-05-31 15:13:04 -04:00

container_windows.go

…

container.go

set 1ms as container duration minimum value

2017-04-12 15:45:29 -07:00

create_unix.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

create_windows.go

…

create.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

daemon_experimental.go

…

daemon_linux_test.go

use t.Fatal() to output the err message where the values used for formatting

2017-02-23 10:16:22 +08:00

daemon_linux.go

Skip evaluation of symlinks to data root on IoT Core

2017-06-13 15:02:35 -07:00

daemon_solaris.go

Skip evaluation of symlinks to data root on IoT Core

2017-06-13 15:02:35 -07:00

daemon_test.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

daemon_unix_test.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

daemon_unix.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

daemon_unsupported.go

…

daemon_windows.go

Merge pull request #33498 from darrenstahlmsft/IoTDataPartition

2017-06-15 15:52:01 -07:00

daemon.go

Merge pull request #33498 from darrenstahlmsft/IoTDataPartition

2017-06-15 15:52:01 -07:00

debugtrap_unix.go

daemon: Remove daemon datastructure dump functionality

2017-06-08 14:08:49 -07:00

debugtrap_unsupported.go

…

debugtrap_windows.go

daemon: Remove daemon datastructure dump functionality

2017-06-08 14:08:49 -07:00

delete_test.go

Use a test table in the daemon delete unit tests

2017-04-18 10:30:40 +03:00

delete.go

Update Container Wait Backend

2017-05-16 15:09:14 -07:00

dependency.go

Add config support to executor backend

2017-05-11 10:08:21 -07:00

disk_usage.go

Do not calculate size for local volumes with mount

2017-06-09 18:28:46 -04:00

errors.go

Use distribution reference

2017-02-07 11:08:37 -08:00

events_test.go

use t.Fatal() to output the err message where the values used for formatting

2017-02-23 10:16:22 +08:00

events.go

support cluster events

2017-05-17 11:46:30 -07:00

exec_linux.go

daemon: also ensureDefaultApparmorProfile in exec path

2017-03-13 15:20:05 +11:00

exec_solaris.go

…

exec_windows.go

…

exec.go

Update ContainerWait API

2017-05-16 15:11:39 -07:00

export.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

getsize_unix.go

Don’t hold container lock for size calculation

2017-02-18 18:11:48 -08:00

health_test.go

Added start period option to health check.

2017-04-06 12:35:34 +02:00

health.go

Add container environment variables correctly to the health check

2017-05-21 21:39:00 +03:00

image_delete.go

Use distribution reference

2017-02-07 11:08:37 -08:00

image_exporter.go

…

image_history.go

Use distribution reference

2017-02-07 11:08:37 -08:00

image_inspect.go

Use distribution reference

2017-02-07 11:08:37 -08:00

image_pull.go

Expose a smaller interface for the Builder retrieving images from daemon

2017-05-10 17:58:57 -04:00

image_push.go

Use distribution reference

2017-02-07 11:08:37 -08:00

image_tag.go

Use distribution reference

2017-02-07 11:08:37 -08:00

image.go

Expose a smaller interface for the Builder retrieving images from daemon

2017-05-10 17:58:57 -04:00

images.go

Ignore layer does not exist error from docker images

2017-03-16 09:21:51 +08:00

import.go

Remove the last of pkg/httputil

2017-06-02 16:54:36 -04:00

info_unix_test.go

Refactor "init" version parsing, and add unit-test

2017-04-08 11:28:37 +02:00

info_unix.go

Fix missing "--version" argument

2017-06-11 23:31:47 +02:00

info_windows.go

…

info.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

inspect_solaris.go

…

inspect_unix.go

Don’t hold container lock for size calculation

2017-02-18 18:11:48 -08:00

inspect_windows.go

…

inspect.go

Update ContainerWait API

2017-05-16 15:11:39 -07:00

keys_unsupported.go

…

keys.go

…

kill.go

Merge pull request #33335 from cpuguy83/33334_check_unset_sig

2017-06-01 23:10:16 +02:00

links.go

…

list_unix.go

…

list_windows.go

…

list.go

28722: List of containers with networkID filter is not working

2017-03-31 08:57:09 +00:00

logdrivers_linux.go

…

logdrivers_windows.go

…

logs_test.go

…

logs.go

Prevent ContainerLogs from hanging if container doesn't run for long

2017-04-20 12:27:51 +01:00

metrics_unix.go

Add support for metrics plugins

2017-05-12 00:30:09 -04:00

metrics_unsupported.go

Add support for metrics plugins

2017-05-12 00:30:09 -04:00

metrics.go

Add support for metrics plugins

2017-05-12 00:30:09 -04:00

monitor_linux.go

…

monitor_solaris.go

…

monitor_windows.go

…

monitor.go

When daemon is in startup process, could not start container

2017-06-14 18:53:18 +08:00

mounts.go

Fix issue backporting mount spec to pre-1.13 obj

2017-05-11 12:31:53 -04:00

names.go

…

network.go

Integrate local datascope network with swarm

2017-05-17 15:50:28 -07:00

oci_linux.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

oci_solaris.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

oci_windows.go

Use CpuMaximum instead of CpuPercent for more precision

2017-05-19 12:33:14 -07:00

pause.go

…

prune.go

prevent image prune panic

2017-05-26 12:54:39 -07:00

reload_test.go

Add daemon option to push foreign layers

2017-05-16 14:36:36 -07:00

reload.go

Add daemon option to push foreign layers

2017-05-16 14:36:36 -07:00

rename.go

…

resize.go

…

restart.go

…

search_test.go

…

search.go

…

seccomp_disabled.go

…

seccomp_linux.go

Update moby to runc and oci 1.0 runtime final rc

2017-05-05 13:45:45 -07:00

seccomp_unsupported.go

…

secrets_linux.go

…

secrets_unsupported.go

Add Windows secrets support

2017-05-16 11:30:06 -07:00

secrets_windows.go

Add Windows secrets support

2017-05-16 11:30:06 -07:00

secrets.go

Add config support to executor backend

2017-05-11 10:08:21 -07:00

selinux_linux.go

Switch to using opencontainers/selinux for selinux bindings

2017-04-24 21:29:47 +02:00

selinux_unsupported.go

…

start_unix.go

…

start_windows.go

Merge pull request #33311 from msabansal/dnssearch

2017-05-30 13:09:18 +02:00

start.go

…

stats_collector.go

…

stats_unix.go

…

stats_windows.go

…

stats.go

Send "Name" and "ID" when stating stopped containers

2017-02-09 09:46:59 +08:00

stop.go

Update ContainerWait API

2017-05-16 15:11:39 -07:00

top_unix_test.go

Fixing issue of docker top command failure when dealing with -m option

2017-03-10 02:50:21 +00:00

top_unix.go

Fixing issue of docker top command failure when dealing with -m option

2017-03-10 02:50:21 +00:00

top_windows.go

…

unpause.go

…

update_linux.go

Add --cpus support for docker update

2017-04-06 15:40:12 -07:00

update_solaris.go

…

update_windows.go

…

update.go

Remove ContainerUpdateCmdOnBuild, it does nothing.

2017-05-03 10:59:38 -04:00

volumes_unit_test.go

…

volumes_unix_test.go

Fix issue backporting mount spec to pre-1.13 obj

2017-05-11 12:31:53 -04:00

volumes_unix.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00

volumes_windows.go

Partial refactor of UID/GID usage to use a unified struct.

2017-06-07 11:44:33 -04:00

volumes.go

Merge pull request #33257 from mtesselH/master

2017-05-29 10:48:07 +01:00

wait.go

Update ContainerWait API

2017-05-16 15:11:39 -07:00

workdir.go

Remove error return from RootPair

2017-06-07 11:45:33 -04:00