docker-manager 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38dfeac9c28b21b7498033b69f6a54c6d42761a03537bda2f0462a41f7cdbc01
-  data.tar.gz: 5f7f05e3b3ae1932b3dbcf3f5c2c92ab0fdb7cc2675db88b5fe8da505bee706f
+  metadata.gz: 95d9b00c1d871e17191fb41936995ce7df89781cdc63d8cd14c35892ea4c059d
+  data.tar.gz: 9ca1f02859df043e7e26849d8d0426ab12f299e6181eb3ec4b879ab640349838
 SHA512:
-  metadata.gz: 39a2e6bea87a1650f3a2da2299f52f247b20414fad4593a571c4f922001d9a45f5708d6b743dc5273dd8e6e1df9946a2864ceeef69b0a8e0a9327340b5995151
-  data.tar.gz: c8d8a84325e79f2d12d7e6dbce15cff078dae444258e0764b3c3a443cc8761d506e6bb50a95a6a41711c962760defffb1e9423222595ea0ad6e531639b23d6b1
+  metadata.gz: 57b83d2f9146102d678c2af004024515b3e832e7fb08a76b23a0ca8d5aa35716877aba113a435a9c705ecb16f9124b6e8ba9574e53394ba6a92e20c8fde3d2df
+  data.tar.gz: b4aedd652b08b74991e2acd5b8b51746d963674258ee6289ac0d720b557c1fb2131dff3ca754ac3b4abf57dd66c0b427325640d095ec36df58ad59519bc1a265

data/lib/dockermanager/commands/deploy.rb

@@ -16,14 +16,14 @@ module DockerManager
         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("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}")
           # 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} && 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 push")
         end
         on config.env_host do
           execute(:mkdir, "-p", "#{env_remote_directory}/data")
@@ -38,8 +38,8 @@ module DockerManager
             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} && docker-compose pull -q")
-          execute("cd #{env_remote_directory} && docker-compose up -d #{containers_to_restart}")
+          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}")
           execute("docker system prune -f")
         end
       end

data/lib/dockermanager/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Julien Biard