tagfish 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e370f0638fbe2829e37f5cc021a4b93b00432ec
-  data.tar.gz: 3830e330b97bfd0daccb645758333ae7d986f6e5
+  metadata.gz: cd9bcb5d1929a71e1a54b46c9d03ac992113de4a
+  data.tar.gz: 81fce340dddd5f00b36ec61f05039c770533d154
 SHA512:
-  metadata.gz: 05c382d483c54172387369d8cbb99dca37d2d9a611f4f9152bb4405ad6824a7159e33c95da2b6f9eceb162c15289463d72fc531dbae19aecd4df4a70a7f227e6
-  data.tar.gz: 3c723bcac66f1a11abb7e8c9dedbf84110298936c81dc6d7a06f20e29458fd57bbed401d266fc7602f1578ff67da439eba00368423e51bc5a5b379ea3acac793
+  metadata.gz: 0c4d6f8180f2779473365b04488406775fb8d8fadd92a12db0b570b55a3fea41d7d04162fc355f1738b4c6e91a063510730572e693df2c6b1a04beac4aef409a
+  data.tar.gz: d532b8f0ab2367fbd673c494aea6c6159250566a1777f37aa3eb8a4cfc89b52fb7ef8ea31d5207ff32a106f57787eb83f07ae75dafa12f43d04a186baf452b75

data/README.md

@@ -50,12 +50,20 @@ The `tags` subcommands is used to retrieve tags from a given repository:
     Options:
         -l, --latest                  only return latest explicitly tagged image
         -s, --short                   only return tag, not full image path
+        -d, --digest                  returns the tag's digest (v2 API only)
         -h, --help                    print help
 
 Where `repository` is a docker repository path, including the docker registry. The tags are returned in alphabetical order.
 
 The `--latest` option gets the image ID of the docker image tagged `latest` in the repository, finds a matching image with a tag set manually (e.g: date, version number), and returns that tag. This option will not work if there is no image tagged `latest` in your repository.
 
+EXPERIMENTAL: The `--digest` option returns the tag with its hash. It only works in conjunction
+ with the `--latest` option and against a registry running the v2 API. As of today it doesn't work against Docker Hub, because we're accessing it over API v1 to avoid the authentication mecanism. It returns a string such as:
+ ```
+ my-registry/cowbell/tagfish:1.1.3@sha256:491c87df7d5f...
+ ```
+This is used to lock down not only to a specific tag version, but to a specific image hash. So even if the tag is reassigned later, this will still point to the same image.
+
 #### Example
 ```
 $ tagfish tags alpine

data/lib/tagfish/api_call.rb

@@ -46,6 +46,14 @@ module Tagfish
         abort("Call to the registry API failed, the following resource might not exist:\n#{uri.to_s}")
       end
     end
-
+    
+    def digest
+      begin
+        response = http.request(request)
+        return response.fetch("Docker-Content-Digest")
+      rescue SocketError
+        puts "ERROR: SocketError"
+      end
+    end
   end
 end

data/lib/tagfish/docker_http_auth.rb

@@ -13,7 +13,7 @@ module Tagfish
        begin
          config = File.open(File.expand_path(file_path), 'r')
        rescue Exception => e
-         abort("Tried to get a SLiP but the file #{file_path} does not exist")
+         abort("Tried to get username/password but the file #{file_path} does not exist")
        end
 
        json_config = JSON.parse(config.read())

data/lib/tagfish/docker_registry_v1_client.rb

@@ -8,28 +8,28 @@ module Tagfish
     end
     
     def tag_names
-      tag_map.tag_names
+      tags.tag_names
     end
 
-    def tag_map
-      tags_list = tags_api(tags)
+    def tags
+      tags_list = tags_api(tags_json)
       Tagfish::Tags.new(tags_list)
     end
     
     private
 
-    def tags
+    def tags_json
       api_call.get(tags_uri).json
     end
         
     def tags_api(api_response_data)
       case api_response_data
-        when Hash
+      when Hash
         api_response_data
       when Array
         api_response_data.reduce({}) do |images, tag|
           images.merge({tag["name"] => tag["layer"]})
-        end
+      end
       else
         raise "unexpected type #{api_response_data.class}"
       end

data/lib/tagfish/docker_registry_v2_client.rb

@@ -8,30 +8,30 @@ module Tagfish
     end
     
     def tag_names
-      tags["tags"]
+      tags_json["tags"]
     end
 
-    def tag_map
-      Tagfish::Tags.new(tags_logic)
+    def tags
+      Tagfish::Tags.new(tags_list)
     end
 
     private
     
-    def tags
+    def tags_json
       api_call.get(tags_uri).json
     end
     
-    def hash(tag)
-      api_call.get(hash_uri(tag)).json
+    def digest(tag)
+      api_call.get(hash_uri(tag)).digest
     end
     
-    def tags_logic
+    def tags_list
       if tag_names.nil?
         abort("No Tags found for this repository")
       end
       
       tags_with_hashes = tag_names.inject({}) do |dict, tag|
-        dict[tag] = hash(tag)["fsLayers"]
+        dict[tag] = digest(tag)
         dict
       end
     end

data/lib/tagfish/tags_command.rb

@@ -6,6 +6,7 @@ module Tagfish
     parameter "REPOSITORY", "docker repository"
     option ["-l", "--latest"], :flag, "only return latest explicitly tagged image"
     option ["-s", "--short"], :flag, "only return tag, not full image path"
+    option ["-d", "--digest"], :flag, "returns the tag's digest (v2 API only)"
 
     def execute
       
@@ -13,22 +14,30 @@ module Tagfish
       docker_api = DockerRegistryClient.for(docker_uri)
       
       if latest?
-        tags = docker_api.tag_map
+        tags = docker_api.tags
         latest_tags = tags.latest_tags
         if latest_tags.empty?
           signal_error "No image explicitly tagged in this Repository, " +
                   "only `latest` tag available."
         end
         tags_found = latest_tags
+        
+        if digest?
+          tags_found = tags_found.map do |tag_name|
+            digest = tags.tag_map[tag_name]
+            digest.include?("sha256:") ? tag_name + '@' + digest : tag_name
+          end
+        end
+        
       else
         tags_found = docker_api.tag_names
       end
 
-      pretty_tags = tags_found.map do |tag_name|
+      tags_fqdn = tags_found.map do |tag_name|
         short? ? tag_name : docker_uri.with_tag(tag_name).to_s
       end
-
-      puts pretty_tags
+      
+      puts tags_fqdn
     end
   end
 end

data/lib/tagfish/update/updater.rb

@@ -39,7 +39,7 @@ module Tagfish
 
       def update_uri(docker_uri)
         docker_api = DockerRegistryClient.for(docker_uri)
-        tags = docker_api.tag_map
+        tags = docker_api.tags
         newest_tag_name = tags.latest_tags.first
         if newest_tag_name.nil?
           docker_uri

data/lib/tagfish/version.rb

@@ -1,3 +1,3 @@
 module Tagfish
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagfish
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Clement Labbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler