smartcloud 0.0.156 → 0.0.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f4d3dda6b40f12732bfe026083343ca4b14e3df467ab9d50e5c73aff6069cc
-  data.tar.gz: c72c3cdbb604173423dae83b8b4338da8dd95523c1d3ef4e2f10a6da8fa48961
+  metadata.gz: 032f1337c34584f6feeb39a11d56a506767512c20bce09d720e0eae56920acec
+  data.tar.gz: 88c4779b043ec39965c2b0ed5c9ca0cb03b9cf4a0e1dd36983e32e94066f17dc
 SHA512:
-  metadata.gz: 7a8ab72089a33b697c7947fdbdb331293510a30dec7125a99d9126118bc245d10ab6a27d3ba2aea4d45f4ae1ca54a66672490fb525604631b13af101ec2ba996
-  data.tar.gz: 6166b6b3035bddef48c7611f27c6e8d0f5dd7e7065dfd639ea859bb00af919f149041ba4d03c596db86a0787794ac9a6ac56c27a4ed87a8db00d9f65d763494c
+  metadata.gz: 97ccd5c3e2625198d0b5afb756f9e1d61f923d8e99409621ac290ed732d0fc05c5134f70c712e7d37b511c328d970c63e0e78a5e079123741267948b626d1af4
+  data.tar.gz: e5424293c420c75ab9c00f9c1ec6b7eb94fe6b5086cec3be1cc5ad918e80b6d50bc31c0cc2d7c20659665aa69e791f66c6f7d676351d8435d8687bef74a140a9

data/lib/smartcloud/grids/runner.rb

@@ -290,24 +290,10 @@ module Smartcloud
 			end
 
 			def self.stop_app(appname)
-				if Smartcloud::Docker.running?
-					if system("docker inspect -f '{{.State.Running}}' #{appname}", [:out, :err] => File::NULL)
-						logger.debug "Stopping container #{appname} ..."
-						if system("docker stop '#{appname}'", out: File::NULL)
-							logger.debug "Removing container #{appname} ..."
-							if system("docker rm '#{appname}'", out: File::NULL)
-								logger.debug "Stopped & Removed #{appname} ..."
-							end
-						end
-					end
-				end
+				self.stop_container(appname)
 			end
 
 			def self.start_app_rails(appname, container_path, container_path_with_version)
-				# Stopping & Removing not required app containers
-				# TODO: To be removed after dynamic container switching has been implemented as it should be done in the end at the time of cleanup after the new container is running.
-				self.stop_app(appname)
-
 				logger.info "Ruby on Rails application detected."
 
 				# Setup rails env
@@ -340,8 +326,9 @@ module Smartcloud
 				end
 
 				# Creating & Starting container
+				self.stop_app("#{appname}_new")
 				if system("docker create \
-					--name='#{appname}' \
+					--name='#{appname}_new' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{container_path_with_version}:/code' \
@@ -351,21 +338,23 @@ module Smartcloud
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
-					system("docker network connect solr-network #{appname}")
-					system("docker network connect mysql-network #{appname}")
+					system("docker network connect solr-network #{appname}_new")
+					system("docker network connect mysql-network #{appname}_new")
 
-					system("docker start --attach #{appname}")
-					self.clean_up(container_path)
+					system("docker start --attach #{appname}_new")
+
+					# Runs only if #{appname}_new has been started successfully and is reachable.
+					# self.hot_reloading_app(appname)
+					# self.clean_up(container_path)
+
+					# Runs only if #{appname}_new starting has failed.
+					# self.stop_app("#{appname}_new")
 				end
 			end
 
 			def self.clean_up(container_path)
 				logger.info "Cleaning up ..."
 
-				# Stopping & Removing not required app containers
-				appname = File.basename(container_path)
-				self.stop_app(appname)
-
 				# Clean up very old versions
 				Dir.chdir("#{container_path}/releases") do
 					app_versions = Dir.glob('*').select { |f| File.directory? f }.sort
@@ -379,6 +368,26 @@ module Smartcloud
 				end
 			end
 
+			# Hot reloading app containers and removing old app container
+			def self.hot_reloading_app(appname)
+				logger.debug "Hot reloading '#{appname}' containers ..."
+
+				container_id = `docker ps -a -q --filter='name=^#{appname}$'`.chomp
+				unless container_id.empty?
+					if system("docker container rename #{appname} #{appname}_old", [:out, :err] => File::NULL)
+						logger.debug "Container renamed from #{appname} #{appname}_old"
+						if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
+							logger.debug "Container renamed from #{appname}_new #{appname}"
+							self.stop_app("#{appname}_old")
+						end
+					end
+				else
+					if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
+						logger.debug "Container renamed from #{appname}_new #{appname}"
+					end
+				end
+			end
+
 			def self.load_container_env_vars(container_path)
 				unless File.exist? "#{container_path}/env"
 					logger.fatal "Environment could not be loaded ... Failed."
@@ -394,6 +403,20 @@ module Smartcloud
 
 				true
 			end
+
+			def self.stop_container(container_name)
+				if Smartcloud::Docker.running?
+					container_id = `docker ps -a -q --filter='name=^#{container_name}$'`.chomp
+					unless container_id.empty?
+						logger.debug "Stopping & Removing container #{container_name} ..."
+						if system("docker stop #{container_name} && docker rm #{container_name}", out: File::NULL)
+							logger.debug "Stopped & Removed container #{container_name} ..."
+						end
+					else
+						logger.debug "Container '#{container_name}' does not exist to stop."
+					end
+				end
+			end
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.156
+  version: 0.0.157
 platform: ruby
 authors:
 - Timeboard