smartcloud 0.1.0.beta3 → 0.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2596fb1df737acb6fc53ba8b574a999dc73a6fef271191ca47cfe000b6a08ae4
-  data.tar.gz: 2bbb7ccff08c3e1f5892a3ff13aae997731641f4271fa7cf2524fac0df202b9e
+  metadata.gz: 1bc0f44f2fa9ea9d6145f30db4d8c96a143e839801e8f821df13fbaa533cb2b3
+  data.tar.gz: 51bd95740b92513e81ab404007a7b5544c98285b956ad08f445614e4ab938b12
 SHA512:
-  metadata.gz: c5a59c31b82decd67e1f9b6ca5dbb4d39c1e2d9b779954c7d3bc94f7e04ad6641ffd1102c48504d9cf1c274371b57aa40d086d868e4153d53ec2700529d882c4
-  data.tar.gz: f635111f1b4193d6054fca7759f2003087d991d6897d25797b13fc7b4e7ac733df9fefdb3553bcf72a11bafeace4ca0b7ba51f1d807780ca891a697014612d95
+  metadata.gz: cce759ba90e0745bbff91afdd1a470564ca272b59bbee308dcb0f7cd9a36dc0094d6e565ba9bda11ca96fb4df7721bccfce42d60811da2c79566933025b8afe5
+  data.tar.gz: a3d9b46b5566bc8bbad7db19e3e4c3e9bea6ac005e2a17f734349ef6a70870a85c324cd43b617c0bd4b32f008c290e605abc6642aac42c44183f5db6bf7ad913

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"
-
-				if system("god -c Godfile -D")
-					return true
+			# 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")
+				Process.detach(pid)
+
+				# Sleep
+				sleep 5
+
+				# Check PID running
+				status = nil
+				begin
+					Process.kill(0, pid)
+					system("#{pid}" > "tmp/smartcloud/packed")
+					status = true
+				rescue Errno::ESRCH # No such process
+					logger.info "Web Server could not start"
+					status = false
 				end
-				return false
+
+				# Return status
+				return status
 			end
 
 			def set_logger_formatter_arrow

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

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

data/lib/smartcloud/grids/runner.rb

@@ -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,20 +308,6 @@ 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
 				container_id = `docker ps -a -q --filter='name=^#{appname}_1$' --filter='status=running'`.chomp
 				new_container = container_id.empty? ? "#{appname}_1" : "#{appname}_2"
@@ -330,13 +317,14 @@ module Smartcloud
 				if system("docker create \
 					--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)
 
@@ -344,10 +332,15 @@ module Smartcloud
 					system("docker network connect mysql-network #{new_container}")
 
 					if system("docker start --attach #{new_container}")
-						self.stop_app(old_container)
-						self.clean_up(container_path)
-						logger.info "Launched Application ... Success."
-						exit 10
+						logger.debug "Starting Web Server ..."
+						if system("docker start #{new_container}")
+							sleep 5
+							puts "Web Server started successfully."
+							self.stop_app(old_container)
+							self.clean_up(container_path)
+							logger.info "Launched Application ... Success."
+							exit 10
+						end
 					else
 						self.stop_app("#{new_container}")
 					end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta3
+  version: 0.1.0.rc3
 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