1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/daemon
Kay Yan 3b9269760c Fix conversion of restart-policy from GRPC
restart-condition for services from "on_failure" to "on-failure".

Since GRPC does not support dashes in properties, this change
added a conversion when _setting_ the restart-condition.

However, when inspecting a service, no conversion took place
from the internal GRPC value, resulting in "on_failure" to
be shown.

This change updates the conversion to fix this, and removes
a "hack" that was previously used for this, now using a
Switch to compare to actual types.

Before this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on_failure","MaxAttempts":0}

Afer this change:

    docker service create --name web --restart-condition=on-failure nginx:alpine

    docker service inspect --format '{{ json .Spec.TaskTemplate.RestartPolicy }}' web
    {"Condition":"on-failure","MaxAttempts":0}

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
(cherry picked from commit bc32fcabeb)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-20 13:24:32 -07:00
..
caps
cluster Fix conversion of restart-policy from GRPC 2016-10-20 13:24:32 -07:00
events Make daemon events listen for plugin lifecycle events. 2016-08-11 17:56:43 -07:00
exec
graphdriver Add retry logic during aufs unmount. 2016-09-26 19:35:12 -07:00
links
logger daemon/logger: fix races in channel close 2016-06-30 17:11:13 -07:00
network Add Swarm management backend 2016-06-13 22:16:18 -07:00
apparmor_default.go
apparmor_default_unsupported.go
archive.go
archive_unix.go
archive_windows.go
attach.go Merge pull request #22777 from WeiZhang555/wait-restarting 2016-06-12 13:01:20 +02:00
auth.go
changes.go
commit.go
config.go Split advertised address from listen address 2016-07-25 23:18:03 -07:00
config_experimental.go
config_solaris.go Daemon changes to pass exec-root to libnetwork 2016-07-25 23:18:14 -07:00
config_stub.go
config_test.go Add support for multiples runtimes 2016-06-14 07:47:31 -07:00
config_unix.go Daemon changes to pass exec-root to libnetwork 2016-07-25 23:18:14 -07:00
config_windows.go Daemon changes to pass exec-root to libnetwork 2016-07-25 23:18:14 -07:00
container.go Validate hostname starting from 1.24 API. 2016-07-08 15:32:19 -07:00
container_operations.go Fix regression on --link on bridge network 2016-07-25 23:17:08 -07:00
container_operations_solaris.go
container_operations_unix.go
container_operations_windows.go
create.go Validate hostname starting from 1.24 API. 2016-07-08 15:32:19 -07:00
create_unix.go
create_windows.go
daemon.go add lock in libcontainerd client AddProcess of Windows 2016-10-20 11:38:36 -07:00
daemon_experimental.go Make daemon events listen for plugin lifecycle events. 2016-08-11 17:56:43 -07:00
daemon_linux.go
daemon_linux_test.go
daemon_solaris.go Add --oom-score-adjust to daemon 2016-07-25 23:14:57 -07:00
daemon_stub.go Make daemon events listen for plugin lifecycle events. 2016-08-11 17:56:43 -07:00
daemon_test.go fix typos 2016-07-25 23:18:15 -07:00
daemon_unix.go Vendor in new containerd 2016-07-25 23:15:42 -07:00
daemon_unix_test.go Daemon to support network restore 2016-06-14 16:45:25 -07:00
daemon_unsupported.go
daemon_windows.go Add --oom-score-adjust to daemon 2016-07-25 23:14:57 -07:00
debugtrap_unix.go
debugtrap_unsupported.go
debugtrap_windows.go
delete.go
delete_test.go fix typos 2016-07-25 23:18:15 -07:00
discovery.go
discovery_test.go
errors.go
events.go Make daemon events listen for plugin lifecycle events. 2016-08-11 17:56:43 -07:00
events_test.go
exec.go Update libcontainerd.AddProcess to accept a context 2016-07-25 23:15:43 -07:00
exec_linux.go
exec_solaris.go
exec_windows.go
export.go
health.go Reset health status to starting when a container is restarted 2016-10-20 11:36:43 -07:00
health_test.go healthcheck: do not interpret exit code 2 as "starting" 2016-07-25 23:24:47 -07:00
image.go
image_delete.go Fix untag without force while container running 2016-07-26 01:53:17 -07:00
image_exporter.go
image_history.go
image_inspect.go
image_pull.go
image_push.go
image_tag.go
images.go Treat digest only images as dangling 2016-07-08 15:32:14 -07:00
import.go
info.go Fix panic when meminfo couldn't be read 2016-07-12 15:50:38 -07:00
inspect.go Fix race on force deleting container created by task 2016-06-14 16:49:04 -07:00
inspect_solaris.go
inspect_unix.go
inspect_windows.go Add Swarm management backend 2016-06-13 22:16:18 -07:00
keys.go Change root_maxkeys 2016-06-30 16:47:52 -07:00
keys_unsupported.go Change root_maxkeys 2016-06-30 16:47:52 -07:00
kill.go fix typos 2016-07-25 23:18:15 -07:00
links.go
links_test.go
list.go Check for non-nil container after match 2016-09-26 19:33:23 -07:00
list_unix.go
list_windows.go
logdrivers_linux.go
logdrivers_windows.go
logs.go Fix panic while merging log configs to nil map 2016-07-12 15:50:38 -07:00
logs_test.go Fix panic while merging log configs to nil map 2016-07-12 15:50:38 -07:00
monitor.go Attach stdin after attach stdout/err to avoid an rpc lock 2016-07-26 19:17:22 -07:00
monitor_linux.go
monitor_solaris.go
monitor_windows.go Fix race on force deleting container created by task 2016-06-14 16:49:04 -07:00
mounts.go
names.go
network.go Handle ingress sbox creation gracefully 2016-07-25 23:14:57 -07:00
oci_linux.go Fix misspell typos 2016-06-30 16:47:43 -07:00
oci_solaris.go
oci_windows.go
pause.go
rename.go No need for container.Lock if rename same name 2016-06-30 16:47:49 -07:00
resize.go
restart.go
search.go Add --limit option to docker search 2016-06-02 19:12:20 -07:00
search_test.go Add --limit option to docker search 2016-06-02 19:12:20 -07:00
seccomp_disabled.go Fix seccomp output in docker info 2016-07-12 15:43:38 -07:00
seccomp_linux.go Fix seccomp output in docker info 2016-07-12 15:43:38 -07:00
seccomp_unsupported.go Fix seccomp output in docker info 2016-07-12 15:43:38 -07:00
selinux_linux.go
selinux_unsupported.go
start.go Remove the support of setting host configuration options when the container starts 2016-09-26 19:33:58 -07:00
start_linux.go Update to new swarmkit/engine-api 2016-07-01 00:40:37 -07:00
start_windows.go Add support for multiples runtimes 2016-06-14 07:47:31 -07:00
stats.go
stats_collector_solaris.go
stats_collector_unix.go
stats_collector_windows.go
stop.go
top_unix.go Validate arguments for ps in docker top 2016-07-08 15:33:30 -07:00
top_unix_test.go Validate arguments for ps in docker top 2016-07-08 15:33:30 -07:00
top_windows.go
unpause.go
update.go Validate hostname starting from 1.24 API. 2016-07-08 15:32:19 -07:00
update_linux.go Update containerd and runc vendoring 2016-06-14 07:47:31 -07:00
update_solaris.go
update_windows.go
volumes.go daemon: allow tmpfs to trump over VOLUME(s) 2016-06-16 23:36:51 -07:00
volumes_unit_test.go
volumes_unix.go daemon: allow tmpfs to trump over VOLUME(s) 2016-06-16 23:36:51 -07:00
volumes_windows.go
wait.go Fix race on force deleting container created by task 2016-06-14 16:49:04 -07:00