From 7de375eef1372a04c91ecf35780a48f472280cf4 Mon Sep 17 00:00:00 2001 From: Ewa Czechowska Date: Wed, 18 Mar 2015 20:54:43 +0100 Subject: [PATCH 1/2] fixes #284, runit finish script to stop a container --- providers/container.rb | 4 +++- templates/default/sv-docker-container-finish.erb | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 templates/default/sv-docker-container-finish.erb diff --git a/providers/container.rb b/providers/container.rb index 4f1f36b5eb..b969ebd07e 100644 --- a/providers/container.rb +++ b/providers/container.rb @@ -411,8 +411,10 @@ def service_init if new_resource.init_type == 'runit' runit_service service_name do run_template_name 'docker-container' - supports :restart => true, :reload => true, :status => true + finish_script_template_name 'docker-container' + supports :restart => true, :reload => true, :status => true, :stop => true action :nothing + finish true end else service service_name do diff --git a/templates/default/sv-docker-container-finish.erb b/templates/default/sv-docker-container-finish.erb new file mode 100644 index 0000000000..4095bba93f --- /dev/null +++ b/templates/default/sv-docker-container-finish.erb @@ -0,0 +1,4 @@ +#!/bin/sh + +<%= Docker::Helpers.executable(node) %> stop <%= @options['service_name'] %> + From 2ffcc3ef8fc43a15e61ddf8a4829ed8d377e74e2 Mon Sep 17 00:00:00 2001 From: Ewa Czechowska Date: Fri, 20 Mar 2015 13:25:05 +0100 Subject: [PATCH 2/2] do not restart container if runit scripts change --- providers/container.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/providers/container.rb b/providers/container.rb index b969ebd07e..d12cd20362 100644 --- a/providers/container.rb +++ b/providers/container.rb @@ -415,6 +415,7 @@ def service_init supports :restart => true, :reload => true, :status => true, :stop => true action :nothing finish true + restart_on_update false end else service service_name do