docker-spec 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 468199d42b57545252219d5bfc7a48058921d0d4
-  data.tar.gz: eb3cb666a50cb71cd9551b469566befa7ca94ace
+  metadata.gz: e463ce0c2f1b3802ab6a42ade137035f01caecb9
+  data.tar.gz: 942786454991860269938b07868824a1163b9e68
 SHA512:
-  metadata.gz: '02689083df095e8cfaf77fce4bb20654454d254dcf00fba5e6af53e2e1b4bec41b570f87f8618e8ea7b3137e312e174cdbd16fe69f0963c1cee44c495521681f'
-  data.tar.gz: 32017eb0ed2de213c6fccd88091f82be2e536a9386dede6fc13c9acfbac2240855252c7ab4c780b3695f3c05da91096dd6bd32cf22f652ca8ebd5211dac47328
+  metadata.gz: fa210d810572141b7bcb020199ffe1849047ab2ede958384636f6572e95f07ae6cb7066b877c771bd9af9dbcef0c9596c9ec579e4353d02e0ca6fbedef157d43
+  data.tar.gz: 0f478a7f1b1d27417f2d58b8312c7b392037c994f2ed58fbb16670bf9effa7efd509f4a4ab84ebfb8cd4ed45030e97e5c597d6a00544ff99e28f128878f8d2e6

data/README.md

@@ -27,6 +27,22 @@ require 'docker-spec'
 
 And run rspec to build your docker containers
 
+## Options are
+
+:build_root: wether to build the root directory or not
+:build_root: wether to build the docker image
+:push_container: if the container should be pushed
+:account: can be the registry URL or the dockerhub account name
+:name: the docker image / repository name
+:auth: the auth key used to authenticate if is not dockerhub on ~/.docker/config.js
+:serveraddress: The server address to authenticate to if not dockerhub
+:tag_db: The file where to update the tag information
+:env: an array of VAR=foo environment variables to pass when running
+:registry: -> registry credentials
+  :username:
+  :password:
+  :email:
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/docker-spec. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
@@ -35,4 +51,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
-# TODO: Finish the integration with push

data/lib/docker/spec.rb

@@ -56,20 +56,21 @@ class DockerSpec
         fail('tag_db is not defined in docker_spec.yml')
 
       # Load credentials from config file, or default docker config
-      if @config[:dockerhub]
-        @config[:dockerhub][:username] ||
-          fail('dockerhub->username is not defined in docker_spec.yml')
-        @config[:dockerhub][:password] ||
-          fail('dockerhub->password is not defined in docker_spec.yml')
-        @config[:dockerhub][:email] ||
-          fail('dockerhub->email is not defined in docker_spec.yml')
+      if @config[:registry]
+        @config[:registry][:username] ||
+          fail('registry->username is not defined in docker_spec.yml')
+        @config[:registry][:password] ||
+          fail('registry->password is not defined in docker_spec.yml')
+        @config[:registry][:email] ||
+          fail('registry->email is not defined in docker_spec.yml')
       else
-        @config[:dockerhub] = Hash.new
+        auth = @config[:auth] || 'https://index.docker.io/v1/'
+        @config[:registry] = Hash.new
         docker_auth = JSON.parse(File.read(File.expand_path(DOCKER_AUTH_FILE)))
-        auth_base64 = docker_auth['auths']['https://index.docker.io/v1/']['auth']
-        @config[:dockerhub][:username] = Base64.decode64(auth_base64).split(':').first
-        @config[:dockerhub][:password] = Base64.decode64(auth_base64).split(':').last
-        @config[:dockerhub][:email] = docker_auth['auths']['https://index.docker.io/v1/']['email']
+        auth_base64 = docker_auth['auths'][auth]['auth']
+        @config[:registry][:username] = Base64.decode64(auth_base64).split(':').first
+        @config[:registry][:password] = Base64.decode64(auth_base64).split(':').last
+        @config[:registry][:email] = docker_auth['auths'][auth]['email']
       end
 
       # Open key value store and get the current tag for this repo
@@ -82,9 +83,10 @@ class DockerSpec
       end
 
       # Login to docker hub and push latest and new_tag
-      Docker.authenticate! username: @config[:dockerhub][:username],
-                           password: @config[:dockerhub][:password],
-                           email: @config[:dockerhub][:email]
+      Docker.authenticate! username: @config[:registry][:username],
+                           password: @config[:registry][:password],
+                           email: @config[:registry][:email],
+                           serveraddress: @config[:serveraddress] || 'https://index.docker.io'
 
       image.tag repo: @config[:image_name], tag: new_tag, force: true
       puts "\nINFO: pushing #{@config[:image_name]}:#{new_tag} to DockerHub"

data/lib/docker/spec/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Spec
-    VERSION = "0.16.0"
+    VERSION = "0.17.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spec
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler