dapp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2JkODE4NGMzNDIxOTc0ZjhmODMzYWI0OGQ1YmE0ZTJhMzQ5NWRhZQ==
+    Y2IwYzAwYWE2NjFmYTEwOTcwNDIzNzgxMGU1NWVlMzhlYzYyM2UwZA==
   data.tar.gz: !binary |-
-    YTBiMDY2ZDY0ZmM4NjUyMDEwNTEwY2Y0M2MzN2FmNDhiMTU0Njg2Yw==
+    MmQ2ODNiNzZhMzhkOGU0OGQ3MDRjMGY0OGU4YzYzMzA2Nzk3NmVhZg==
 SHA512:
   metadata.gz: !binary |-
-    ZTk3YzJlZmVjNTE2ZTdmNDdmMjFlNTRmZGUyYTRmZDE2NmUyMWQyMmQ4ZWYy
-    NjdiZGY4YWQxZWM2YzVlZGI2OWQzYTZmZjY1NWYyMTcyOGFlOThkZWYyYmZj
-    NmI1NjhmZjg4ZWIwOTk4ZjBhZThiNzQ0ZTQxMjUwYjhiYjQ3Mjg=
+    YWQyYWFiYjFjNWQxYmI4MzllZDFhZDBmYjQ3Yjk4OWZjY2NiZDk3ZjRiZDA4
+    NGRlZTZlMWQ0N2E5ODc5OGQ4NDgyNjkwZjRlMjFhM2E1NWVmYjEyZjEyZDJl
+    OTFjMDcwNzExNmUxZWMxNzliMmZjNzRjMWQ1M2YyZGE5ZTJjYmM=
   data.tar.gz: !binary |-
-    ZjkwYWY5ODM5NWM3ZGI4Nzk0YTA1ODlkODNkZTY3ZmQxZDBmZTM0YzE3OThl
-    NTRiYzI4ZDM5MGQ0YjQ3Y2QyMTZlOWMzNTM2ZGI2ZDU3OTgxZWM2MTZlMzlh
-    NmEyM2M3MGM1MDNlOWE3MGY5ZjU4ZjJhOTM0Mzk2ZDYwZjdjYzQ=
+    NDljNTM1Yjc3YjkxZjgxZDgyZDhhN2U5NzRjOGVjMTU4YjMxNWM2N2JmY2Jj
+    Njc0ZGVhNjg5MmVjMGFmODdlMzkyZjllZWZhODY2MWU3MWJhOTA1MmJmMjJj
+    YWIxYzgwMmUzNjNkOTgyZTc4ZmI2NzcwM2E3NzA0YzAzMzdjNTI=

data/lib/dapp/builder.rb

@@ -173,10 +173,10 @@ module Dapp
         send "tag_#{strategy}", image_id
       end
 
-      # push to registry
-      if opts[:docker_registry]
-        log 'Pushing to registry'
-        docker.push name: name, registry: opts[:docker_registry]
+      # push to repo
+      if opts[:docker_repo]
+        log 'Pushing to docker repo'
+        docker.push name: name, repo: opts[:docker_repo]
       end
 
       # count it

data/lib/dapp/builder/cascade_tagging.rb

@@ -13,14 +13,14 @@ module Dapp
         spec = {
           name: name,
           tag: home_branch,
-          registry: opts[:docker_registry]
+          repo: opts[:docker_repo]
         }
 
         # return if nothing changed
         return if image_id == docker.image_id(spec)
 
         # remove excess tags
-        tags_to_remove = docker.images(name: spec[:name], registry: spec[:registry])
+        tags_to_remove = docker.images(name: spec[:name], repo: spec[:repo])
         tags_to_remove.map! { |image| image[:tag] }
         tags_to_remove.select! { |tag| tag.start_with?("#{spec[:tag]}_") && tag.sub(/^#{spec[:tag]}_/, '').to_i >= opts[:build_history_length] }
         tags_to_remove.each do |tag_to_remove|

data/lib/dapp/builder/chefify.rb

@@ -39,6 +39,13 @@ module Dapp
           # init cronicler
           repo = GitRepo::Chronicler.new(self, 'dapp_cookbooks', build_path: home_branch)
 
+          # warmup berks cache
+          Dir.mktmpdir('dapp_berks_warmup') do |tmpdir_path|
+            FileUtils.cp home_path('Berksfile'), tmpdir_path
+            FileUtils.cp home_path('metadata.rb'), tmpdir_path
+            shellout 'berks install', cwd: tmpdir_path
+          end
+
           # verify berks lock
           shellout "berks verify --berksfile=#{home_path 'Berksfile'}"
 

data/lib/dapp/builder/ci_tagging.rb

@@ -9,7 +9,7 @@ module Dapp
 
         spec = {
           name: name,
-          registry: opts[:docker_registry]
+          repo: opts[:docker_repo]
         }
 
         tag_ci_branch_and_tag image_id, spec

data/lib/dapp/builder/git_tagging.rb

@@ -5,7 +5,7 @@ module Dapp
       def tag_git(image_id)
         spec = {
           name: name,
-          registry: opts[:docker_registry]
+          repo: opts[:docker_repo]
         }
 
         { commit: 'rev-parse HEAD', branch: 'rev-parse --abbrev-ref HEAD' }.each do |tag_type, git_command|

data/lib/dapp/builder/manual_tagging.rb

@@ -11,7 +11,7 @@ module Dapp
           spec = {
             name: name,
             tag: tag,
-            registry: opts[:docker_registry]
+            repo: opts[:docker_repo]
           }
 
           docker.tag image_id, spec

data/lib/dapp/cli/build.rb

@@ -71,9 +71,9 @@ BANNER
              description: 'Build directory',
              builder_opt: true
 
-      option :docker_registry,
-             long: '--docker-registry REGISTRY',
-             description: 'Docker registry',
+      option :docker_repo,
+             long: '--docker-repo REPO',
+             description: 'Docker repo',
              builder_opt: true
 
       option :flush_cache,

data/lib/dapp/docker.rb

@@ -85,8 +85,8 @@ module Dapp
       image ? image[:id] : nil
     end
 
-    def images(name:, tag: nil, registry: nil)
-      all_images.select { |i| i[:name] == pad_image_name(name: name, registry: registry) && (!tag || i[:tag] == tag) }
+    def images(name:, tag: nil, repo: nil)
+      all_images.select { |i| i[:name] == pad_image_name(name: name, repo: repo) && (!tag || i[:tag] == tag) }
     end
 
     def all_images
@@ -102,14 +102,14 @@ module Dapp
       docker "rmi #{pad_image_name(**kwargs)}"
     end
 
-    def push(name:, tag: nil, registry: nil)
-      docker "push #{pad_image_name name: name, tag: tag, registry: registry}", log_verbose: true
+    def push(name:, tag: nil, repo: nil)
+      docker "push #{pad_image_name name: name, tag: tag, repo: repo}", log_verbose: true
     end
 
     protected
 
-    def pad_image_name(name:, tag: nil, registry: nil)
-      name = "#{registry}/#{name}" if registry
+    def pad_image_name(name:, tag: nil, repo: nil)
+      name = "#{repo}/#{name}" if repo
       name = "#{name}:#{tag}" if tag
       name
     end

data/lib/dapp/git_artifact.rb

@@ -193,7 +193,7 @@ module Dapp
     end
 
     def create_arhive_with_owner_substitution!
-      Dir.mktmpdir('change_archive_owner', build_path) do |tmpdir_path|
+      Dir.mktmpdir('dapp_change_archive_owner') do |tmpdir_path|
         atomizer << tmpdir_path
         repo.git_bare "archive #{repo_latest_commit}:#{cwd} #{paths} | /bin/tar --extract --directory #{tmpdir_path}"
         builder.shellout("/usr/bin/find #{tmpdir_path} -maxdepth 1 -mindepth 1 -printf '%P\\n' | /bin/tar -czf #{archive_path} -C #{tmpdir_path}" \

data/lib/dapp/version.rb

@@ -1,3 +1,3 @@
 module Dapp
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dmitry Stolyarov