fidoci 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f202c9d07fa5e3fa6e029842600012db8794e65
-  data.tar.gz: b0e7f22bc99f73394f6da7ddf7d2e340cc57e426
+  metadata.gz: d2ce994dd006c83361b2e4e94b8d52f81bed0acd
+  data.tar.gz: 24ea65effdf2450f8ae6fac3354b373349fc6092
 SHA512:
-  metadata.gz: ee24fcc6bd6c022e5d80beae57883ae6aa66f4c8f0b7d9a13d24a1abf3dde4467232c8d63272d9d8fc6881963f7c7c8bf07ae7734fc05194bb41ff7178d6d41d
-  data.tar.gz: 2d7a1db47cb6082267fe171f4a03e87adb213aca1bca45afd6c787024641b663be895ad4fb567137bf1fbb2f77b3afdcb11bce9c29b149d1817c955ba3c8908b
+  metadata.gz: bb37b879aaed5e513207013e7faaba1b47e68ce12d578fbf92422e5bbb5687d8c65fbfe45b61528cee4edaf5f2bd23af74fb6ff288756efaa3e2b3b039e77ebb
+  data.tar.gz: c08b5bb1f14e0f829dfb3241224090f50badcf88daab133af6199e5dbb4fe28b00a383cfcad8f590343ee1e9e524f2dfacfb6a1027247580107f70e06b74b527

data/bin/d

@@ -31,10 +31,13 @@ when '--clean'
     # clean service and intermediate docker images
     environment.clean
 when '--build'
-    # d --build success-tag build-id
+    # d --build success-tag build-id [registry]
     # build image, test it and if successful, tag as latest-staging
     # if --clean is present, will clean all intermediate docker images after
-    if environment.build(ARGV.drop(1)[0], ARGV.drop(1)[1])
+    registry = ''
+    registry = ARGV.drop(1)[2] + "/" if ARGV.drop(1).size >= 3
+    puts "Using registry: #{registry}"
+    if environment.build(ARGV.drop(1)[0], ARGV.drop(1)[1], registry)
         exit 0
     else
         exit 1

data/lib/fidoci/env.rb

@@ -78,12 +78,24 @@ module Fidoci
             repo_tag = "#{@image}:#{tag}"
             image = Docker::Image.get(repo_tag)
 
-            creds = {
+            if ENV['DOCKER_AUTH_FILE']
+              # load file
+              auth_file = JSON.parse(File.read ENV['DOCKER_AUTH_FILE'])
+              image_parts = @image.split('/')
+	      registry = image_parts.size == 2 ? "https://#{image_parts[0]}" : "https://index.docker.io/v1/"
+              creds = auth_file['auths'][registry]
+              if creds['auth']
+                creds['username'], creds['password'] = Base64.decode64(creds['auth']).split(':', 2)
+                creds.delete 'auth'
+              end
+            else
+              creds = {
                 'username' => ENV['DOCKER_REGISTRY_USERNAME'],
                 'password' => ENV['DOCKER_REGISTRY_PASSWORD'],
                 'email' => ENV['DOCKER_REGISTRY_EMAIL']
-            }
-
+              }
+            end
+   
             info "Pushing #{repo_tag}..."
             image.push(creds, 'repo_tag' => repo_tag) do |msg|
                 json = JSON.parse(msg)

data/lib/fidoci/main.rb

@@ -40,8 +40,8 @@ module Fidoci
         # Create environment instance with given name
         # name - key that will be used to configure this env
         # id - unique identifier of env that will be used to tag containers and images
-        def env(name, id)
-            Env.new(repository_name, id.to_s, config[name.to_s])
+        def env(name, id, registry = '')
+            Env.new(registry + repository_name, id.to_s, config[name.to_s])
         end
 
         # Clean system
@@ -57,10 +57,10 @@ module Fidoci
         # Build image and run test in it
         # tag - tag name to tag image after successful build and test
         # build_id - unique build_id to be used to identify docker images and containers
-        def build(tag, build_id)
+        def build(tag, build_id, registry = '')
             build_id = SecureRandom.hex(10) unless build_id
 
-            test_env = env(:build, build_id)
+            test_env = env(:build, build_id, registry)
             test_env.clean!
 
             success = test_env.commands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fidoci
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Lukas Dolezal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -56,9 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Finally Docker CI
 test_files: []
-has_rdoc: