dockit 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb2edf38e3f0f06d4c997330eb29db37b1e8d13
-  data.tar.gz: cb97c7f00512dd5ec88002f31a5d09bc6195bf57
+  metadata.gz: 7a78a51574f160dbd04c0f22717937257c31af83
+  data.tar.gz: a62bf6fda71fe0a1f23225a9d2ee2e3f1d7d1ae6
 SHA512:
-  metadata.gz: 96ef9fa0a4f7b1d8aae16c0b3729c6afa1fd0aa6a544d0c561865206f91d9caf78bff8baa8ee1166c65d942f648d8cb2e3e7297ec879b94ad66f24ba40e1322b
-  data.tar.gz: 0a67578e3c3d7bfe35959d2f1ae72139254b798db5bff9edf81da4be4ae12c271fc7e3f51029011eb0b0f065fb43f21a402bd163fd2c396f2d6536b567384526
+  metadata.gz: cba2ebf7729a13e28c0722527217636f6fb45b4f0b2b0bb6fe89dfa241f2249902dd1e26f1f271c8a9665ad103f16a668675655c1f199cc6a5547b70e16d8599
+  data.tar.gz: 6a9cd2288a51eaa9e95275efe7a306755d76f2536853ecc1529e593ebd3cceacf56cd3e0c2c73d5919c192c1c9cbe3e55fcfaa31713a20689d90eda4912c42b4

data/Dockerfile

@@ -1,4 +1,9 @@
-FROM cybercode/alpine-ruby:2.3
+FROM alpine:3.5
+
+RUN apk update && apk upgrade && apk --update add docker \
+    ruby ruby-irb ruby-rake ruby-io-console ruby-bigdecimal ruby-json ruby-bundler \
+    libstdc++ tzdata bash ca-certificates \
+    &&  echo 'gem: --no-document' > /etc/gemrc
 
 RUN apk update && apk upgrade && apk add docker
 

data/VERSION

@@ -1 +1 @@
-4.1.1
+4.1.2

data/dockit.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name          = "dockit"
   s.version       = File.read("VERSION").chomp # file managed by version gem...
   s.authors       = ["Rick Frankel"]
-  s.email         = ["dockitk@rickster.com"]
+  s.email         = ["dockit@cybercode.nyc"]
 
   s.summary       = %q{A configuration manager and builder for docker projects.}
   s.description   = %q{Dockit is a builder for complex docker projects. Think scriptable docker-composer.}

data/lib/dockit/digitalocean.rb

@@ -76,8 +76,8 @@ class DO < Thor
   end
 
   desc 'push [SERVICES]', 'push service(s) to digitalocean (default all)'
-  option :backup, type: :boolean, desc: "Backup (tag) current version before push",
-         aliases: ['b']
+  option :backup, type: :boolean,
+         desc: "Backup (tag) current version before push", aliases: ['b']
   option :tag, type: :string, desc: "tag name for backup", default: 'last'
   def push(*args)
     args = dockit.services.keys if args.empty?
@@ -89,19 +89,19 @@ class DO < Thor
         say ". #{k}: No image!", :red
         next
       end
-      name    = s.config.get(:build, :t)
+      name = s.config.get(:build, :t)
       unless name.present?
         say ". #{k}: not a local build", :red
         next
       end
-      id      = s.image.id
-      msg     =  "#{k}(#{id[0..11]}[#{name}]):"
+      id  = s.image.id
+      msg = "#{k}(#{id[0..11]}[#{name}]):"
       if ssh(options.remote, options.user,
              "docker images --no-trunc | grep #{id} > /dev/null")
         say ". #{msg} exists"
       else
         if options.backup
-          tag = "#{k}:#{options.tag}"
+          tag = "#{name}:#{options.tag}"
           say "#{msg} tagging as #{tag}"
           ssh(options.remote, options.user, "docker tag #{name} #{tag}")
         end
@@ -116,13 +116,12 @@ class DO < Thor
          desc: 'extra environment variables not defined in Dockit.yaml'
   def start(name)
     s     = service(name)
-    name  = s.name
     links = config(s, :run,    :Links, 'l')
     binds = config(s, :run,    :Binds, 'v')
 
-    env   = config(s, :create, :Env,   'e')
-    env   << (options[:vars]||{}).collect { |k,v| ['-e', "#{k}='#{v}'"]}
-    env   << ['-e', "ENV='#{options.env}'"]
+    env = config(s, :create, :Env, 'e')
+    env << (options[:vars] || {}).collect { |k, v| ['-e', "#{k}='#{v}'"] }
+    env << ['-e', "ENV='#{options.env}'"]
 
     cmd = ['docker', 'run', env, links, binds].join(' ')
     ssh(options.remote, options.user, cmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockit
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Rick Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ dependencies:
         version: '1.0'
 description: Dockit is a builder for complex docker projects. Think scriptable docker-composer.
 email:
-- dockitk@rickster.com
+- dockit@cybercode.nyc
 executables:
 - dockit
 extensions: []