docker-registry-sync 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY5YTA1Y2I2Y2M2Nzk0OTQ3MjE3ZGY0MjUyNmYyNjJlYmVmZDU5Yw==
+    MDJmMGE4YzQyMmNjMmE3ZmEzNzI1MTIyZDgyMTgyMDJhOWQ3OGMxOA==
   data.tar.gz: !binary |-
-    Yjg0ZGZkNzcwNjRiMWQwOWI2YzAyMTg2NGNkYjMzNWVkY2NkM2E2ZQ==
+    YWVhNDY4ZTYwYTcwMmRlNWEwODU5ZDYyMzg2ZmMzNDg5ZDVhNmExMQ==
 SHA512:
   metadata.gz: !binary |-
-    NGVmMDkzNzgzNzI4YTQ1MDliYTJiNGNjMGUxYjA1ZDA3ODc3MmU5MzgzYjUy
-    ODk3NWFkMDJmM2FiNTM1MDY5OGNlYjVlMzcwMjNhY2FjZDA5OTM2ZDU1Mjcy
-    NmRkMGRmODAzNWM1OWI3ZDVkNmU0NGFiZTEzZDYzZDg2NTExMDk=
+    NzFjNDc1MzFiNjM2ZGQ2ZWRlMDE2OGQyZTcyNjFjMGU3ZjAyNTUyZjQzODQx
+    YTUxYTQxNmU4NDhjNWFhNmM0NmQ3NDA1YjZjMGQxNDIxMDBkZTYwNDFlNzMw
+    NTdmYzBiNzViYWU0NzdjODM1NzZkMzU1ZjE3MTc0YWVjMzAwNzQ=
   data.tar.gz: !binary |-
-    N2FiMjhiMWM4YTZlMTVhMDNiOGU3MTA0NzUyMmE5NjE0M2M3NzA2ZDYxNWI4
-    ZTk2Mzc1MTM1OGMzZTJiMTU5ZDA3Yjc5YjFkNmY2OGQ1MGYzNTM5OGU1ZWI4
-    OTllNWMxNjhiYmNkZTAxMGY2MTAzMGY2NTAwZmQwM2U2NTk2ODE=
+    NGRlODNhMjljYTI1MGNiYTAwMWE5ZWQ2NDU3MGY1YTZkNTFjZjgzNTMwMjg5
+    Yzc0YmY0MGVkYTNkYmI5MDI2NzVmZjE3MjhjNDNhNTk5YmQ4YzA2ODA5Yjdk
+    MTIyYjZmNGZhYTI2YmMyNjhhNzczOTZlY2YxZWU2OTU1ZDIyYjU=

data/bin/docker-registry-sync

@@ -54,6 +54,16 @@ EOC
     options[:proxy] = p
   end
 
+  options[:sse] = false
+  opts.on(nil, '--sse', "Copy S3 objects using SSE on the destination using (AES256 only)") do |_e|
+    options[:sse] = true
+  end
+
+  options[:source_sse] = false
+  opts.on(nil, '--source-sse', "Copy S3 objects when the source is using SSE (AES256 only)") do |_e|
+    options[:source_sse] = true
+  end
+
   options[:unset_proxy] = false
   opts.on(nil, '--unset-proxy', "Use if 'http_proxy' is set in your environment, but you don't want to use it...") do |_u|
     options[:unset_proxy] = true
@@ -96,7 +106,9 @@ end
 CMD.configure(
   options[:source_bucket],
   options[:target_buckets],
-  options[:sqs_queue]
+  options[:sqs_queue],
+  options[:sse],
+  options[:source_sse]
 )
 
 ec = 1

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

@@ -9,7 +9,7 @@ module Docker
         include Docker::Registry::Sync
 
         class << self
-          def configure(source_bucket, target_buckets, sqs_queue)
+          def configure(source_bucket, target_buckets, sqs_queue, use_sse, source_uses_sse)
             unless source_bucket.nil?
               source_region, source_bucket = source_bucket.split(':')
             else
@@ -31,6 +31,8 @@ module Docker
               config.source_bucket = source_bucket
               config.source_region = source_region
               config.target_buckets = target_buckets
+              config.source_sse = source_uses_sse
+              config.sse = use_sse
               config.sqs_region = sqs_region
               config.sqs_url = "https://#{sqs_uri}"
             end
@@ -52,18 +54,18 @@ module Docker
 
           def sync(image, tag)
             success = false
-            @config.target_buckets.each do |region, bucket|
+            @config.target_buckets.each do |region, bucket, sse|
               if image_exists?(image, bucket, region)
-                success = sync_tag(image, tag, bucket, region)
+                success = sync_tag(image, tag, bucket, region, !sse.nil?)
               else
-                success = sync_repo(image, bucket, region)
+                success = sync_repo(image, bucket, region, !sse.nil?)
               end
             end
             success ? 0 : 1
           end
 
           def queue_sync(image, tag)
-            msgs = @config.target_buckets.map do |region, bucket|
+            msgs = @config.target_buckets.map do |region, bucket, sse|
               JSON.dump(retries: 0,
                         image: image,
                         tag: tag,
@@ -73,7 +75,8 @@ module Docker
                         },
                         target: {
                           bucket: bucket,
-                          region: region
+                          region: region,
+                          sse: !sse.nil?
                         })
             end
             send_message_batch(msgs) ? 0 : 1
@@ -99,7 +102,7 @@ module Docker
 
                 if image_exists?(data['image'], data['target']['bucket'], data['target']['region'])
                   @config.logger.info("Syncing tag: #{data['image']}:#{data['tag']} to #{data['target']['region']}:#{data['target']['bucket']}")
-                  if sync_tag(data['image'], data['tag'], data['target']['bucket'], data['target']['region'], data['source']['bucket'], data['source']['region'])
+                  if sync_tag(data['image'], data['tag'], data['target']['bucket'], data['target']['region'], data['target']['sse'], data['source']['bucket'], data['source']['region'])
                     @config.logger.info("Finished syncing tag: #{data['image']}:#{data['tag']} to #{data['target']['region']}:#{data['target']['bucket']}")
                     finalize_message(message.receipt_handle)
                   else
@@ -107,7 +110,7 @@ module Docker
                   end
                 else
                   @config.logger.info("Syncing image: #{data['image']} to #{data['target']['region']}:#{data['target']['bucket']}")
-                  if sync_repo(data['image'], data['target']['bucket'], data['target']['region'], data['source']['bucket'], data['source']['region'])
+                  if sync_repo(data['image'], data['target']['bucket'], data['target']['region'], data['target']['sse'], data['source']['bucket'], data['source']['region'])
                     @config.logger.info("Finished syncing image: #{data['image']} to #{data['target']['region']}:#{data['target']['bucket']}")
                     finalize_message(message.receipt_handle)
                   else

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

@@ -53,7 +53,7 @@ module Docker
       end
 
       class Configuration
-        attr_accessor :source_bucket, :source_region, :target_buckets, :sqs_region, :sqs_url, :empty_queue_sleep_time
+        attr_accessor :source_bucket, :source_region, :target_buckets, :sqs_region, :sqs_url, :empty_queue_sleep_time, :sse, :source_sse
         attr_accessor :log_level, :logger
 
         def initialize
@@ -65,6 +65,9 @@ module Docker
           @sqs_region = nil
           @sqs_url = nil
 
+          @source_sse = false
+          @sse = false
+
           @empty_queue_sleep_time = 5
 
           @log_level = :debug

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

@@ -19,7 +19,7 @@ module Docker
           end
 
 
-          def sync_tag(image, tag, bucket, region, source_bucket = nil, source_region = nil)
+          def sync_tag(image, tag, bucket, region, sse, source_bucket = nil, source_region = nil)
             source_region ||= @config.source_region
             source_bucket ||= @config.source_bucket
 
@@ -30,10 +30,10 @@ module Docker
               keys = ["tag#{tag}_json", "tag_#{tag}", '_index_images'].map do |key|
                 "registry/repositories/#{image}/#{key}"
               end
-              sync_keys(s3_target, bucket, keys, source_bucket)
+              sync_keys(s3_target, bucket, sse, keys, source_bucket)
 
               img_id = s3_source.get_object(bucket: source_bucket, key: "registry/repositories/#{image}/tag_#{tag}").body.read
-              sync_image(img_id, bucket, region, source_bucket, source_region)
+              sync_image(img_id, bucket, region, sse, source_bucket, source_region)
             rescue Exception => e
               @config.logger.error "An unexpected error occoured while syncing tag #{image}:#{tag}: #{e}"
               false
@@ -42,7 +42,7 @@ module Docker
             end
           end
 
-          def sync_repo(repo, bucket, region, source_bucket = nil, source_region = nil)
+          def sync_repo(repo, bucket, region, sse, source_bucket = nil, source_region = nil)
             source_region ||= @config.source_region
             source_bucket ||= @config.source_bucket
             s3_source = Aws::S3::Client.new(region: source_region)
@@ -50,11 +50,11 @@ module Docker
 
             begin
               rep_prefix = "registry/repositories/#{repo}/"
-              sync_prefix(s3_source, s3_target, bucket, rep_prefix, source_bucket)
+              sync_prefix(s3_source, s3_target, bucket, sse, rep_prefix, source_bucket)
 
               img_index_resp = s3_source.get_object(bucket: source_bucket, key: "registry/repositories/#{repo}/_index_images")
               JSON.load(img_index_resp.body.read).each do |image|
-                sync_image(image['id'], bucket, region, source_bucket, source_region)
+                sync_image(image['id'], bucket, region, sse, source_bucket, source_region)
               end
             rescue Exception => e
               @config.logger.error "An unexpected error occoured while syncing repo #{repo}: #{e}"
@@ -64,7 +64,7 @@ module Docker
             end
           end
 
-          def sync_image(image_id, bucket, region, source_bucket = nil, source_region = nil)
+          def sync_image(image_id, bucket, region, sse, source_bucket = nil, source_region = nil)
             source_region ||= @config.source_region
             source_bucket ||= @config.source_bucket
             s3_source = Aws::S3::Client.new(region: source_region)
@@ -73,12 +73,12 @@ 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, "registry/images/#{image}/", source_bucket)
+              sync_prefix(s3_source, s3_target, bucket, sse, "registry/images/#{image}/", source_bucket)
             end
           end
 
           @private
-          def sync_prefix(source_client, target_client, target_bucket, prefix, source_bucket)
+          def sync_prefix(source_client, target_client, target_bucket, target_sse, prefix, source_bucket)
             keys = []
             img_resp = source_client.list_objects(bucket: source_bucket, prefix: prefix)
 
@@ -92,16 +92,23 @@ module Docker
                 img_resp.next_page
               end
             end
-            sync_keys(target_client, target_bucket, keys, source_bucket)
+            sync_keys(target_client, target_bucket, target_sse, keys, source_bucket)
           end
 
-          def sync_keys(target_client, target_bucket, keys, source_bucket)
+          def sync_keys(target_client, target_bucket, target_sse, keys, source_bucket)
             keys.each do |key|
               @config.logger.info "Syncing key #{source_bucket}/#{key} to bucket #{target_bucket}"
-              target_client.copy_object(acl: 'bucket-owner-full-control',
-                                        bucket: target_bucket,
-                                        key: key,
-                                        copy_source: "#{source_bucket}/#{key}")
+              opts = {acl: 'bucket-owner-full-control',
+                      bucket: target_bucket,
+                      key: key,
+                      copy_source: "#{source_bucket}/#{key}"}
+              if @config.sse || target_sse
+                opts[:server_side_encryption] = 'AES256'
+              end
+              if @config.source_sse
+                opts[:copy_source_sse_customer_algorithm] = 'AES256'
+              end
+              target_client.copy_object(opts)
             end
           end
         end

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

@@ -1,7 +1,7 @@
 module Docker
   module Registry
     module Sync
-      VERSION = '0.1.4'
+      VERSION = '0.1.5'
     end
   end
 end

metadata

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