docker-registry-sync 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWUwMGMxODNmMTc2ODJhNWMyYzJhMTljNmIyOGJhOTA1NTZkYzkwZA==
+    YjY2MmVkODljYzQzMWNmZDRjNmM3MWY5MTVkN2M1YjE4YjU5MDVlMw==
   data.tar.gz: !binary |-
-    MGU1ZWRjYjU2N2M2YzdjYmZjMjVlMGVhY2E0YTZhNjhmN2M3NjAzOQ==
+    YmU4NjBiMDUwZDc4NWZhMDc1NTc2ZjgzODMzYzExMTM5MmIzZDhlYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWMxNzdmNTM2MmQzNTYwZGVmYjE0MGI2ZjU3NzZjNDNmOThkYjg0MjE1ZTc3
-    Mzg4YjRhMTYxM2JlZDc2NjMxMTNmODViZTg4ZGQyZmY0MjA3NDgyNjg4Mzhh
-    YTg0NGYwNTJlYWMzNTE4YWZmNWFkMTU1Y2ZkNjY4MTY4OTRmN2U=
+    YTk1NmVkYzUwY2YxZDJlZDUzMjIyMWExMDcyM2I0MjhiYzJkYzM2YjhkM2U4
+    YWM3NGViZDk5MWNlOWYxZmRjYWVmYjQ4N2RlZjJjY2E5YjU0YWMyYjIzYjkz
+    YzZjY2MyZjhkODVhNzcwNjcyYWRjOGIwZGNmZmU0NjcyODU1N2E=
   data.tar.gz: !binary |-
-    NDNjZTcyNjZhM2QwNTlkNGNlNzU5NWE2MDFiNGUzY2Q3OTVkZGY3ZDMwODFj
-    OGZjYzYwMmQxZTY4NDAyNjY2M2U1YWY4N2ZkYmE5MTlmYjA0OGIxZGFiNzBh
-    ZmM3ZWE3Y2NlN2I0NWE0Mjg3OWFmODkyODBhNDgwYzc3YWYwZjA=
+    ZGMyZDI5YmE4YTZiNTc1NzliYThjOWNjYTYxMDJmMGYyNjA1YWZmYzM0M2Y1
+    MjdhZDQ3MGI1ODRlODM3OTkwNTdhZjFkMWM3ZmU4NjRjYWZjNWE1MTM0ZGRh
+    YzA1NTJkN2Y1ZTViZDRlN2MyNzZkMjA5MzNhYjFjZmJkNjdkNzg=

data/lib/docker/registry/sync.rb

@@ -12,6 +12,26 @@ module Docker
           self.config ||= Docker::Registry::Sync::Configuration.new
           yield self.config
         end
+
+        class RingBuffer < Array
+          attr_reader :max_size
+
+          def initialize(max_size, enum = nil)
+            @max_size = max_size
+            enum.each { |e| self << e } if enum
+          end
+
+          def <<(el)
+            if self.size < @max_size || @max_size.nil?
+              super
+            else
+              self.shift
+              self.push(el)
+            end
+          end
+
+          alias :push :<<
+        end
       end
     end
   end

data/lib/docker/registry/sync/cmd.rb

@@ -30,6 +30,8 @@ module Docker
               sqs_region, sqs_uri = nil, nil
             end
 
+            @synced_images = RingBuffer.new 5000
+
             Docker::Registry::Sync.configure do |config|
               config.source_bucket = source_bucket
               config.source_region = source_region
@@ -135,8 +137,7 @@ module Docker
               resp = sqs.receive_message(
                 queue_url: @config.sqs_url,
                 max_number_of_messages: 1,
-                #visibility_timeout: 900, # Give ourselves 15min to sync the image
-                visibility_timeout: 30, # Give ourselves 15min to sync the image
+                visibility_timeout: 900, # Give ourselves 15min to sync the image
                 wait_time_seconds: 10, # Wait a maximum of 10s for a new message
               )
               @config.logger.info "SQS returned #{resp.messages.length} new images to sync..."

data/lib/docker/registry/sync/s3.rb

@@ -75,7 +75,10 @@ module Docker
             ancestry_resp = s3_source.get_object(bucket: source_bucket, key: "registry/images/#{image_id}/ancestry")
             # Ancestry includes self
             JSON.load(ancestry_resp.body.read).each do |image|
-              sync_prefix(s3_source, s3_target, bucket, sse, "registry/images/#{image}/", source_bucket)
+              unless @synced_images.include? image
+                sync_prefix(s3_source, s3_target, bucket, sse, "registry/images/#{image}/", source_bucket)
+                @synced_images << image
+              end
             end
           end
 

data/lib/docker/registry/sync/version.rb

@@ -1,7 +1,7 @@
 module Docker
   module Registry
     module Sync
-      VERSION = '0.2.4'
+      VERSION = '0.2.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-registry-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler