smartcloud 0.0.206 → 0.0.207

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c62081c62d76faea905c0502e283247123f433d020ae50d47f50dfb1416c293
-  data.tar.gz: 91bc5b352f3f2c87c23aa7e6d65fdde68acb7994f7fad982374456556bf09689
+  metadata.gz: 788fa21a06c014435ff7d5d4d169f752b961bfb3234ceb876c80d1bb7700f9d2
+  data.tar.gz: 7450248485760c25c60b81d1ba6b2bf9a50ceee46f31f1b27a32138f33db00ef
 SHA512:
-  metadata.gz: 6ec10636c50c3aa415047521e5e1e4712a21c4497f565d65f55cc3a9a34cb14990cf29067c0994dd3d51e67b32a01b48f4c60c96eaa2fa2f6c34536817c24282
-  data.tar.gz: a140bbac432112aaf0e33020612238ff2f11a24242ecf22a17bb28930934af23eea383d15b5c88e9cce1d08d1fa3de5c4cf6d5a5dded857e7f1c66b63bcfe183
+  metadata.gz: cf091b8aa54686f175192781a50dd0c1376a64198f80d5bafddc376005229f1b4f1ee87df7a2d357a455aead002666fef92d64935b729337172fab43247c0503
+  data.tar.gz: f1be22ea9bc9d938b90fdaf1c3bbb29933c00f40e5044768061ca5fb5df83c5b0ad76db4cf9a391803b27a4cc56f9ebbe463d163697bb271b29b70e11d313602

data/lib/smartcloud/grids/grid-runner/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.6.4-alpine3.10
-MAINTAINER Timeboard <hello@timeboard.me>
+LABEL maintainer="Timeboard <hello@timeboard.me>"
 
 # User
 # --- Fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid

data/lib/smartcloud/grids/runner.rb

@@ -113,7 +113,7 @@ module Smartcloud
 						--build-arg USER_NAME=`id -un` \
 						--build-arg USER_UID=`id -u` \
 						--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
-						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
+						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner", out: File::NULL)
 						puts "done"
 					end
 				end
@@ -123,7 +123,7 @@ module Smartcloud
 					if system("docker image build -t smartcloud/buildpacks/rails \
 						--build-arg USER_UID=`id -u` \
 						--build-arg USER_NAME=`id -un` \
-						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/rails")
+						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/rails", out: File::NULL)
 						puts "done"
 					end
 				end
@@ -322,9 +322,12 @@ module Smartcloud
 				end
 
 				# Creating & Starting container
-				self.stop_app("#{appname}_new")
+				container_id = `docker ps -a -q --filter='name=^#{appname}_1$' --filter='status=running'`.chomp
+				new_container, old_container = container_id.empty? ? "#{appname}_1", "#{appname}_2" : "#{appname}_2", "#{appname}_1"
+				
+				self.stop_app("#{new_container}")
 				if system("docker create \
-					--name='#{appname}_new' \
+					--name='#{new_container}' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
@@ -336,17 +339,16 @@ module Smartcloud
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
 
-					system("docker network connect solr-network #{appname}_new")
-					system("docker network connect mysql-network #{appname}_new")
+					system("docker network connect solr-network #{new_container}")
+					system("docker network connect mysql-network #{new_container}")
 
-					if system("docker start --attach #{appname}_new")
-						if self.hot_reloaded_app?(appname)
-							self.clean_up(container_path)
-							logger.info "Launched Application ... Success."
-							exit 0
-						end
+					if system("docker start --attach #{new_container}")
+						self.stop_app(old_container)
+						self.clean_up(container_path)
+						logger.info "Launched Application ... Success."
+						exit 10
 					else
-						self.stop_app("#{appname}_new")
+						self.stop_app("#{new_container}")
 					end
 				end
 			end
@@ -367,29 +369,6 @@ module Smartcloud
 				end
 			end
 
-			# Hot reloading app containers and removing old app container
-			def self.hot_reloaded_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")
-							return true
-						end
-					end
-				else
-					if system("docker container rename #{appname}_new #{appname}", [:out, :err] => File::NULL)
-						logger.debug "Container renamed from #{appname}_new #{appname}"
-						return true
-					end
-				end
-				return false
-			end
-
 			def self.load_container_env_vars(container_path)
 				unless File.exist? "#{container_path}/env"
 					logger.fatal "Environment could not be loaded ... Failed."
@@ -406,6 +385,7 @@ module Smartcloud
 				true
 			end
 
+			# Stop Container
 			def self.stop_container(container_name)
 				if Smartcloud::Docker.running?
 					container_id = `docker ps -a -q --filter='name=^#{container_name}$'`.chomp

data/lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/pre-receive

@@ -10,7 +10,7 @@ while read oldrev newrev refname; do
 	    REPOSITORY_BASENAME=$(basename $(readlink -nf "$PWD"/..))
 	fi
 	script --quiet --return --flush --command "runner prereceive $REPOSITORY_BASENAME $REMOTE_USER $oldrev $newrev $refname" /home/$(whoami)/.smartcloud/grids/grid-runner/apps/containers/$REPOSITORY_BASENAME/typescript
-	if [ "$?" -eq 0 ]; then
+	if [ "$?" -eq 10 ]; then
 		exit 0
 	fi
 	exit 1

metadata

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