aggkit 0.3.1 → 0.3.1.8768

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5c5d74cf5c3b2d34c4fe13139a82a3f66c6562e43862b7d12992ab4c67432a48
-  data.tar.gz: 82a51fb25f4135e22cb84be37b68f58b769da99bb6254c1105d263558493f281
+SHA1:
+  metadata.gz: da7e110db65fee090004aa89ebe7b9e51d61b29d
+  data.tar.gz: a23634dedbc61ead7fdf2fd82db903d54a9db349
 SHA512:
-  metadata.gz: 5c96a34e819db1576ba80d7472d9ca6fe5161df5f0fe49819d95e0864db6f7c14e861e1172f6ebc236c568141ddd64d9a1238844b52a8ff94ac62ba0733349a2
-  data.tar.gz: f4e7a4ac7dbc5139e317383da001369f2eeed862ca7b3b6cf05048fffe8b854ff941d8728f6499e487a43a1d91f14137f2d553c06b1bddde01a28c95c6106039
+  metadata.gz: fc6a2f04341e21addd3188c4902802edf68c25740c55e6986f4c2fd8005e54b2c8bf1bd34aa6404d6c3a5d458810f0e6a4e1c87f040c001d9fcd572a12ee4ff7
+  data.tar.gz: 5cd039ed3153e03b5f1c8eec26d3058df0d28128a6709155334424215bdc5508f2fc290737bf698309fed4c0b509eb4142b63e21d4f5cf1329d97b3b6a718f64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.3.1)
+    aggkit (0.3.1.8768)
       diplomat
       dotenv
       json

data/bin/aggci

@@ -22,6 +22,10 @@ parser = OptionParser.new do |o|
     @opts[:pull] = parse_services(services)
   end
 
+  o.on("--push-cache services", 'Push cache to docker regestry') do |services|
+    @opts[:push] = parse_services(services)
+  end
+
   o.on("--promote services", 'Promote service images to --stage') do |services|
     @opts[:promote] = parse_services(services)
   end
@@ -63,6 +67,10 @@ if services = @opts[:pull]
   raise "tag not defined" if @opts[:tag].to_s.empty?
   pull_images_cache services, @opts[:tag]
   exit 0
+elsif services = @opts[:push]
+  raise "tag not defined" if @opts[:tag].to_s.empty?
+  push_images_cache services, @opts[:tag]
+  exit 0
 elsif services = @opts[:promote]
   raise "tag not defined" if @opts[:tag].to_s.empty?
   raise "stage not defined" if @opts[:stage].to_s.empty?

data/bin/aggwait

@@ -76,6 +76,10 @@ OptionParser.new do |o|
     @opts[:pass] = pass.strip
   end
 
+  o.on('--docker=SOCKET', 'wait for docker available') do |socket|
+    @opts[:docker] = socket.strip
+  end
+
   o.on('-t', '--timeout secs=15', 'Total timeout') do |timeout|
     @opts[:timeout] = timeout.to_i
   end
@@ -208,6 +212,16 @@ def wait_for_file(file = @opts[:file], timeout = @opts[:timeout])
   yield(ret)
 end
 
+def wait_for_docker(socket = @opts[:docket], timeout = @opts[:timeout])
+  log("Waiting for Docker on: #{socket}")
+  ret = wait_for timeout do
+    cmd = "DOCKER_HOST=#{socket} docker info > /dev/null 2>&1"
+    system(cmd)
+    $?.success?
+  end
+  yield(ret)
+end
+
 if @opts[:tb]
   wait_for_tcp do |success|
     if success
@@ -260,3 +274,9 @@ if @opts[:file]
     complete!(success)
   end
 end
+
+if @opts[:docker]
+  wait_for_docker(@opts[:docker], @opts[:timeout]) do |success|
+    complete!(success)
+  end
+end

data/lib/aggkit/ci.rb

@@ -175,6 +175,7 @@ module Aggkit
     def pull_images_cache services, tag
       log_action "Puling images#{[services].flatten.inspect} from cache...."
       [services].flatten.each do |service|
+        execute("docker pull #{workimage(service, tag)} 2> /dev/null || true")
         execute("docker pull #{devimage(service, tag)} 2> /dev/null || true")
         execute("docker pull #{stageimage(service, tag)} 2> /dev/null || true")
         execute("docker pull #{releaseimage(service, tag)} 2> /dev/null || true")
@@ -184,6 +185,14 @@ module Aggkit
       end
     end
 
+    # Залить образы в репозиторий
+    def push_images_cache services, tag
+      log_action "Pushing images#{[services].flatten.inspect} to cache...."
+      [services].flatten.each do |service|
+        tagimage! workimage(service, tag), workimage(service, tag), push: true
+      end
+    end
+
     #Растегировать все образы для дальнейшего удаления. Помечает как latest для поддержки кеширования docker
     def clean_services services, tag
       [services].flatten.each do |service|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.1.8768
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul in Aggredator