smartcloud 0.0.206 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c62081c62d76faea905c0502e283247123f433d020ae50d47f50dfb1416c293
-  data.tar.gz: 91bc5b352f3f2c87c23aa7e6d65fdde68acb7994f7fad982374456556bf09689
+  metadata.gz: aa2a3f8c929555cb37a5587ddbcf00af3e266afecc59442cdfe7c6c445d5a81b
+  data.tar.gz: be14f3480b057ccc010c596665313dbbd5d7e6a5aec6098b7a8225b142f5cbea
 SHA512:
-  metadata.gz: 6ec10636c50c3aa415047521e5e1e4712a21c4497f565d65f55cc3a9a34cb14990cf29067c0994dd3d51e67b32a01b48f4c60c96eaa2fa2f6c34536817c24282
-  data.tar.gz: a140bbac432112aaf0e33020612238ff2f11a24242ecf22a17bb28930934af23eea383d15b5c88e9cce1d08d1fa3de5c4cf6d5a5dded857e7f1c66b63bcfe183
+  metadata.gz: 42c54ce67d371361a9c6ffced3e81a864bc9e48feec61248fa5ed35099d62cc905beaf6a100ec6a450102cc5c129d7f4f7883f323cc5c459f2d129cbb7c9f44a
+  data.tar.gz: cf1d7349d53f1d31abedbc9d403319ed1b2c0f277e8c9fe6ba877636f5a781765c562765a33838490f2e1cf90b6d66d625068d4644a2e485df4f09085e5d2207

data/lib/smartcloud/grids/buildpacker.rb

@@ -17,11 +17,20 @@ module Smartcloud
 			end
 
 			def pack_rails
-				return unless bundle_install?
-				return unless precompile_assets?
-				return unless start_web_server?
+				if File.exist? "tmp/smartcloud/packed"
+					begin
+						pid = File.read('tmp/smartcloud/packed').to_i
+						Process.kill('QUIT', pid)
+					rescue Errno::ESRCH # No such process
+					end
+					exec "bundle", "exec", "puma", "--config", "config/puma.rb"
+				else
+					return unless bundle_install?
+					return unless precompile_assets?
+					return unless test_web_server?
 
-				exit 0
+					exit 0
+				end
 			end
 
 			# Perform bundle install
@@ -64,17 +73,34 @@ module Smartcloud
 				end
 			end
 
-			# Perform starting of web server
-			def start_web_server?
-				logger.debug "Starting Web Server ..."
-
-				# Remove server.pid if it exists
-				FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
+			# Perform testing of web server
+			def test_web_server?
+				logger.info "Setting up Web Server ..."
+
+				# tmp folder
+				FileUtils.mkdir_p("tmp/smartcloud")
+				FileUtils.rm_f("tmp/smartcloud/packed")
+
+				# Spawn Process
+				pid = Process.spawn("bundle", "exec", "puma", "--config", "config/puma.rb", out: File::NULL)
+				Process.detach(pid)
+
+				# Sleep
+				sleep 5
+
+				# Check PID running
+				status = nil
+				begin
+					Process.kill(0, pid)
+					system("echo '#{pid}' > tmp/smartcloud/packed")
+					status = true
+				rescue Errno::ESRCH # No such process
+					logger.info "Web Server could not start"
+					status = false
+				end
 
-				# if system("god -c Godfile -D")
-					return true
-				# end
-				# return false
+				# Return status
+				return status
 			end
 
 			def set_logger_formatter_arrow

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/grid-runner/buildpacks/rails/Dockerfile

@@ -24,7 +24,6 @@ WORKDIR "/app"
 
 # Gems
 RUN gem install smartcloud && \
-	gem install bundler && \
-	gem install god
+	gem install bundler
 
 CMD ["buildpacker", "start"]

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
@@ -293,6 +293,7 @@ module Smartcloud
 				# Setup rails env
 				env_path = "#{container_path}/env"
 				system("grep -q '^## Rails' #{env_path} || echo '## Rails' >> #{env_path}")
+				system("grep -q '^MALLOC_ARENA_MAX=' #{env_path} || echo '# MALLOC_ARENA_MAX=2' >> #{env_path}")
 				system("grep -q '^RAILS_ENV=' #{env_path} || echo 'RAILS_ENV=production' >> #{env_path}")
 				system("grep -q '^RACK_ENV=' #{env_path} || echo 'RACK_ENV=production' >> #{env_path}")
 				system("grep -q '^RAILS_LOG_TO_STDOUT=' #{env_path} || echo 'RAILS_LOG_TO_STDOUT=enabled' >> #{env_path}")
@@ -307,46 +308,41 @@ module Smartcloud
 				FileUtils.mkdir_p("#{container_path}/app/public")
 				FileUtils.mkdir_p("#{container_path}/app/node_modules")
 
-				# Setup Godfile
-				unless File.exist? "#{container_path_with_version}/Godfile"
-					logger.warn "Godfile not detected. Adding a default Godfile. It is recommended to add your own Godfile."
-					page = <<~"HEREDOC"
-						God.watch do |w|
-							w.name = "web"
-							w.start = "bundle exec puma -C config/puma.rb"
-							w.behavior(:clean_pid_file)
-							w.keepalive
-						end
-					HEREDOC
-					system("echo '#{page}' > #{container_path_with_version}/Godfile")
-				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 = container_id.empty? ? "#{appname}_1" : "#{appname}_2"
+				old_container = container_id.empty? ? "#{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' \
+					--expose='3000' \
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 					--volume='#{container_path_with_version}:/app' \
 					--volume='#{container_path}/app/vendor/bundle:/app/vendor/bundle' \
 					--volume='#{container_path}/app/public:/app/public' \
 					--volume='#{container_path}/app/node_modules:/app/node_modules' \
 					--restart='always' \
+					--init \
 					--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)
+					if system("docker start --attach #{new_container}")
+						logger.debug "Starting Web Server ..."
+						if system("docker start #{new_container}", out: File::NULL)
+							sleep 5
+							logger.info "Web Server started successfully."
+							self.stop_app(old_container)
 							self.clean_up(container_path)
 							logger.info "Launched Application ... Success."
-							exit 0
+							exit 10
 						end
 					else
-						self.stop_app("#{appname}_new")
+						self.stop_app("#{new_container}")
 					end
 				end
 			end
@@ -367,29 +363,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 +379,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.206
+  version: 0.1.0
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh