smartcloud 0.0.206 → 0.1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c62081c62d76faea905c0502e283247123f433d020ae50d47f50dfb1416c293
-  data.tar.gz: 91bc5b352f3f2c87c23aa7e6d65fdde68acb7994f7fad982374456556bf09689
+  metadata.gz: 62498c1f68025b362a0887fe07ff16f8f43eeae99955e9ff60b2098c10d7b0da
+  data.tar.gz: a85f8a5ac34a078ab695a6ca91db41c5aa06692b2ab45b951cd7e81f31a741a3
 SHA512:
-  metadata.gz: 6ec10636c50c3aa415047521e5e1e4712a21c4497f565d65f55cc3a9a34cb14990cf29067c0994dd3d51e67b32a01b48f4c60c96eaa2fa2f6c34536817c24282
-  data.tar.gz: a140bbac432112aaf0e33020612238ff2f11a24242ecf22a17bb28930934af23eea383d15b5c88e9cce1d08d1fa3de5c4cf6d5a5dded857e7f1c66b63bcfe183
+  metadata.gz: 2bc01a890b6cefe16b7aab7f6fce7901a73de54a22ff2eceb05999be9cfd31218a9e4e02670470f09992e513c6036ccb365b9563dfe22761e76fa7c1d03a5fc3
+  data.tar.gz: 502d8097742296cbc37ad72114904123d7d8f4bbcbf8d66fc8d5bc010e016aea0905bd6abb1d41c99f5e037f01c58cbd98c0db25088df8984e6e9c1873d4a7fc

data/lib/smartcloud/grids/buildpacker.rb

@@ -71,10 +71,10 @@ module Smartcloud
 				# 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")
+				if system("bundle", "exec", "puma", "-C", "config/puma.rb")
 					return true
-				# end
-				# return false
+				end
+				return false
 			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
@@ -30,6 +30,6 @@ USER "$USER_NAME"
 WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
 
 # Gems
-RUN gem install smartcloud
+RUN gem install smartcloud --pre
 
 CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]

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

@@ -23,8 +23,7 @@ USER "$USER_NAME"
 WORKDIR "/app"
 
 # Gems
-RUN gem install smartcloud && \
-	gem install bundler && \
-	gem install god
+RUN gem install smartcloud --pre && \
+	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
@@ -307,26 +307,16 @@ 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' \
@@ -336,17 +326,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 +356,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 +372,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.beta5
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh