dockly 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cdd9e8a044854b4149effa288483edb90a66ee8f58d35108696f0abc3a21ed95
-  data.tar.gz: 8ee450caf29059b5c7a389683676953c02f3c497809eef2287648504d59c9023
+SHA1:
+  metadata.gz: 0eb949e588205c02f1c15dbc3b609b7d14e3fd24
+  data.tar.gz: 52ab9c8916b071f0035400ced4c4fd73cf407885
 SHA512:
-  metadata.gz: 2cf097573867f7c8ddafa597b0e0249780789fe098f6b4ffec3d48ae0b3dfc7cb6e48686214d846ab021c7cee5dec3bdd2c29f3423c1b82341d8173c2570fc05
-  data.tar.gz: 5bb556418f6b975bc1cd2dfffcb0117ee61379b6426be681a80961f4831976319f91fd78e0e81c94bcd4a5ce3a7a1bb093f39d77379b2bb1708d2da7e7cfbaae
+  metadata.gz: e5ec4ce34a0bc5b270451dbd717988038a4ad3344e1a2f1d497a089cf287f3da1d8d3b940291575b8d69f75a9d00df685e36a1ec2cd9134e3d651d190f32dd75
+  data.tar.gz: 3400f1bf912778501d3b360d75a17d22e959ad68d1a5dee63bbfe9785d73bbb9a42fac4465486f8445469dbd6fd9f99b67c38be066edfd2f2dbd860d808d4ca9

data/lib/dockly/bash_builder.rb

@@ -26,6 +26,6 @@ module Dockly
     generate_snippet_for :registry_import, [:repo, :tag], { :tag => "latest" }
     generate_snippet_for :auth_ecr, [:server_address]
 
-    generate_snippet_for :docker_tag_latest, [:repo, :tag]
+    generate_snippet_for :docker_tag_latest, [:repo, :tag, :new_name]
   end
 end

data/lib/dockly/deb.rb

@@ -226,12 +226,13 @@ private
         if registry.is_a?(Dockly::Docker::ECR)
           scripts << bb.auth_ecr(registry.server_address)
         end
+
         scripts << bb.registry_import(docker.repo, docker.tag)
+        scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.name)
       else
         scripts += collect_non_registry_scripts(bb)
       end
     end
-
     scripts.join("\n")
   end
 
@@ -252,7 +253,8 @@ private
         scripts << bb.s3_docker_import(docker.s3_url, docker.name, docker.tag)
       end
     end
-    scripts << bb.docker_tag_latest(docker.repo, docker.tag)
+
+    scripts << bb.docker_tag_latest(docker.repo, docker.tag, docker.repo)
   end
 
   def add_startup_script(package, startup_script = "dockly-startup.sh")

data/lib/dockly/docker.rb

@@ -339,7 +339,11 @@ class Dockly::Docker
 
     raise "Could not find image after authentication" if image.nil?
 
-    image.push(registry.to_h, :registry => registry.server_address)
+    image.push(registry.to_h, :registry => registry.server_address) do |resp|
+      if resp.include?('errorDetail')
+        raise "Error pushing to registry: #{resp}"
+      end
+    end
   end
 
   def fetch_import

data/lib/dockly/version.rb

@@ -1,6 +1,6 @@
 module Dockly
   MAJOR = 4
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   RELEASE = nil
 

data/snippets/docker_tag_latest.erb

@@ -1,3 +1,3 @@
 <% if data[:tag] %>
-docker tag <%= data[:repo] %>:<%= data[:tag] %> <%= data[:repo] %>:latest
+docker tag <%= data[:repo] %>:<%= data[:tag] %> <%= data[:new_name] %>:latest
 <% end %>

data/spec/dockly/bash_builder_spec.rb

@@ -32,8 +32,8 @@ describe Dockly::BashBuilder do
 
     context "when there is a tag" do
       it "tags the repo:tag as repo:latest" do
-        output = subject.docker_tag_latest("test_repo", "a_tag")
-        expect(output).to include("docker tag test_repo:a_tag test_repo:latest")
+        output = subject.docker_tag_latest("registry/test_repo", "a_tag", "test_repo")
+        expect(output).to include("docker tag registry/test_repo:a_tag test_repo:latest")
       end
     end
   end

data/spec/dockly/docker_spec.rb

@@ -313,6 +313,107 @@ describe Dockly::Docker do
     end
   end
 
+  describe '#push_to_registry', :docker do
+    let(:image) { Docker::Image.create('fromImage' => 'ubuntu:14.04') }
+    let(:ecr) { double(:ecr) }
+
+    context 'when there is no registry' do
+      it 'raises' do
+        expect(subject.registry).to eq(nil)
+
+        expect { subject.push_to_registry(image) }.to raise_error(/No registry/)
+      end
+    end
+
+    context 'when there is a registry' do
+      before do
+        subject.instance_variable_set(:"@ecr", ecr)
+
+        allow(ecr)
+          .to receive(:server_address)
+          .and_return('server_address')
+
+        expect(subject.registry).to eq(ecr)
+      end
+
+      context "that can't be authenticated to" do
+        before do
+          allow(ecr)
+            .to receive(:authenticate!)
+            .and_raise
+        end
+
+        it 'raises' do
+          expect { subject.push_to_registry(image) }
+            .to raise_error(StandardError)
+        end
+      end
+
+      context 'that can be authenticated to' do
+        before do
+          allow(ecr).to receive(:authenticate!)
+
+          allow(Docker::Image)
+            .to receive(:all)
+            .with(all: true)
+            .and_return(available_images)
+        end
+
+        context "but the image isn't found" do
+          let(:available_images) { [] }
+
+          it 'raises' do
+            expect { subject.push_to_registry(image) }
+              .to raise_error(/Could not find image after authentication/)
+          end
+        end
+
+        context 'and the image is found' do
+          let(:available_images) { [image] }
+
+          before do
+            allow(ecr)
+              .to receive(:to_h)
+              .and_return({})
+            allow(image)
+              .to receive(:push)
+              .and_yield(push_message)
+          end
+
+          context 'but the push to the registry fails' do
+            let(:push_message) do
+              <<-EOF
+                {"errorDetail":{"message":"name unknown: The repository with name 'repository'
+                does not exist in the registry with id 'accoundid'"},"error":"name unknown:
+                The repository with name 'repository' does not exist in the registry with id 'accountid'"}
+              EOF
+            end
+
+            it 'raises' do
+              expect { subject.push_to_registry(image) }
+                .to raise_error(/Error pushing to registry/)
+            end
+          end
+
+          context 'and the push to the registry succeeds' do
+            let(:push_message) do
+              <<-EOF
+                {"status":"Pushed","progressDetail":{},"id":"id"}
+                {"status":"sha: digest: digest size: 2048"}
+                {"progressDetail":{},"aux":{"Tag":"sha","Digest":"digest","Size":2048}}
+              EOF
+            end
+
+            it 'passes' do
+              expect(subject.push_to_registry(image))
+                .not_to raise_error
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe '#export_image_diff', :docker do
     let(:images) { [] }
     let(:output) { StringIO.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockly
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -326,7 +326,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project:
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: Packaging made easy
@@ -356,3 +357,4 @@ test_files:
 - spec/fixtures/test-2.tar.gz
 - spec/fixtures/test-3.tar
 - spec/spec_helper.rb
+has_rdoc: