stackose 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 605c55367fefa8f2d9518040cbfd23b5078da42f
-  data.tar.gz: 6a3ee981a12f891484b3a2165d7d9fdebcbb7305
+  metadata.gz: 8cd9c334e1c92f496ec2540fe51d30c05dd95605
+  data.tar.gz: a95027f7146ce0ff78ffbecd5ba4bc0a11b90b34
 SHA512:
-  metadata.gz: 58f20daf3487f2224d2bdf4cf59ebd32b1258329dc160a3835790466b9f022daaafc0e3193fe933fe57b70a0289bcbeb96cb44157620a846f405bb9f02de8b1a
-  data.tar.gz: b231facc6bd2c95805a28a43375b36794471d6b05a51906d7a53e6cbd8de08f0799f7a248a51e71dc4323fc65d426ed90fd199a3a523d003822731884b413be5
+  metadata.gz: 4ac276b5f6c9d589e8ef102136cd84e083f0f4f8b542b2c649bc8b2530bbeca82181d31f37cb3a5326361b090b4a0fdc5f4e5a76a45ce10a585a5972640e8dc8
+  data.tar.gz: 0a8a8023750c8868d268ab63d9406e2bce6e84a17acbda823bfc7db63cfa602129fdfc73504f8fbd790a80a9844bf5de1b0d811f7775c574be22c2d6c880b8c3

data/README.md

@@ -29,16 +29,14 @@ This gem uses couple variables which can be modified inside your deploy scripts,
     set :stackose_commands - list of commands to be run with docker-compose, defaults to []
     set :stackose_docker_mount_point - mount point inside the application container, defaults to "/usr/share/www/"
     set :stackose_linked_folders     - list of folders to link inside de image 
-    set :stackose_service_to_build   - name of the services with the application to run (default: ['app'])
+    set :stackose_service_to_build   - name of the services with the application to run (default: ['app']) and should use the deploy user and group id
+    set :stackose_skip_image_build   - true|[false] to skip the generation of the image, the compose file should have already the image defined(register) the only think is the building of compose_file with user and group id  
 
 ### Folders to be linked
 If you need to link shared folders to the root of your application path, like capistrano standard linked_folders do,
 you can setup this like:
 
-       set :capose_linked_folders, [  'tmp/pids',
-                                     'tmp/cache',
-                                     'tmp/sockets',
-                                     'public/system',
+       set :capose_linked_folders, [ 'public/system',
                                      'public/pictures',
                                      'public/attachments',
                                      'public/pages',

data/lib/stackose.rb

@@ -97,34 +97,48 @@ namespace :stackose do
       end
     end
 
+
     base_image_name = "#{fetch(:stackose_project)}:#{fetch(:stackose_image_tag)}"
     compose_override = "docker-compose-image-override.yml"
 
-    ## costruiamo l'immagine
+
     on roles(fetch(:stackose_role)) do
       within release_path do
         with fetch(:stackose_env) do
 
           user_id = capture :id, '-u'
           group_id = capture :id, '-g'
-
-          execute :docker, :build, "-t #{base_image_name} ."
-
           services_to_build = fetch(:stackose_service_to_build, ['app'])
-
           services_to_build = [services_to_build].flatten
 
+          if fetch(:stackose_skip_image_build, false)
+            #skippando la costruzione dell'immagine dobbiamo però inserire nei servizi, se non già presente, il vero utente di appartenenza
+            #
+
+            compose_production = {
+              version: '3',
+              services: services_to_build.collect {|s|
+                [s.to_sym, {
+                  user: "#{user_id}:#{group_id}"
+                }]
+              }.to_h
+            }
+          else
+            ## costruiamo l'immagine
+            execute :docker, :build, "-t #{base_image_name} ."
+
+
+            compose_production = {
+              version: '3',
+              services: services_to_build.collect {|s|
+                [s.to_sym, {
+                  image: base_image_name,
+                  user: "#{user_id}:#{group_id}"
+                }]
+              }.to_h
+            }
 
-          compose_production = {
-            version: '3',
-            services: services_to_build.collect {|s|
-              [s.to_sym, {
-                image: base_image_name,
-                user: "#{user_id}:#{group_id}"
-              }]
-            }.to_h
-          }
-
+          end
           contents = StringIO.new(JSON[compose_production.to_json].to_yaml)
           upload! contents, "#{release_path}/#{compose_override}"
 
@@ -139,11 +153,15 @@ namespace :stackose do
     on roles(fetch(:stackose_role)) do
       within release_path do
         with fetch(:stackose_env) do
+
+          execute :"docker-compose", _command('pull')
+
+
           fetch(:stackose_commands).each do |command|
             execute :"docker-compose", _command(command)
           end
 
-          execute :docker, :stack, :deploy, "-c #{fetch(:stackose_file).join(' -c ')} #{fetch(:stackose_project)}"
+          execute :docker, :stack, :deploy, "--prune", "-c #{fetch(:stackose_file).join(' -c ')} #{fetch(:stackose_project)}"
 
         end
       end
@@ -158,12 +176,6 @@ namespace :stackose do
         with fetch(:stackose_env) do
 
 
-          stopped_containers = capture :docker, :ps, "--all -f 'status=exited' -f 'label=com.docker.stack.namespace=#{fetch(:stackose_project)}'", '--format "{{.ID}}"'
-
-          stopped_containers = stopped_containers.split
-
-          execute(:docker, :rm, stopped_containers) if stopped_containers.length > 0
-
           tags_list = capture :docker, :images, fetch(:stackose_project).to_sym, '--format "{{.Tag}}"'
 
           list = tags_list.split
@@ -190,10 +202,14 @@ namespace :stackose do
     ask(:need_redis_service, true)
 
 
+    services_to_build = fetch(:stackose_service_to_build, ['app'])
+
+    services_to_build = [services_to_build].flatten
+
     compose_production = {
       version: '3',
-      services: {
-        fetch(:stackose_service_to_build, 'app').to_sym => {
+      services: services_to_build.collect {|s|
+        [s.to_sym, {
           restart: 'unless-stopped',
           environment: {:RAILS_ENV => fetch(:rails_env).to_s,
                         :RAILS_SERVE_STATIC_FILES => 'true',
@@ -213,8 +229,8 @@ namespace :stackose do
               k.join(':')
             end,
           ports: ["#{fetch(:exposed_port)}:3000"]
-        }
-      }
+        }]
+      }.to_h
     }
 
     if fetch(:need_redis_service)
@@ -231,7 +247,9 @@ namespace :stackose do
         }
       }
 
-      compose_production[:services][fetch(:stackose_service_to_build, 'app').to_sym].merge!({depends_on: ['redis']})
+      services_to_build.each do |srv|
+        compose_production[:services][srv.to_sym].merge!({depends_on: ['redis']})
+      end
 
       File.open("config/redis.conf", 'w') {|file| file.write("maxmemory 50mb\nmaxmemory-policy allkeys-lfu")}
     end
@@ -271,7 +289,7 @@ namespace :stackose do
       database: /usr/share/application_storage/production.sqlite3
     "
 
-    File.open("docker-compose-production.yml", 'w') {|file| file.write(JSON[compose_production.to_json].to_yaml)}
+    File.open("docker-compose-#{fetch(:stage)}.yml", 'w') {|file| file.write(JSON[compose_production.to_json].to_yaml)}
   end
 
 end
@@ -282,6 +300,7 @@ namespace :load do
     set :stackose_copy, -> {[]}
     set :stackose_project, -> {fetch(:application)}
     set :stackose_file, -> {["docker-compose.yml", "docker-compose-#{fetch(:stage)}.yml"]}
+    set :stackose_skip_image_build, -> {false} #Skip full image generation in swarm, the compose file must already include the image name
     set :stackose_env, -> {{}}
     set :stackose_image_tag, -> {fetch(:release_timestamp)}
     set :stackose_service_to_build, -> {['app']}

data/stackose.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'stackose'
-  spec.version       = '0.1.3'
+  spec.version       = '0.2.0'
   spec.authors       = ["Marino Bonetti"]
   spec.email         = ["marinobonetti@gmail.com"]
   spec.description   = %q{Docker-Stack support for Capistrano 3.x}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackose
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano