app-rb 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7742e8a1fcec586fb33ee44414d89ea7ecee87f
-  data.tar.gz: c9d97cf47d41a5e9b2b22a464b78d3311da7471e
+  metadata.gz: 04a7cf3fe51832c039c94e42bb3c01d9b85747f8
+  data.tar.gz: db9d29ba136cdc10b81d3a7efbe3c6523397c0f5
 SHA512:
-  metadata.gz: 7430044a5e2f07f3a3ef65a4a98561579b0904ae7e842bf686162da33195dd5ab67004a8f4a70c392f48dce721d7a63175e4ce0cc3555f3cf1ddfc81e2343e1c
-  data.tar.gz: 15c8870993c265004ad98696f9812915e3d7af01a9605ee447354db3efe85598fbf29fa0730c5a5a52192c5f4647ff9e9589399816d4bd3d0851a0fc78b9b073
+  metadata.gz: edbfa05ea16f99ce0152c370bebe54502e74a9bcb33c1b12d9a2942b243b1471f2b29e41ca780104683ad14333a631fa71da87d1ddc74ad2ec58956ecfc49632
+  data.tar.gz: 0adc9408ade0ea60e65c59827edc311706cf8a441b1bee398980a56dccaba246568585abf58a3b853e009ef6c8b8d3db3b1caf42376aa697bdf6af122de48318

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## App-rb 0.5.0 (April 8, 2017) ##
+
+* [breaking change] Rename `restart` cli command into `redeploy`.
+* Check if build and pre deploy node available.
+* Remove old images after deploy.
+* Add `run` cmd to start one time jobs.
+* Add "one-time" work running bash scripts for each run node.
+* Add `cd` cmd to ssh to some run node.
+* Deploy slack notifications.
+* Add cron jobs support.
+
 ## App-rb 0.4.0 (April 8, 2017) ##
 
 * [breaking change] Remove node role support.

data/README.md

@@ -2,7 +2,7 @@
 
 Powerfull docker apps deployer.
 
-[![Build Status](https://img.shields.io/travis/uchiru/app-rb/master.svg)]()
+[![Build Status](https://img.shields.io/travis/smuzitools/app-rb/master.svg)]()
 [![Gem Version](https://img.shields.io/gem/v/app-rb.svg)]()
 
 ## Installation
@@ -17,7 +17,7 @@ Fire `app-rb` to print help.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/uchiru/app-rb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/smuzitools/app-rb.
 
 ## License
 

data/app-rb.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Easy deploy docker apps}
   spec.description   = %q{Deploy docker apps. Nothing else}
-  spec.homepage      = "https://github.com/uchiru/app-rb"
+  spec.homepage      = "https://github.com/smuzitools/app-rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/app-rb/cli.rb

@@ -24,12 +24,16 @@ module AppRb
         Command.new(config).deploy(@args[2])
       elsif command == "status" || command == "s"
         Command.new(config).status
-      elsif command == "restart"
-        Command.new(config).restart
+      elsif command == "redeploy"
+        Command.new(config).redeploy
       elsif command == "clean"
         Command.new(config).clean
       elsif command == "stop"
         Command.new(config).stop
+      elsif command == "run" || command == "r"
+        Command.new(config).run(@args[2..-1].join(" "))
+      elsif command == "cd"
+        Command.new(config).cd
       else
         puts "FATAL: unknown command '#{command}'"
         exit -1
@@ -44,9 +48,16 @@ module AppRb
       puts ""
       puts "  app-rb <yml> <command>"
       puts ""
+      puts "Usage:"
       puts "  deploy [hash]      - deploy new version of app"
       puts "  status             - status of app"
       puts "  stop               - stop app"
+      puts "  run <cmd> [args]   - one time command"
+      puts "  cd                 - go to run node"
+      puts ""
+      puts "Advanced:"
+      puts "  redeploy           - redeploy app"
+      puts "  clean              - stop and remove not current containers"
     end
   end
 end

data/lib/app-rb/command.rb

@@ -6,19 +6,34 @@ module AppRb
 
     def deploy(target)
       @base = "#{@config.app}-#{Time.now.to_i}"
+      start_at = Time.now
+      user = AppRb::Util.just_cmd("git config user.name")
 
       # init
       current_hash = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "hash")
       build_nodes = @config.nodes(@config.image["constraint"])
+      if build_nodes.empty?
+        puts "FATAL ERROR: no build nodes found"
+        exit -1
+      end
       pre_payloads = @config.pre_deploy.map do |pre|
-        {
+        payload = {
           "nodes" => @config.nodes(pre["constraint"]),
           "cmd" => pre["cmd"],
           "opts" => pre["opts"] || [],
         }
+        if payload["nodes"].empty?
+          puts "FATAL ERROR: no pre deploy nodes found"
+          exit -1
+        end
+        payload
       end
       deploy_payloads = @config.deploy.map { |key, section|
         nodes = @config.nodes(section["constraint"])
+        if nodes.empty?
+          puts "FATAL ERROR: no deploy `#{key}` nodes found"
+          exit -1
+        end
         {
           "key" => key,
           "nodes" => nodes,
@@ -29,17 +44,44 @@ module AppRb
           "opts" => section["opts"] || [],
         }
       }
+      if @config.run["constraint"]
+        run_nodes = @config.nodes(@config.run["constraint"])
+      else
+        run_nodes = deploy_payloads.flat_map { |payload| payload["nodes"] }.uniq
+      end
+      if run_nodes.empty?
+        puts "FATAL ERROR: no run nodes found"
+        exit -1
+      end
+      cron_payloads = @config.cron.map { |key, section|
+        nodes = @config.nodes(section["constraint"])
+        if nodes.empty?
+          puts "FATAL ERROR: no cron `#{key}` nodes found"
+          exit -1
+        end
+        {
+          "key" => key,
+          "nodes" => nodes,
+          "cmd" => section["cmd"],
+          "at" => "#{section["minute"] || "*"} #{section["hour"] || "*"} #{section["day"] || "*"} #{section["month"] || "*"} #{section["weekday"] || "*"}"
+        }
+      }
       old_ips = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "nodes").split(",")
       new_ips = (
         build_nodes.map(&:ip) +
         pre_payloads.flat_map { |p| p["nodes"].map(&:ip) } +
-        deploy_payloads.flat_map { |p| p["nodes"].map(&:ip) }
+        deploy_payloads.flat_map { |p| p["nodes"].map(&:ip) } +
+        run_nodes.map(&:ip) +
+        cron_payloads.flat_map { |p| p["nodes"].map(&:ip) }
       ).uniq
       ips = (old_ips + new_ips).uniq
       AppRb::Util::Consul.kv_set(@config.consul, @config.app, "nodes", ips.join(","))
 
       # pre
       new_hash = prepare_image(build_nodes, target)
+      if @config.slack?
+        notify_slack(@config.slack_url, @config.slack_channel, "#{user} start deploy *#{@config.app}* - https://github.com/#{@config.image["repo"]}/compare/#{current_hash.to_s[0..6]}...#{new_hash.to_s[0..6]}")
+      end
       pre_deploy(pre_payloads, new_hash)
       stop_bg_jobs(ips)
 
@@ -49,12 +91,24 @@ module AppRb
       # switch
       blue_green(deploy_payloads, new_hash)
 
+      # update one time scripts
+      one_time_scripts(run_nodes, ips, new_hash)
+
+      # update crons
+      set_crons(cron_payloads, ips, new_hash)
+
       # clean
       stop_services(ips)
       clean_registry(current_hash, [current_hash, new_hash].uniq)
+      remove_old_images(ips, [current_hash, new_hash].uniq)
 
       # finish
       AppRb::Util::Consul.kv_set(@config.consul, @config.app, "nodes", new_ips.join(","))
+
+      if @config.slack?
+        notify_slack(@config.slack_url, @config.slack_channel, "#{user} finish deploy *#{@config.app}* :cat: :cat: :cat: - #{((Time.now.to_f - start_at.to_f)/60).round(1)} minutes")
+      end
+
       puts AppRb::Util.green("Done.")
       if current_hash != "" && !target && current_hash != target
         puts "to rollback fire: app-rb #{ARGV[0]} deploy #{current_hash}"
@@ -90,6 +144,9 @@ module AppRb
     def stop
       ips = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "nodes").split(",")
       stop_all(ips)
+      ips.each do |ip|
+        AppRb::Util::Docker.add_cron(@config.user, ip, "#{@config.registry}/#{@config.app}:#{hash}", @config.env, @config.app, [])
+      end
     end
 
     def clean
@@ -98,15 +155,33 @@ module AppRb
       stop_services(ips, base)
     end
 
-    def restart
+    def redeploy
       hash = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "hash")
       raise "FATAL: app is not started?" if hash == ""
       puts "hash=#{hash}"
       deploy(hash)
     end
 
+    def run(cmd)
+      hash = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "hash")
+      raise "FATAL: app is not started?" if hash == ""
+      run_nodes = @config.nodes(@config.run["constraint"])
+      AppRb::Util::Docker.run(@config.user, run_nodes.sample.ip, "#{@config.registry}/#{@config.app}:#{hash}", @config.env, cmd)
+    end
+
+    def cd
+      hash = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "hash")
+      raise "FATAL: app is not started?" if hash == ""
+      run_nodes = @config.nodes(@config.run["constraint"])
+      AppRb::Util.do_it "ssh -t #{@config.user}@#{run_nodes.sample.ip} bash --login"
+    end
+
   private
 
