docker_houston 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c1ec3e45059f8a462b9e5844a7509bfa8a3179
-  data.tar.gz: 4638e8cc88ae6afd0e1867f9a7dc760e16692056
+  metadata.gz: 8385fd21082fdd57412381955b2c3656e09eb393
+  data.tar.gz: 6c061aeb84b85f3ce4ccb8f4e450edeeeffca141
 SHA512:
-  metadata.gz: 766610f8a772345a4ff4b69c96bd5c7f1216d910aeb1dac6ffecc4c41d2f13720fa7269c9b713901f026ca2d7297317d9eb90782c496254725c3d3425bd19433
-  data.tar.gz: 9856ce1bc1ddc1cbc2cb3f8c91d847a0da8029ae4362858b56248bf6f892b65e8a0666d478a79db73350c3475ebb889d5f1204b55da6c26521e7ddbcd878fb20
+  metadata.gz: ebaa7a377aef0880deeafa8bab9deec70516c537a8bf11b4dd78683fbfdc9bdd69d68c6bee2c7ed3170c37757b9854b412c64422a39af7fe65214ca5fae7d935
+  data.tar.gz: 287926ec8a900b78eba0e4c34e691bb9f26670826d2f4434b6f1fb840ab1877ae3c3201c5363f7eef869e72d7e28ed66549c1e7feba8676ade40c425048d2f4c

data/README.md

@@ -87,6 +87,8 @@ invoke 'docker:setup_db'
 invoke 'docker:build_container'
 invoke 'docker:stop'
 invoke 'docker:start'
+invoke 'docker:cleanup_containers'
+invoke 'docker:cleanup_images'
 invoke 'docker:notify'
 
 ```
@@ -94,7 +96,9 @@ invoke 'docker:notify'
 * Build the container for it.
 * Stop the current running containers if existed.
 * Start new container for the project.
-* Notifying to Team channel (TODO://)
+* Clean up exited containers
+* Clean up unlinked images
+* Notifying to Team channel
 
 
 ### Console
@@ -127,7 +131,7 @@ The deploy message reads: "New version of #{fetch(:app_name)} has been deployed
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/touchtechltd/docker_houston. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/alex-zige/docker_houston. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/docker_houston.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Misson Control for docker builds."
   spec.description   = "Utilities for deploy docker builds."
-  spec.homepage      = "http://www.google.com"
+  spec.homepage      = "https://github.com/alex-zige/docker_houston"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/lib/docker_houston/capistrano.rb

@@ -5,23 +5,31 @@ rescue IndexError => e
   puts "#{e.message} (ensure :application and :repository are set in deploy.rb)"
 end
 
-set :app_with_stage, ->{"#{fetch(:app_name)}"}
+set :app_with_stage, -> { "#{fetch(:app_name)}" }
 
-set :repo_url, ->{ fetch(:repository) } unless fetch(:repo_url)
+set :repo_url, -> { fetch(:repository) } unless fetch(:repo_url)
 
-set :release_dir, ->{Pathname.new("/home/deploy/dockerised_apps/#{fetch(:app_with_stage)}/current")}
+set :release_dir, -> { Pathname.new("/home/deploy/dockerised_apps/#{fetch(:app_with_stage)}/current") }
 
-set :shared_dir, ->{Pathname.new("/home/deploy/dockerised_apps/#{fetch(:app_with_stage)}/shared")}
+set :shared_dir, -> { Pathname.new("/home/deploy/dockerised_apps/#{fetch(:app_with_stage)}/shared") }
 
-set :log_dir, -> {Pathname.new("/home/deploy/dockerised_apps/logs/#{fetch(:app_with_stage)}")}
+set :log_dir, -> { Pathname.new("/home/deploy/dockerised_apps/logs/#{fetch(:app_with_stage)}") }
 
-set :app_dir, ->{fetch(:release_dir).to_s.chomp('/current')}
+set :app_dir, -> { fetch(:release_dir).to_s.chomp('/current') }
 
 def exec_on_remote(command, message="Executing command on remote...", container_id='web')
   on roles :app do |server|
     ssh_cmd = "ssh -A -t #{server.user}@#{server.hostname}"
-      puts "Executing remote command..."
-      exec "#{ssh_cmd} 'cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} run web #{command}'"
+    puts message
+    exec "#{ssh_cmd} 'cd #{fetch(:release_dir)} && docker-compose -p #{fetch(:app_with_stage)} run web #{command}'"
+  end
+end
+
+def exec_on_server(command, message="Executing on docker server...")
+  on roles :app do |server|
+    ssh_cmd = "ssh -A -t #{server.user}@#{server.hostname}"
+    puts message
+    exec "#{ssh_cmd} '#{command}'"
   end
 end
 
@@ -44,11 +52,13 @@ namespace :docker do
       invoke 'docker:build_container'
       invoke 'docker:stop'
       invoke 'docker:start'
+      invoke 'docker:cleanup_containers'
+      invoke 'docker:cleanup_images'
       invoke 'docker:notify'
     end
   end
 
-  desc 'relink docker databse'
+  desc 'relink docker database'
   task :setup_db do
     on roles :app do
       docker_db = "#{fetch(:release_dir)}/config/database.yml.docker"
@@ -98,12 +108,12 @@ namespace :docker do
 
   desc 'Run seed_fu against remote url'
   task :seed_fu do
-    exec_on_remote("rake db:seed_fu", "Seeding database on remote...")
+    exec_on_remote("bundle exec rake db:seed_fu", "Seeding database on remote...")
   end
 
   desc "Tail logs from remote dockerised app"
   task :logs do
-    execute_on_remote "cd #{fetch(:log_dir)} && tail -f staging.log"
+    exec_on_remote "cd #{fetch(:log_dir)} && tail -f staging.log"
   end
 
   desc 'Notify deploy on third party IM'
@@ -112,9 +122,24 @@ namespace :docker do
     exec "rake notifier:notify[\"#{message}\"]"
   end
 
-  desc 'Drop reseed the database'
-  task :reseed do
-    exec_on_remote("rake db:reset && rake db:seed_fu", "Reseeding database on remote...")
+  desc 'Recreate DB tables'
+  task :reset_db do
+    exec_on_remote("bundle exec rake db:setup", "Recreating database on remote...")
+  end
+
+  desc 'Cleanup old docker containers'
+  task :cleanup_containers do
+    exec_on_server("docker rm -v $(docker ps --filter status=exited -q 2>/dev/null) 2>/dev/null", "Removing exited containers...")
+  end
+
+  desc 'Cleanup old docker images'
+  task :cleanup_images do
+    exec_on_server("docker rmi $(docker images --filter dangling=true -q 2>/dev/null) 2>/dev/null", "Removing unused images...")
+  end
+
+  desc 'Precompile assets'
+  task :precompile_assets do
+    exec_on_remote "bundle exec rake assets:precompile", "Precompiling assets..."
   end
 
 end

data/lib/docker_houston/version.rb

@@ -1,3 +1,3 @@
 module DockerHouston
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/generators/docker_houston/install_generator.rb

@@ -46,6 +46,7 @@ module DockerHouston
 
       def copy_executable
         copy_file "../../../bin/docker", "bin/docker"
+        exec "chmod +x bin/docker"
       end
 
       def rails_4?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_houston
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - alex-zige
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ files:
 - lib/generators/templates/staging.rb.erb
 - lib/generators/templates/unicorn.rb
 - lib/tasks/notifier.rake
-homepage: http://www.google.com
+homepage: https://github.com/alex-zige/docker_houston
 licenses:
 - MIT
 metadata: {}