smartcloud 0.1.0.beta4 → 0.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2193237edead97e61dd871f7ae5ae00af0a9005d40b0beeba2ab8ac3e010e68
-  data.tar.gz: bd48522fff882387e0d66713801e8f263a8140f572cf1fc3fdb83ba7fcf682e1
+  metadata.gz: 1794aa20175c247580a192b55b7a35a3fe06beb53c34d43976db4f7956ed7d3d
+  data.tar.gz: c369d0bd11bfe758349901c32310ed74c73fec943d16d44ab44ebbdf4f8d8c27
 SHA512:
-  metadata.gz: d545a880e5e673c37d78c37a6ebf31234bf9f1d68f002a3535cd623e8b49ff84e6b6e7b028367a6657e963fe9606cbe388d0d096389d5c5c76858a2203f286ae
-  data.tar.gz: 762d37be0e30f250c140d7fd21d8a0f01a40810d06baa136fcd4f775bb607a17a37efdff433a6fc7a5dec4dfe925bfdf4305a86b95abee3951cd42a8c7b7cf63
+  metadata.gz: b97865250155b0797e319b697b47ee37d1e961118f112c61aa540dc4f459f7dde2d75b3042cafcb0b29a255a475dd28a878eabd2f1817cda502e65b7ca18c993
+  data.tar.gz: c7d05795219cde5f68ad0e33766d607a1ce90226a8d08715033555789a06ae3fe5d1c63764d90b8d4b83f5a6c7b207e4fd515e14d2e2a992d181e11bc2abf4a8

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("bundle", "exec", "puma", "-C", "config/puma.rb", out: File::NULL)
-					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", 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
-				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.beta4
+  version: 0.1.0.rc4
 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