+    def notify_slack(url, channel, msg)
+      AppRb::Util.do_it(%(curl -s -X POST --data-urlencode 'payload={"channel": "#{channel}", "username": "deplobot", "parse": "full", "text": "#{msg}"}' #{url}))
+    end
+
     def full_image_name(hash)
       "#{@config.registry}/#{@config.app}:#{hash}"
     end
@@ -154,8 +229,10 @@ module AppRb
         payload["nodes"].map { |node|
           Thread.new do
             (plan[node.ip] || []).each do |name|
-              port = AppRb::Util.get_free_port(@config.user, node.ip)
-              puts "[#{node.name}] port=#{port}"
+              if payload["port"]
+                port = AppRb::Util.get_free_port(@config.user, node.ip)
+                puts "[#{node.name}] port=#{port}"
+              end
 
               AppRb::Util::Docker.run_daemon(
                 @config.user, node.ip,
@@ -226,5 +303,35 @@ module AppRb
       puts AppRb::Util.blue("+++ CLEAN REGISTRY")
       AppRb::Util::Registry.clean(@config.registry, @config.app, keep_hashes)
     end
+
+    def remove_old_images(ips, keep_hashes = [])
+      puts AppRb::Util.blue("+++ REMOVE OLD IMAGES")
+      ips.each do |ip|
+        AppRb::Util::Docker.remove_images(@config.user, ip, "#{@config.registry}/#{@config.app}", keep_hashes)
+      end
+    end
+
+    def one_time_scripts(run_nodes, ips, hash)
+      puts AppRb::Util.blue("+++ ONE TIME SCRIPTS")
+      run_nodes.each do |n|
+        AppRb::Util::Docker.create_one_time_script(@config.user, n.ip, "#{@config.registry}/#{@config.app}:#{hash}", @config.env, @config.app)
+      end
+      ips.each do |ip|
+        next if run_nodes.map(&:ip).index(ip)
+        AppRb::Util::Docker.remove_one_time_script(@config.user, ip, @config.app)
+      end
+    end
+
+    def set_crons(cron_payloads, ips, hash)
+      puts AppRb::Util.blue("+++ CRONS")
+      ips.each do |ip|
+        crons = cron_payloads.select { |section|
+          section["nodes"].map(&:ip).index(ip)
+        }.map { |section|
+          {"cmd" => section["cmd"], "at" => section["at"], "key" => section["key"]}
+        }
+        AppRb::Util::Docker.add_cron(@config.user, ip, "#{@config.registry}/#{@config.app}:#{hash}", @config.env, @config.app, crons)
+      end
+    end
   end
 end

data/lib/app-rb/config.rb

@@ -12,6 +12,11 @@ class AppRb::Config
   def env; @body["env"] || {}; end
   def pre_deploy; @body["pre_deploy"] || []; end
   def deploy; @body["deploy"] || {}; end
+  def cron; @body["cron"] || {}; end
+  def run; @body["run"] || {}; end
+  def slack_url; @body["slack_url"]; end
+  def slack_channel; @body["slack_channel"]; end
+  def slack?; slack_url && slack_channel; end
 
   def nodes(constraint = nil)
     constraint ||= {}

data/lib/app-rb/util/docker.rb

@@ -11,13 +11,12 @@ module AppRb::Util::Docker
   end
 
   def self.run_batch(user, host, name, image, cmd, labels = {}, env = {}, opts = [])
-    AppRb::Util.do_it "ssh #{user}@#{host} docker run " +
+    AppRb::Util.do_it "ssh #{user}@#{host} docker run --rm " +
       labels.map { |k, v| "--label #{k}=#{v} " }.join +
       "--name #{name} " +
       opts.join(" ") + " " + 
       env.map { |k, v| "-e #{k}='#{v}' " }.join +
       "#{image} #{cmd}"
-    AppRb::Util.do_it "ssh #{user}@#{host} docker rm #{name}"
   end
 
   def self.run_daemon(user, host, name, image, cmd, labels = {}, env = {}, opts = [], ports = {})
@@ -44,4 +43,43 @@ module AppRb::Util::Docker
       AppRb::Util.do_it("ssh #{user}@#{host} docker rm #{(all_ids - keep_ids).join(" ")}")
     end
   end
+
+  def self.remove_images(user, host, image_name, keep_tags = [])
+    all_ids = AppRb::Util.just_cmd("ssh #{user}@#{host} docker images #{image_name} -q").split("\n")
+    keep_ids = keep_tags.map { |tag|
+      AppRb::Util.just_cmd("ssh #{user}@#{host} docker images #{image_name}:#{tag} -q")
+    }
+    if (all_ids - keep_ids).length > 0
+      AppRb::Util.do_it("ssh #{user}@#{host} 'docker rmi #{(all_ids - keep_ids).join(" ")}'; echo ok")
+    end
+  end
+
+  def self.run(user, host, image, env, cmd)
+    AppRb::Util.do_it "ssh -t #{user}@#{host} docker run --rm -it " +
+      env.map { |k, v| "-e #{k}='#{v}' " }.join +
+      "#{image} #{cmd}"
+  end
+
+  def self.create_one_time_script(user, host, image, env, app)
+    AppRb::Util.do_it "ssh #{user}@#{host} bash <<EOF
+      echo '#/bin/bash' > ~/run_#{app}.sh
+      echo 'docker run -it --rm #{env.map { |k, v| "-e #{k}='#{v}' " }.join} #{image} \"\\$@\"' >> ~/run_#{app}.sh
+      chmod +x ~/run_#{app}.sh
+      \nEOF"
+  end
+
+  def self.remove_one_time_script(user, host, app)
+    AppRb::Util.do_it "ssh #{user}@#{host} bash <<EOF
+      rm -f ~/run_#{app}.sh
+      \nEOF"
+  end
+
+  def self.add_cron(user, host, image, env, app, crons)
+    echos = crons.map { |cron|
+      %(echo "#{cron["at"]} __APP=#{app}; start=\\\\\\$(date); (docker run --rm #{env.map { |k, v| "-e #{k}='#{v}' " }.join}#{image} #{cron["cmd"]}; echo start \\\\\\$start, finish \\\\\\$(date)) >> /home/#{user}/crontab__#{app}__#{cron["key"]}.log 2>&1")
+    }
+    AppRb::Util.do_it %(ssh #{user}@#{host} bash <<EOF
+      (crontab -l | grep -v -F '__APP=#{app};'; #{echos.join("; ")}) | crontab -
+      \nEOF)
+  end
 end

data/lib/app-rb/version.rb

@@ -1,3 +1,3 @@
 module AppRb
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alexey Vakhov
@@ -81,7 +81,7 @@ files:
 - lib/app-rb/util/docker.rb
 - lib/app-rb/util/registry.rb
 - lib/app-rb/version.rb
-homepage: https://github.com/uchiru/app-rb
+homepage: https://github.com/smuzitools/app-rb
 licenses:
 - MIT
 metadata: {}