docker-sync 0.4.3 → 0.4.4.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d96aecbdcc8b44d09989750086b5030249c407
-  data.tar.gz: dac14ac4ab598c79ce73fa9c5c582f047eda1066
+  metadata.gz: 82b8bbe6b36b21f2f991a463b79d3008a0005d9d
+  data.tar.gz: a89c8c32a63f9b553521f564a432971afee55435
 SHA512:
-  metadata.gz: 5422df4e3ddccc97c02ab360685cb740736b4fa17690b81e1031b0a77d03191f424c5ea53188ee85bff7060d6c19944138c10780c164817b3d4d334f5a460515
-  data.tar.gz: a5ba61e1967b766de28d26e89f5468a73af3cc599ce4cb4bc92f0816deb1770ebbb909a8ae51a0e9d4daef8cd83719ef302b4c1b0b5c329504205bee99f6f9df
+  metadata.gz: 7420aa5f6a8b6c484b63f167aa9a77e51500d501c897a52921dd3929f59e34c25ef383e6894a69f68b4cd0135e1ff63a67e34e8d4305e41f65454869537af07f
+  data.tar.gz: f30e1bcc306debb0a6057d70dd5d6f13a862990fdde0e7c69426d8fb539ff07ededff52bebd73c8b4564407f32ddd3ad2b1b6848f8aa2c3df35304f8075c768d

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4.beta1

data/lib/docker-sync/sync_manager.rb

@@ -44,7 +44,7 @@ module Docker_sync
           puts 'Please do no longer use "dest" in your docker-sync.yml configuration - also see https://github.com/EugenMayer/docker-sync/wiki/1.2-Upgrade-Guide#dest-has-been-removed!'
           exit 1
         else
-          @config_syncs[name]['dest'] = '/sync'
+          @config_syncs[name]['dest'] = '/app_sync'
         end
 
         # for each strategy check if a custom image has been defined and inject that into the sync-endpoints

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

@@ -54,6 +54,9 @@ module Docker_Sync
           env['OWNER_UID'] = @options['sync_userid'] if @options.key?('sync_userid')
         end
 
+        host_disk_mount_mode = '' # see https://github.com/moby/moby/pull/31047
+        host_disk_mount_mode = ":#{@options['host_disk_mount_mode']}" if @options.key?('host_disk_mount_mode')
+
         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 == ''
@@ -63,7 +66,13 @@ module Docker_Sync
             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 -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} -d #{@docker_image}"
+            say_status 'ok', 'Starting precopy', :white if @options['verbose']
+            # we just run the precopy script and remove the container
+            cmd = "docker run --rm -v #{volume_app_sync_name}:/app_sync -v #{host_sync_src}:/host_sync#{host_disk_mount_mode} -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} /usr/local/bin/precopy_appsync"
+            `#{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}"
           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/upgrade_check.rb

@@ -111,6 +111,11 @@ class UpgradeChecker
       checker.check_unison_hostsync_image
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.4.4')
+      checker = UpdateChecker.new
+      checker.check_unison_hostsync_image
+    end
+
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-sync
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4.beta1
 platform: ruby
 authors:
 - Eugen Mayer
@@ -193,9 +193,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1