docker-template 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d76a4779cec82a6c13f3be1b64a22bc454f6126
-  data.tar.gz: d0f548b2754f2ba999361a4ce9e6f970dfc69e37
+  metadata.gz: 5bf62767522e006ada966819503966d664f241d0
+  data.tar.gz: 8975283cd6cb3fa23e6818f701a25318fe1ff2c3
 SHA512:
-  metadata.gz: 9b63c8cfb7fa0f8ebfc6bcebc581fa1d9f1794e71a6f3a5869226d0e254e7e2f88892eefdea66794a0457c23b8f0f35893075d81ca255b694cc551b1648763c5
-  data.tar.gz: 2ccc93f6003d232028ed0541ce8be0515ebdc199d5dbcafe7359ae078089610015e5371100b9cc7fbae71b9265e69fd84ee1079bb37e93c8d864b4e00a54a495
+  metadata.gz: 44c53179c5b4eaa63ad68abf43d6e15a167bb03c5d5d33ccb45112b08cf135c3c6d85636f3514667465dbe30aa152d017d87d4aaa8a6f9c1421b20d5743736a1
+  data.tar.gz: 1f8caf47fe8a3a234da841f07b51f3508119d777c12cc9236b9ae35791d5a0643e74bc0080fc22a458ef0f3bb0df1d6f4c136fc7f3c4ac96fdbe7705b3789ed2

data/lib/docker/template/auth.rb

@@ -14,16 +14,9 @@ module Docker
       # --
 
       def auth_with_env?
-        (
-          ENV.key?("DOCKER_USERNAME") && \
-          ENV.key?("DOCKER_PASSWORD") && \
-          ENV.key?("DOCKER_EMAIL")
-        ) || \
-        (
-          ENV.key?("bamboo_dockerUsername") && \
-          ENV.key?("bamboo_dockerPassword") && \
-          ENV.key?("bambo_dockerEmail")
-        )
+        ENV.key?("DOCKER_USERNAME") && \
+        ENV.key?("DOCKER_PASSWORD") && \
+        ENV.key?("DOCKER_EMAIL")
       end
 
       # --
@@ -40,10 +33,10 @@ module Docker
 
       def auth_from_env
         Docker.authenticate!({
-          "username" => ENV["DOCKER_USERNAME"] || ENV["bamboo_dockerUsername"],
-          "serveraddress" => ENV["DOCKER_SERVER"] || ENV["bamboo_dockerServer"] || DEFAULT_SERVER,
-          "password" => ENV["DOCKER_PASSWORD"] || ENV["bamboo_dockerPassword"],
-          "email" => ENV["DOCKER_EMAIL"] || ENV["bamboo_dockerEmail"]
+          "username" => ENV["DOCKER_USERNAME"],
+          "serveraddress" => ENV["DOCKER_SERVER"] || DEFAULT_SERVER,
+          "password" => ENV["DOCKER_PASSWORD"],
+          "email" => ENV["DOCKER_EMAIL"]
         })
       end
 

data/lib/docker/template/builder.rb

@@ -228,7 +228,7 @@ module Docker
 
       private
       def copy_git
-        return if rootfs? || !@repo.meta.git?
+        return if rootfs? || !@repo.meta.git? || !@repo.meta.push_only?
         require "rugged"
 
         @repo.meta[:git].each do |repo|

data/lib/docker/template/cli.rb

@@ -69,7 +69,7 @@ module Docker
       option :profile,    :type => :boolean, :desc => "Profile Memory."
       option :tty,        :type => :boolean, :desc => "Enable TTY Output."
       option :cache,      :type => :boolean, :desc => "Cache your repositories to cache."
-      option :exclude,    :type => :array,  :desc => "Build everything except for these images."
+      option :exclude,    :type => :array,   :desc => "Build everything except for these images."
       option :debug,      :type => :boolean, :desc => "Send the DEBUG=true env var to your instance."
       option :diff,       :type => :boolean, :desc => "Build only modified repositories."
       option :push,       :type => :boolean, :desc => "Push Repo After Building."

data/lib/docker/template/meta.rb

@@ -40,7 +40,9 @@ module Docker
         "project_data_dir" => "docker",
         "rootfs_base_img" => "envygeeks/alpine",
         "maintainer" => "Random User <random.user@example.com>",
+        "envygeeks" => ENV["ENVYGEEKS"] && ENV["ENVYGEEKS"] == "true",
         "user" => ENV["USER"] || ENV["USERNAME"] || "random",
+        "ci" => ENV["CI"] && ENV["CI"] == "true",
         "name" => Template.root.basename.to_s,
         "project_copy_dir" => "project",
         "rootfs_template" => "alpine",

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.10.0"
+    VERSION = "0.10.1"
   end
 end

data/templates/rootfs/alpine.erb

@@ -47,8 +47,8 @@ apk del --root=$ROOTFS <%= @meta.package_deep_cleanup %>
 mv $ROOTFS/var/run/* $ROOTFS/run 2> /dev/null || true
 mv $ROOTFS/var/lock  $ROOTFS/run 2> /dev/null || true
 rm -rf $ROOTFS/var/run $ROOTFS/var/lock
-ln -s $ROOTFS/run/lock $ROOTFS/var/lock
-ln -s $ROOTFS/run $ROOTFS/var/run
+ln -sf /run/lock $ROOTFS/var/lock
+ln -sf /run $ROOTFS/var/run
 
 # --
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor