docker-armada 2.0.62 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
 - data/lib/armada/docker/image.rb +1 -0
 - data/spec/docker/image_spec.rb +8 -8
 - metadata +2 -2
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            SHA1:
         
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 42c150fa04f0e0b192a7448dfd2078e0864933d8
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: 2dacba541fc78458bf0e8ca959c984b7ba7c1d7c
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: 6244a27c059b902ce09bcb4d33c65e25e1c31cd0e6e059de6b497bb2a69964f7b04cca951a2a0f7465a1d3802acf7cb6415a6d17dedc0871de7f68e8cf8b99db
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: f393c42b0629b44935369e3c4099ba4412749c16f52713e9b30f2cb1dabf1f1bb6ba569224cf210ca0b8a5445de69152085f39a38db1d0a1584e96c82b72bd68
         
     | 
    
        data/lib/armada/docker/image.rb
    CHANGED
    
    | 
         @@ -28,6 +28,7 @@ module Armada 
     | 
|
| 
       28 
28 
     | 
    
         
             
                    end
         
     | 
| 
       29 
29 
     | 
    
         
             
                  else
         
     | 
| 
       30 
30 
     | 
    
         
             
                    info "Not pulling image [#{@name}] with tag [#{@tag}] because `--no-pull` was specified."
         
     | 
| 
      
 31 
     | 
    
         
            +
                    @id = "#{@name}:#{@tag}"
         
     | 
| 
       31 
32 
     | 
    
         
             
                    raise "The image id is not set, you cannot proceed with the deploy until a valid image is found -- [#{@name}:#{@tag}]" unless valid?
         
     | 
| 
       32 
33 
     | 
    
         
             
                  end
         
     | 
| 
       33 
34 
     | 
    
         
             
                end
         
     | 
    
        data/spec/docker/image_spec.rb
    CHANGED
    
    | 
         @@ -34,8 +34,8 @@ describe Armada::Image do 
     | 
|
| 
       34 
34 
     | 
    
         
             
                    expect(Docker::Image).not_to receive(:create)
         
     | 
| 
       35 
35 
     | 
    
         
             
                    armada_image.pull
         
     | 
| 
       36 
36 
     | 
    
         | 
| 
       37 
     | 
    
         
            -
                    expect(armada_image.id).to  
     | 
| 
       38 
     | 
    
         
            -
                    expect(armada_image.image).to  
     | 
| 
      
 37 
     | 
    
         
            +
                    expect(armada_image.id).to eq("quay.io/someorg/someimage:latest")
         
     | 
| 
      
 38 
     | 
    
         
            +
                    expect(armada_image.image).to eq(docker_image)
         
     | 
| 
       39 
39 
     | 
    
         
             
                  end
         
     | 
| 
       40 
40 
     | 
    
         | 
| 
       41 
41 
     | 
    
         
             
                  it { expect { armada_image.pull }.to raise_error }
         
     | 
| 
         @@ -62,8 +62,8 @@ describe Armada::Image do 
     | 
|
| 
       62 
62 
     | 
    
         
             
                  let (:image) { Armada::Image.new(docker_host, my_options) }
         
     | 
| 
       63 
63 
     | 
    
         | 
| 
       64 
64 
     | 
    
         
             
                  it "should use username and password from options" do
         
     | 
| 
       65 
     | 
    
         
            -
                    expect(image.auth[:username]).to  
     | 
| 
       66 
     | 
    
         
            -
                    expect(image.auth[:password]).to  
     | 
| 
      
 65 
     | 
    
         
            +
                    expect(image.auth[:username]).to eq(my_options[:username])
         
     | 
| 
      
 66 
     | 
    
         
            +
                    expect(image.auth[:password]).to eq(my_options[:password])
         
     | 
| 
       67 
67 
     | 
    
         
             
                  end
         
     | 
| 
       68 
68 
     | 
    
         
             
                end
         
     | 
| 
       69 
69 
     | 
    
         | 
| 
         @@ -78,8 +78,8 @@ describe Armada::Image do 
     | 
|
| 
       78 
78 
     | 
    
         | 
| 
       79 
79 
     | 
    
         
             
                  it "should use username and password from dockercfg" do
         
     | 
| 
       80 
80 
     | 
    
         
             
                    expect(image.auth).not_to be_nil
         
     | 
| 
       81 
     | 
    
         
            -
                    expect(image.auth[:username]).to  
     | 
| 
       82 
     | 
    
         
            -
                    expect(image.auth[:password]).to  
     | 
| 
      
 81 
     | 
    
         
            +
                    expect(image.auth[:username]).to eq(credentials.username)
         
     | 
| 
      
 82 
     | 
    
         
            +
                    expect(image.auth[:password]).to eq(credentials.password)
         
     | 
| 
       83 
83 
     | 
    
         
             
                  end
         
     | 
| 
       84 
84 
     | 
    
         
             
                end
         
     | 
| 
       85 
85 
     | 
    
         | 
| 
         @@ -94,8 +94,8 @@ describe Armada::Image do 
     | 
|
| 
       94 
94 
     | 
    
         
             
                  let (:image) { Armada::Image.new(docker_host, my_options) }
         
     | 
| 
       95 
95 
     | 
    
         | 
| 
       96 
96 
     | 
    
         
             
                  it "should use username and password from options" do
         
     | 
| 
       97 
     | 
    
         
            -
                    expect(image.auth[:username]).to  
     | 
| 
       98 
     | 
    
         
            -
                    expect(image.auth[:password]).to  
     | 
| 
      
 97 
     | 
    
         
            +
                    expect(image.auth[:username]).to eq(my_options[:username])
         
     | 
| 
      
 98 
     | 
    
         
            +
                    expect(image.auth[:password]).to eq(my_options[:password])
         
     | 
| 
       99 
99 
     | 
    
         
             
                  end
         
     | 
| 
       100 
100 
     | 
    
         
             
                end
         
     | 
| 
       101 
101 
     | 
    
         | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: docker-armada
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 2.0 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 2.1.0
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Jonathan Chauncey
         
     | 
| 
         @@ -10,7 +10,7 @@ authors: 
     | 
|
| 
       10 
10 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       11 
11 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       12 
12 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       13 
     | 
    
         
            -
            date: 2014- 
     | 
| 
      
 13 
     | 
    
         
            +
            date: 2014-12-04 00:00:00.000000000 Z
         
     | 
| 
       14 
14 
     | 
    
         
             
            dependencies:
         
     | 
| 
       15 
15 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       16 
16 
     | 
    
         
             
              name: excon
         
     |