docker-sync 0.4.4.beta1 → 0.4.4.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b8bbe6b36b21f2f991a463b79d3008a0005d9d
-  data.tar.gz: a89c8c32a63f9b553521f564a432971afee55435
+  metadata.gz: e2522724854fe3861a71bc30b5e20efe37d09f07
+  data.tar.gz: 341b4e4fc035377525704725f979b6b11560b7de
 SHA512:
-  metadata.gz: 7420aa5f6a8b6c484b63f167aa9a77e51500d501c897a52921dd3929f59e34c25ef383e6894a69f68b4cd0135e1ff63a67e34e8d4305e41f65454869537af07f
-  data.tar.gz: f30e1bcc306debb0a6057d70dd5d6f13a862990fdde0e7c69426d8fb539ff07ededff52bebd73c8b4564407f32ddd3ad2b1b6848f8aa2c3df35304f8075c768d
+  metadata.gz: 225f74aedc20bdeed4594bad491e04ef1645cfcb5556fca966a2142a6f3b76c5ff62d6cedf14256926346184eadc00f9eb3e6209ef7a68fa819f1b150793ddb9
+  data.tar.gz: 758eebc0c82db453f488dce3e85c3f599867b653feeda90e7008f11fe5cb0d72f431ae009c007269d3cf44ec4dd15fa089778eb82c2a247a9561a43fbaace5e6

data/VERSION

@@ -1 +1 @@
-0.4.4.beta1
+0.4.4.beta2

data/lib/docker-sync/sync_strategy/native_osx.rb

@@ -26,6 +26,10 @@ module Docker_Sync
           @docker_image = 'eugenmayer/unison:hostsync'
         end
 
+        # TODO: remove this when we have a more stable image, but for now, we need this
+        uc = UpdateChecker.new
+        uc.check_unison_hostsync_image(true)
+
         begin
           DockerSync::Preconditions::Strategy.instance.docker_available
         rescue Exception => e
@@ -36,7 +40,7 @@ module Docker_Sync
       end
 
       def start_container
-        say_status 'ok', 'Starting native_osx', :white
+        say_status 'ok', "Starting native_osx for sync #{@sync_name}", :white
         container_name = get_container_name
         host_sync_src = @options['src']
         volume_app_sync_name = @sync_name
@@ -72,7 +76,7 @@ module Docker_Sync
             `#{cmd}` || raise('Precopy failed')
             say_status 'ok', 'Starting container', :white if @options['verbose']
             # this will be run below and start unison, since we did not manipulate CMD
-            cmd = "docker run -v #{volume_app_sync_name}:/app_sync -v #{host_sync_src}:/host_sync -e HOST_VOLUME=/host_sync -e APP_VOLUME=/app_sync -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} #{additional_docker_env} #{run_privileged} --name #{container_name} #{@docker_image}"
+            cmd = "docker run -d -v #{volume_app_sync_name}:/app_sync -v #{host_sync_src}:/host_sync -e HOST_VOLUME=/host_sync -e APP_VOLUME=/app_sync -e TZ=${TZ-`readlink /etc/localtime | sed -e 's,/usr/share/zoneinfo/,,'`} #{additional_docker_env} #{run_privileged} --name #{container_name} #{@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"

data/lib/docker-sync/sync_strategy/rsync.rb

@@ -84,7 +84,8 @@ module Docker_Sync
       # this container exposes a named volume and is on one side used as the rsync-endpoint for the
       # local rsync command, on the other side the volume is mounted into the app-container to share the code / content
       def start_container
-        say_status 'ok', 'Starting rsync', :white
+        say_status 'ok', "Starting rsync for sync #{@sync_name}", :white
+
         container_name = get_container_name
         volume_name = get_volume_name
         running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' --format "{{.Names}}" | grep '^#{container_name}$'`

data/lib/docker-sync/sync_strategy/unison.rb

@@ -142,7 +142,8 @@ module Docker_Sync
       end
 
       def start_container
-        say_status 'ok', 'Starting unison', :white
+        say_status 'ok', "Starting unison for sync #{@sync_name}", :white
+
         container_name = get_container_name
         volume_name = get_volume_name
         env = {}

data/lib/docker-sync/update_check.rb

@@ -67,14 +67,14 @@ class UpdateChecker
 
   end
 
-  def check_unison_hostsync_image
-    say_status 'ok','Checking if a newer native_osx (unison:hostsync) image is available'
+  def check_unison_hostsync_image(silent = false)
+    say_status 'ok','Checking if a newer native_osx (unison:hostsync) image is available' unless silent
 
     if system("docker pull eugenmayer/unison:hostsync | grep 'Downloaded newer image for'")
-      say_status 'ok', 'Downloaded newer image for native_osx', :green
+      say_status 'ok', 'Downloaded newer image for native_osx', :green unless silent
       @newer_image_found = true
     else
-      say_status 'ok', 'No newer image found - current image is up to date.'
+      say_status 'ok', 'No newer image found - current image is up to date.' unless silent
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.4.beta1
+  version: 0.4.4.beta2
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor