docker-manager 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581446b2a09ddf1967361de58cb24613bdc001c73d227f363859dc5ddcbab952
-  data.tar.gz: 0b48dfbfb858e415c0804518fc7fc9c6e896e22560a47d546cd0a41773234c92
+  metadata.gz: b7e2061cbcba047b1b603894173393b04ab85415daa20c0f77a3fba92502e891
+  data.tar.gz: 3e2f7c11d8951931c6cf11161a285284086a24915841ab4ade89d3872eb2ad75
 SHA512:
-  metadata.gz: 8d5edbe422e5aeb2636ce3e5a9f3e16ec11c172072b82a1d3f43165c34fde456a634f084fcc33be153964fdc81d0b5f1e4ef9fe9663a81ac9afbb9ae22c76e16
-  data.tar.gz: fac05bf6a892e20316cc7f9c402b52273808f5983b4d32eb55e89fa30ca581eb413b8b691d036358c0ca87582b461a14a3c2490d04b005e83f77ea38e38a87d1
+  metadata.gz: a8ac19f076722b81497937c48497717a16ac56a99f5c5b4f2dc4587a9962438e54d94c194e2f5d55db7b5e75664f2717f82b3a6c44e7fa63125654c70c5a541f
+  data.tar.gz: 2c3e3818091f94a8605ac6e49caa37ad7ebea9955e6542b77f98644de0445529cc1a63650d3f309faef52bf693dfaada52ccb131a8843c798b8a5df99e102718

data/lib/dockermanager/commands/deploy.rb

@@ -4,21 +4,25 @@ module DockerManager
       def run
         # to avoid scope issue
         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(' ')
         run_locally do
+          execute("rm -fr #{local_git_tmp_path} && mkdir #{local_git_tmp_path}")
+          execute("git clone -b #{env_git_branch} #{git_repository} #{local_deploy_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}")
           # within doesn't work
-          execute("cd #{project_root_path} && ln -sf #{local_deploy_path}/#{env}/.env .env")
-          execute("cd #{project_root_path} && ln -sf #{local_docker_path}/docker-compose.server.yml docker-compose.server.yml")
-          execute("cd #{project_root_path} && docker-compose -f docker-compose.server.yml build")
-          execute("cd #{project_root_path} && docker login -u #{registry_login} -p '#{registry_password}' #{registry_server}")
-          execute("cd #{project_root_path} && docker-compose -f docker-compose.server.yml push")
+          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} && docker-compose -f docker-compose.server.yml push")
         end
         on config.env_host do
           execute(:mkdir, "-p", "#{env_remote_directory}/data")

data/lib/dockermanager/config.rb

@@ -2,13 +2,13 @@ module DockerManager
   class Config
     KEYS = {
       env: {
-        required: %i[host docker_user remote_directory remote_postgres_db_container local_postgres_db_container]
+        required: %i[host docker_user remote_directory remote_postgres_db_container local_postgres_db_container git_branch]
       },
       registry: {
         required: %i[login password],
         optional: %i[server]
       },
-      required: [],
+      required: %i[git_repository],
       optional: %i[containers_to_restart]
     }
 
@@ -52,6 +52,10 @@ module DockerManager
       @local_deploy_path
     end
 
+    def local_git_tmp_path
+      @local_git_tmp_path ||= "#{local_deploy_path}/tmp"
+    end
+
     KEYS.keys.each do |parent_key|
       case parent_key
       when :required, :optional

data/lib/dockermanager/version.rb

@@ -1,3 +1,3 @@
 module DockerManager
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Julien Biard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit