docker-sync 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88e284e5884eb996bd63ce35feef44508aa275d
-  data.tar.gz: 7d0c466307ff7b6cb86336e0b729f1795f0f376a
+  metadata.gz: 9348b2439ef75d3de7b56ef33a856825ef08c27b
+  data.tar.gz: 55dfdc5a30341018e3e69ca8e45610e681a02263
 SHA512:
-  metadata.gz: 8823db30b0c6ca9eaa21aad241b6525595071028e75db3c307d295a4b1d3cf69cd0fced01a8a4757a73071f0b5135eaa3fc26186bbb499e17cd556d56f06dc16
-  data.tar.gz: 0a0c5a4759a34b0dbec794903529f61a515918f5e46b160af8acd1b242e001d49e04fc5dd32bb7dcb634efc90d9a5c63ea9cb5758d8baefa87ab78b790d2e68b
+  metadata.gz: 97ab57f9c920bc3dc850d6296483844fd3b4d0bfbe22826b910399e2e4a1b508ff2e7bbe96d2b8f0bfb07a61b1977b1427e0f89edd698ce6a8f1bd6d1df0abdc
+  data.tar.gz: cad2dcbf92b259160cfda0cc5d2d9c8c01e71ffefaa181704fe3ce7d0d14de643c0314bbce3c8b24f05790e97f3be60b8e8ad121a5092014b5bf84e1afbc3737

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

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

@@ -92,14 +92,15 @@ 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
+            tz_expression = '-e TZ=$(basename $(dirname `readlink /etc/localtime`))/$(basename `readlink /etc/localtime`)'
             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 = "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 #{tz_expression} #{additional_docker_env} #{run_privileged} --name #{container_name} #{@docker_image} /usr/local/bin/precopy_appsync"
             say_status 'precopy', cmd, :white if @options['verbose']
             system(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 -d -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}"
+            cmd = "docker run -d -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 #{tz_expression} #{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/unison.rb

@@ -179,10 +179,17 @@ module DockerSync
           say_status 'ok', "#{container_name} container not running", :white if @options['verbose']
           exists = `docker ps --filter "status=exited" --filter "name=#{container_name}" --format "{{.Names}}" | grep '^#{container_name}$'`
           if exists == ''
-            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 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}"
+            tz_expression = '-e TZ=$(basename $(dirname `readlink /etc/localtime`))/$(basename `readlink /etc/localtime`)'
+            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_name}:#{@options['dest']}\" -e APP_VOLUME=#{@options['dest']} #{tz_expression} #{additional_docker_env} #{run_privileged} --name #{container_name} #{@docker_image} /usr/local/bin/precopy_appsync"
+            say_status 'precopy', cmd, :white if @options['verbose']
+            system(cmd) || raise('Precopy failed')
+
+            say_status 'ok', "creating #{container_name} container", :white if @options['verbose']
+            cmd = "docker run -p '#{@options['sync_host_ip']}::#{UNISON_CONTAINER_PORT}' -v #{volume_name}:#{@options['dest']} -e APP_VOLUME=#{@options['dest']} #{tz_expression} #{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

@@ -85,7 +85,9 @@ class UpdateChecker
 
   def get_current_version
     path = File.expand_path('../../../', __FILE__)
-    return File.read("#{path}/VERSION")
+    version = File.read("#{path}/VERSION")
+    version.strip
+    version
   end
 
   def docker_sync_update_check

data/lib/docker-sync/upgrade_check.rb

@@ -41,8 +41,8 @@ class UpgradeChecker
   def self.get_current_version
     path = File.expand_path('../../../', __FILE__)
     version = File.read("#{path}/VERSION")
-    version.gsub!(/ *\n+/, "\n")
     version.strip
+    version
   end
 
   def docker_sync_update_check
@@ -135,6 +135,17 @@ class UpgradeChecker
       end
     end
 
+    if Gem::Version.new(last_upgraded_version) <  Gem::Version.new('0.5.6')
+      checker = UpdateChecker.new
+      checker.check_unison_image
+
+      Thor::Shell::Basic.new.say_status 'warning', "If you are upgrading from 0.5.4 or below, please run `brew update && brew upgrade unison` AND `docker-compose down && docker-sync clean` or `docker-sync-stack clean` since you need to recreate the sync container", :red
+
+      unless Thor::Shell::Basic.new.yes?('Sync will fail otherwise. Continue? (y/N)')
+        exit 1
+      end
+    end
+
     # update the upgrade_status
     @config.update! 'upgrade_status' => "#{UpgradeChecker.get_current_version}"
   end

metadata

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