docker-manager 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d9b00c1d871e17191fb41936995ce7df89781cdc63d8cd14c35892ea4c059d
-  data.tar.gz: 9ca1f02859df043e7e26849d8d0426ab12f299e6181eb3ec4b879ab640349838
+  metadata.gz: 3d5ca6b762462dfb595bc2e9c0e206ece3d762463c1baefff37f5a4d2fb9fa4b
+  data.tar.gz: 6d70f4a16968838cdbdd33c1d7eb0c9f08c4d9bbc7c533e24fd609989720444e
 SHA512:
-  metadata.gz: 57b83d2f9146102d678c2af004024515b3e832e7fb08a76b23a0ca8d5aa35716877aba113a435a9c705ecb16f9124b6e8ba9574e53394ba6a92e20c8fde3d2df
-  data.tar.gz: b4aedd652b08b74991e2acd5b8b51746d963674258ee6289ac0d720b557c1fb2131dff3ca754ac3b4abf57dd66c0b427325640d095ec36df58ad59519bc1a265
+  metadata.gz: 410f230d9d9b194ee76af3f20650070b1da8f50643a13fcc992012cc87555efe33403c49d281f088cd76e84dfc669d29384ab93727d052f11299da87f61551d1
+  data.tar.gz: 176998aecd23894315fb4079f3d752a33f99596414bbf8250cafbb8b1795447712222c05c86b2e89fb48b5a6b816caae7a1f1e5909124b8aecab5a05b26d20ff

data/lib/dockermanager/commands/db_pull.rb

@@ -2,24 +2,25 @@ module DockerManager
   module Commands
     class DbPull < Base
       def run
-        remote_dump_file = "#{config.env_remote_directory}/dump.sql.gz"
-        local_dump_file = "#{config.project_root_path}/tmp/#{File.basename(remote_dump_file)}"
-        remote_postgres_db_container = config.env_remote_postgres_db_container
-        local_postgres_db_container = config.env_local_postgres_db_container
-        project_root_path = config.project_root_path
-        on config.env_host do
-          execute("docker exec -t #{remote_postgres_db_container} bash -c 'PGPASSWORD=$POSTGRES_PASSWORD pg_dump -h $POSTGRES_HOST -U $POSTGRES_USER $POSTGRES_DB --no-acl --no-owner' | gzip - -c --stdout > #{remote_dump_file}")
+        # to avoid scope issue
+        conf = config
+        remote_dump_file = "#{conf.env_remote_directory}/dump.sql.gz"
+        local_dump_file = "#{conf.project_root_path}/tmp/#{File.basename(remote_dump_file)}"
+
+        on conf.env_host do
+          execute("docker exec -t #{conf.env_remote_postgres_db_container} bash -c 'PGPASSWORD=$POSTGRES_PASSWORD pg_dump -h $POSTGRES_HOST -U $POSTGRES_USER $POSTGRES_DB --no-acl --no-owner' | gzip - -c --stdout > #{remote_dump_file}")
           download!(remote_dump_file, local_dump_file)
         end
+
         run_locally do
-          execute(:rm, "-f", "#{project_root_path}/tmp/dump.sql")
+          execute(:rm, "-f", "#{conf.project_root_path}/tmp/dump.sql")
           execute("gunzip #{local_dump_file}")
           # condition pg_stat_activity.datname = \'#{local_database}\' removed
-          execute("docker exec -i #{local_postgres_db_container} bash -c 'psql -U $POSTGRES_USER -d $POSTGRES_DB -c \"SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid()\"'")
-          execute("docker exec -i #{local_postgres_db_container} bash -c 'dropdb -U $POSTGRES_USER $POSTGRES_DB'")
-          execute("docker exec -i #{local_postgres_db_container} bash -c 'createdb -U $POSTGRES_USER $POSTGRES_DB'")
-          execute("docker exec -i #{local_postgres_db_container} bash -c 'psql -U $POSTGRES_USER -d $POSTGRES_DB' < #{project_root_path}/tmp/dump.sql")
-          execute(:rm, "#{project_root_path}/tmp/dump.sql")
+          execute("docker exec -i #{conf.env_local_postgres_db_container} bash -c 'psql -U $POSTGRES_USER -d $POSTGRES_DB -c \"SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid()\"'")
+          execute("docker exec -i #{conf.env_local_postgres_db_container} bash -c 'dropdb -U $POSTGRES_USER $POSTGRES_DB'")
+          execute("docker exec -i #{conf.env_local_postgres_db_container} bash -c 'createdb -U $POSTGRES_USER $POSTGRES_DB'")
+          execute("docker exec -i #{conf.env_local_postgres_db_container} bash -c 'psql -U $POSTGRES_USER -d $POSTGRES_DB' < #{conf.project_root_path}/tmp/dump.sql")
+          execute(:rm, "#{conf.project_root_path}/tmp/dump.sql")
         end
       end
     end

data/lib/dockermanager/commands/deploy.rb

@@ -3,43 +3,30 @@ module DockerManager
     class Deploy < Base
       def run
         # to avoid scope issue
-        git_repository = config.git_repository
-        env = config.env
-        local_git_tmp_path = config.local_git_tmp_path
-        project_root_path = config.project_root_path
-        local_docker_path = config.local_docker_path
-        local_deploy_path = config.local_deploy_path
-        registry_login = config.registry_login
-        registry_password = config.registry_password
-        registry_server = config.registry_server
-        env_git_branch = config.env_git_branch
-        env_remote_directory = config.env_remote_directory
-        containers_to_restart = (config.containers_to_restart || []).join(' ')
+        conf = config
+
         run_locally do
-          execute("rm -fr #{local_git_tmp_path}")
-          execute("git clone -b #{env_git_branch} #{git_repository} #{local_git_tmp_path}")
-          execute("cp #{local_deploy_path}/#{env}/.env #{local_git_tmp_path}/.env")
-          execute("cp #{local_docker_path}/docker-compose.server.yml #{local_git_tmp_path}")
+          execute("rm -fr #{conf.local_git_tmp_path}")
+          execute("git clone -b #{conf.env_git_branch} #{conf.git_repository} #{conf.local_git_tmp_path}")
+          execute("touch #{conf.local_git_tmp_path}/.env")
+          execute("cp #{conf.local_docker_path}/docker-compose.server.yml #{conf.local_git_tmp_path}")
           # within doesn't work
-          execute("cd #{local_git_tmp_path} && TAG=#{env_git_branch} docker-compose -f docker-compose.server.yml build")
-          execute("cd #{local_git_tmp_path} && docker login -u #{registry_login} -p '#{registry_password}' #{registry_server}")
-          execute("cd #{local_git_tmp_path} && TAG=#{env_git_branch} docker-compose -f docker-compose.server.yml push")
+          change_dir = "cd #{conf.local_git_tmp_path}"
+          compose_cmd = "#{change_dir} && TAG=#{conf.env_git_branch} docker-compose -f docker-compose.server.yml"
+          execute("#{compose_cmd} build")
+          execute("#{change_dir} && docker login -u #{conf.registry_login} -p '#{conf.registry_password}' #{conf.registry_server}")
+          execute("#{compose_cmd} push")
         end
-        on config.env_host do
-          execute(:mkdir, "-p", "#{env_remote_directory}/data")
-          upload!("#{local_deploy_path}/#{env}/.env", "#{env_remote_directory}/.env")
-          upload!("#{local_docker_path}/docker-compose.server.yml", "#{env_remote_directory}/docker-compose.yml")
-          local_ssl_path = "#{local_deploy_path}/#{env}/ssl"
-          if File.readable?(local_ssl_path)
-            execute(:rm, "-fr", "#{env_remote_directory}/ssl")
-            upload!("#{local_deploy_path}/#{env}/ssl", "#{env_remote_directory}/ssl", recursive: true)
-          else
-            local_renew_cert_script = "docker/deploy/#{env}/renew_cert.sh"
-            upload!(local_renew_cert_script, "#{env_remote_directory}/renew_cert.sh") if File.readable?(local_renew_cert_script)
-          end
-          execute("docker login -u #{registry_login} -p '#{registry_password}' #{registry_server}")
-          execute("cd #{env_remote_directory} && TAG=#{env_git_branch} docker-compose pull -q")
-          execute("cd #{env_remote_directory} && TAG=#{env_git_branch} docker-compose up -d #{containers_to_restart}")
+
+        on conf.env_host do
+          execute(:mkdir, "-p", "#{conf.env_remote_directory}/data")
+          upload!("#{conf.local_docker_path}/docker-compose.server.yml", "#{conf.env_remote_directory}/docker-compose.yml")
+          execute("docker login -u #{conf.registry_login} -p '#{conf.registry_password}' #{conf.registry_server}")
+          change_dir = "cd #{conf.env_remote_directory}"
+          compose_cmd = "#{change_dir} && TAG=#{conf.env_git_branch} docker-compose"
+          containers_to_restart = (conf.containers_to_restart || []).join(' ')
+          execute("#{compose_cmd} pull -q")
+          execute("#{compose_cmd} up -d #{containers_to_restart}")
           execute("docker system prune -f")
         end
       end

data/lib/dockermanager/commands/upload_config.rb

@@ -0,0 +1,26 @@
+module DockerManager
+  module Commands
+    class UploadConfig < Base
+      def run
+        # to avoid scope issue
+        conf = config
+
+        on conf.env_host do
+          execute(:mkdir, "-p", conf.env_remote_directory)
+          env_file = "#{conf.local_deploy_path}/#{conf.env}/.env"
+          upload!(env_file, "#{conf.env_remote_directory}/.env") if File.readable?(env_file)
+          compose_file = "#{conf.local_docker_path}/docker-compose.server.yml"
+          upload!(compose_file, "#{conf.env_remote_directory}/docker-compose.yml") if File.readable?(compose_file)
+          local_ssl_path = "#{conf.local_deploy_path}/#{conf.env}/ssl"
+          if File.readable?(local_ssl_path)
+            execute(:rm, "-fr", "#{conf.env_remote_directory}/ssl")
+            upload!("#{conf.local_deploy_path}/#{conf.env}/ssl", "#{conf.env_remote_directory}/ssl", recursive: true)
+          else
+            local_renew_cert_script = "docker/deploy/#{conf.env}/renew_cert.sh"
+            upload!(local_renew_cert_script, "#{conf.env_remote_directory}/renew_cert.sh") if File.readable?(local_renew_cert_script)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dockermanager/version.rb

@@ -1,3 +1,3 @@
 module DockerManager
-  VERSION = '0.0.12'
+  VERSION = '0.0.14'
 end

data/lib/dockermanager.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/dockermanager/config'
 require File.dirname(__FILE__) + '/dockermanager/commands/base'
 require File.dirname(__FILE__) + '/dockermanager/commands/deploy'
 require File.dirname(__FILE__) + '/dockermanager/commands/db_pull'
+require File.dirname(__FILE__) + '/dockermanager/commands/upload_config'
 
 module DockerManager
   extend self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Julien Biard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -42,6 +42,7 @@ files:
 - lib/dockermanager/commands/base.rb
 - lib/dockermanager/commands/db_pull.rb
 - lib/dockermanager/commands/deploy.rb
+- lib/dockermanager/commands/upload_config.rb
 - lib/dockermanager/config.rb
 - lib/dockermanager/version.rb
 homepage: ''