From 151e21fc22c4588aa8a4692b9c7e16da7036b4d6 Mon Sep 17 00:00:00 2001 From: em Date: Sun, 19 Feb 2017 19:05:30 +0100 Subject: [PATCH] do not use newlines in docker start command --- Gemfile.lock | 2 +- lib/docker-sync/sync_strategy/unison.rb | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5f7fe99e..448773ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - docker-sync (0.2.0.rc1) + docker-sync (0.2.0) daemons (~> 1.2, >= 1.2.3) docker-compose (~> 1.0, >= 1.0.2) dotenv (~> 2.1, >= 2.1.1) diff --git a/lib/docker-sync/sync_strategy/unison.rb b/lib/docker-sync/sync_strategy/unison.rb index eb6963d0..283b6103 100644 --- a/lib/docker-sync/sync_strategy/unison.rb +++ b/lib/docker-sync/sync_strategy/unison.rb @@ -171,14 +171,7 @@ def start_container if exists == '' say_status 'ok', "creating #{container_name} container", :white if @options['verbose'] run_privileged = '--privileged' if @options.key?('max_inotify_watches') #TODO: replace by the minimum capabilities required - cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' \ - -v #{volume_name}:#{@options['dest']} \ - -e VOLUME=#{@options['dest']} \ - -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} \ - #{additional_docker_env} \ - #{run_privileged} \ - --name #{container_name} \ - -d #{@docker_image}" + cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e VOLUME=#{@options['dest']} -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} #{additional_docker_env} #{run_privileged} --name #{container_name} -d #{@docker_image}" else say_status 'ok', "starting #{container_name} container", :white if @options['verbose'] cmd = "docker start #{container_name} && docker exec #{container_name} supervisorctl restart unison"