docker_task 0.1.2 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de7a48febd51c58d4f82de385472a2e6fd82cbae
-  data.tar.gz: ac45b1cceac6624362c841a3ad2ae6b08d3ee2af
+  metadata.gz: a729074b69c87fda93bd2e17f318b05489e562ff
+  data.tar.gz: 43873b1e3503531e5bc20fa2d9373591330e73ac
 SHA512:
-  metadata.gz: d5e8be98ea06453f09a342a8a64b10d44108f25e2939236df4765845dcc2f3aa1345164c51ef14d837bbc1d84ed211c5c5776c2e8479b3a07b64ca5e6b6f2e3b
-  data.tar.gz: 8597d52ed58d07413a554ee41415963b9073b8578e58b2727c4561bf575bdb8eab62a20133adc1e5fbbb98794d3ea9e55110b57ca6c5819a116ef74b6af68ced
+  metadata.gz: 640610b2f3218226aab2bf6b1f8dedc6bed1e8939b3518ae945669bdf3bd891a8e58a3b1f295280be711ab90783756341525dadb1b2fde033ce61d0b2d978727
+  data.tar.gz: f1a0159342a7f0e64f7a2763752105ebc863db1edf949e2cbd47d871ea4a2e27d2a46284fe90032d5ec99d533505d4aac2a8b825e02d10706b40a09dc474ae77

data/lib/docker_task/task.rb

@@ -9,6 +9,7 @@ module DockerTask
     }
 
     DOCKER_CMD = 'docker'
+    GCLOUD_DOCKER_CMD = 'gcloud docker'
 
     attr_reader :options
 
@@ -136,7 +137,7 @@ module DockerTask
                 fail "Mirror %s not found" % mk
               end
             else
-              push_repo = '%s/%s' % [ @options[:registry], @options[:push_repo] ]
+              push_repo = repo_with_registry(@options[:push_repo], @options[:registry])
             end
 
             docker_do 'tag %s %s' % [ @options[:image_name], push_repo ]
@@ -149,7 +150,7 @@ module DockerTask
         desc 'Pull from registry based on push_repo options'
         task :pull do
           if @options[:push_repo]
-            pull_repo = '%s/%s' % [ @options[:registry], @options[:push_repo] ]
+            pull_repo = repo_with_registry(@options[:push_repo], @options[:registry])
 
             docker_do 'pull %s' % pull_repo
             docker_do 'tag %s %s' % [ pull_repo, @options[:image_name] ]
@@ -161,7 +162,7 @@ module DockerTask
         desc 'Re-tag a local copy from latest remote (will not pull)'
         task :retag do
           if @options[:push_repo]
-            pull_repo = '%s/%s' % [ @options[:registry], @options[:push_repo] ]
+            pull_repo = repo_with_registry(@options[:push_repo], @options[:registry])
             docker_do 'tag %s %s' % [ pull_repo, @options[:image_name] ]
           else
             puts 'Please specify a push_repo for this docker context'
@@ -175,19 +176,37 @@ module DockerTask
         end
 
         desc 'Stop and remove container'
-        task 'remove' do
+        task :remove do
           docker_do 'kill %s' % container_name, :ignore_fail => true
           docker_do 'rm %s' % container_name, :ignore_fail => true
         end
       end
     end
 
+    def repo_with_registry(repo_name, registry = nil)
+      if registry.nil?
+        repo_name
+      else
+        '%s/%s' % [ registry, repo_name ]
+      end
+    end
+
+    def docker_cmd(registry = nil)
+      if registry.nil?
+        DOCKER_CMD
+      elsif registry =~ /\.grc\.io/
+        GCLOUD_DOCKER_CMD
+      else
+        DOCKER_CMD
+      end
+    end
+
     def docker_do(cmd, opts = { })
       if opts[:ignore_fail]
         cmd += '; true'
       end
 
-      sh '%s %s' % [ DOCKER_CMD, cmd ]
+      sh '%s %s' % [ docker_cmd, cmd ]
     end
 
     def invoke_task(tname)

data/lib/docker_task/version.rb

@@ -1,3 +1,3 @@
 module DockerTask
-  VERSION = "0.1.2"
+  VERSION = "0.1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_task
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.2.1
 platform: ruby
 authors:
 - Mark John Buenconsejo