docker-sync 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f8b70cd8eadb981ebb2d30dbb2aa82ed2457a24
-  data.tar.gz: e5b01b4e856a62db95006063eb10e13bccfba9f5
+  metadata.gz: a88e284e5884eb996bd63ce35feef44508aa275d
+  data.tar.gz: 7d0c466307ff7b6cb86336e0b729f1795f0f376a
 SHA512:
-  metadata.gz: a84e897db840254b726b4fbefc20905b4b186f8c46053c5d3b8f34e48749c0bd6d9b12f4e579caa3ff34ea6e03f5428fbc876d92a878e1964cd735c6c39943af
-  data.tar.gz: 4917fb9c501ff074d3266d56557fe2859880e2383f46acb6c14efbdf54267e4baf7c868be7b39fef3d1e41524867a0761331d9d319a01da3c5ded71f141395e5
+  metadata.gz: 8823db30b0c6ca9eaa21aad241b6525595071028e75db3c307d295a4b1d3cf69cd0fced01a8a4757a73071f0b5135eaa3fc26186bbb499e17cd556d56f06dc16
+  data.tar.gz: 0a0c5a4759a34b0dbec794903529f61a515918f5e46b160af8acd1b242e001d49e04fc5dd32bb7dcb634efc90d9a5c63ea9cb5758d8baefa87ab78b790d2e68b

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

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

@@ -23,12 +23,12 @@ module DockerSync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:hostsync_0.3'
+          @docker_image = 'eugenmayer/unison:2.51.2.0'
         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)
+        uc.check_unison_image
 
         begin
           Dependencies::Docker.ensure!
@@ -47,8 +47,8 @@ module DockerSync
         env = {}
         raise 'sync_user is no longer supported, since it is not needed. Use sync_userid only please' if @options.key?('sync_user')
 
-        ignore_strings = expand_ignore_strings
-        env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
+        env['UNISON_SRC'] = '/host_sync'
+        env['UNISON_DEST'] = '/app_sync'
 
         env['UNISON_ARGS'] = ''
         if @options.key?('sync_args')
@@ -57,7 +57,12 @@ module DockerSync
           env['UNISON_ARGS'] = sync_args
         end
 
-        env['UNISON_SYNC_PREFER'] = sync_prefer
+        ignore_strings = expand_ignore_strings
+        env['UNISON_ARGS'] << ' ' << ignore_strings.join(' ')
+        env['UNISON_ARGS'] << ' ' << sync_prefer
+        env['UNISON_ARGS'] << ' -numericids -auto -batch'
+        env['UNISON_WATCH_ARGS'] = '-repeat watch'
+
         env['MAX_INOTIFY_WATCHES'] = @options['max_inotify_watches'] if @options.key?('max_inotify_watches')
         if @options['sync_userid'] == 'from_host'
           env['OWNER_UID'] = Process.uid

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

@@ -22,7 +22,7 @@ module DockerSync
         if @options.key?('image')
           @docker_image = @options['image']
         else
-          @docker_image = 'eugenmayer/unison:0.3'
+          @docker_image = 'eugenmayer/unison:2.51.2.0'
         end
         begin
           Dependencies::Unison.ensure!
@@ -147,10 +147,21 @@ module DockerSync
         container_name = get_container_name
         volume_name = get_volume_name
         env = {}
-        say_status 'ok', 'sync_user is no longer supported, since it ise no needed, use sync_userid only please', :yellow if @options.key?('sync_user')
+        raise 'sync_user is no longer supported, since it ise no needed, use sync_userid only please' if @options.key?('sync_user')
 
+        env['UNISON_SRC'] = '-socket 5000'
+        env['UNISON_DEST'] = '/app_sync'
+
+
+        env['MONIT_ENABLE'] = 'false'
+        env['MONIT_INTERVAL'] = ''
+        env['MONIT_HIGH_CPU_CYCLES'] = ''
+
+        env['UNISON_ARGS'] = ''
         ignore_strings = expand_ignore_strings
-        env['UNISON_EXCLUDES'] = ignore_strings.join(' ')
+        env['UNISON_ARGS'] << ignore_strings.join(' ')
+        env['UNISON_WATCH_ARGS'] = ''
+
         env['MAX_INOTIFY_WATCHES'] = @options['max_inotify_watches'] if @options.key?('max_inotify_watches')
         if @options['sync_userid'] == 'from_host'
           env['OWNER_UID'] = Process.uid
@@ -158,6 +169,10 @@ module DockerSync
           env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
         end
 
+        # start unison-image in unison socket mode mode
+        env['HOSTSYNC_ENABLE']=0
+        env['UNISONSOCKET_ENABLE']=1
+
         additional_docker_env = env.map{ |key,value| "-e #{key}=\"#{value}\"" }.join(' ')
         running = `docker ps --filter 'status=running' --filter 'name=#{container_name}' --format "{{.Names}}" | grep '^#{container_name}$'`
         if running == ''
@@ -167,7 +182,7 @@ module DockerSync
             say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
             run_privileged = ''
             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 APP_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"

data/lib/docker-sync/update_check.rb

@@ -25,7 +25,6 @@ class UpdateChecker
     # do not check the image if its the first run - since this it will be downloaded anyway
     unless @config.first_run?
       unless has_internet?
-        check_unison_hostsync_image
         check_unison_image
         check_rsync_image
         # stop if there was an update
@@ -47,6 +46,8 @@ class UpdateChecker
   def should_run
     return false unless has_internet?
     now = DateTime.now
+    return true if @config['update_last_check'].nil?
+
     last_check = DateTime.iso8601(@config['update_last_check'])
     check_after_days = 2
     if now - last_check > check_after_days
@@ -69,24 +70,11 @@ class UpdateChecker
 
   end
 
-  def check_unison_hostsync_image(silent = false)
-    return if ENV['DOCKER_SYNC_SKIP_UPDATE']
-    say_status 'ok','Checking if a newer native_osx (unison:hostsync_0.2) image is available' unless silent
-
-    if system("docker pull eugenmayer/unison:hostsync_0.2 | grep 'Downloaded newer image for'")
-      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.' unless silent
-    end
-
-  end
-
   def check_unison_image
     return if ENV['DOCKER_SYNC_SKIP_UPDATE']
     say_status 'ok','Checking if a newer unison image is available'
 
-    if system("docker pull eugenmayer/unison | grep 'Downloaded newer image for'")
+    if system("docker pull eugenmayer/unison:2.51.2.0 | grep 'Downloaded newer image for'")
       say_status 'ok', 'Downloaded newer image for unison', :green
       @newer_image_found = true
     else

data/lib/docker-sync/upgrade_check.rb

@@ -40,7 +40,9 @@ class UpgradeChecker
 
   def self.get_current_version
     path = File.expand_path('../../../', __FILE__)
-    return File.read("#{path}/VERSION")
+    version = File.read("#{path}/VERSION")
+    version.gsub!(/ *\n+/, "\n")
+    version.strip
   end
 
   def docker_sync_update_check
@@ -98,7 +100,7 @@ class UpgradeChecker
 
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.2')
       checker = UpdateChecker.new
-      checker.check_unison_hostsync_image
+      checker.check_unison_image
 
       Thor::Shell::Basic.new.say_status 'warning', "The native_osx is NOW ONLY for docker-for-mac, this is due to https://github.com/EugenMayer/docker-sync/issues/346\n\nThat means that unison is picked as a default automatically if you use docker-machine", :red
 
@@ -109,17 +111,28 @@ class UpgradeChecker
 
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.3')
       checker = UpdateChecker.new
-      checker.check_unison_hostsync_image
+      checker.check_unison_image
     end
 
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.4')
       checker = UpdateChecker.new
-      checker.check_unison_hostsync_image
+      checker.check_unison_image
     end
 
     if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.5')
       checker = UpdateChecker.new
-      checker.check_unison_hostsync_image
+      checker.check_unison_image
+    end
+
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.5.5')
+      checker = UpdateChecker.new
+      checker.check_unison_image
+
+      Thor::Shell::Basic.new.say_status 'warning', "There has been a major unison update. Please clean and restart all your stacks. If you are using the unison strategy, please upgrade unison by doing 'brew update && brew upgrade unison' to upgrade to 2.51.2", :red
+
+      unless Thor::Shell::Basic.new.yes?('Just wanted you to know that! (y/N)')
+        exit 1
+      end
     end
 
     # update the upgrade_status

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor