smartcloud 0.0.205 → 0.0.209

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 508cd9616eb75cd436b64dfa7220ffc8c32e81cf4d98fac45785e9c6e90371a3
-  data.tar.gz: fc978498a15f76d954a2f6d329b7779e309ee4efac3697b1ba636c2ad832ced6
+  metadata.gz: d03b804d5d75667fd48fe4be369d4ab3e2716b1ba3df87dcd77594fbb1f6f100
+  data.tar.gz: 6ed2dcc85c6a23678c6aa277f10d8af47f324ac364f6f8602695ab57d5a2f4e1
 SHA512:
-  metadata.gz: 6da1259fe42a1e3a503b763c8e043109ea645be7e9b7bbbd1e4e7c80f32ff78cba734c0c0d6f5ab706fbfb2cee3f92fc3192f8ce36baa938a55ab156f52be35f
-  data.tar.gz: 3de9e101a192f548fd73fef7d7e02f957d41cedade63cb963b1d0343cb2949ed19ce2191e4b3725a692c8dbc318f4595e4ecc3fa5733696ee9f172c372666e74
+  metadata.gz: 7ab7ce146c7193bf3f9c66c8b85ffebb294bdc2d9269a5030411ca2133166398f1599d3d776a8a31b047041078904f92c0216354132c9d7c092a9d5683c7308c
+  data.tar.gz: c5af39503b1f553fc70be960a51af6ab51729a96a0bc9f48039a9559f880236633de2954277fabd9e82e6c656431fc7166f76bd89c5f6eda899b8b2ced65ace6

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

@@ -1,5 +1,14 @@
 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
+ARG USER_NAME
+ARG USER_UID
+ARG DOCKER_GID
+RUN sed -i "s/999/99/" /etc/group && \
+	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
+	addgroup --gid "$DOCKER_GID" "docker" && adduser "$USER_NAME" "docker"
 
 # FCGI Essentials
 # --- IMPORTANT NOTE: This is custom built fcgiwrap package for alpine linux to account for NO_BUFFERING option.
@@ -16,13 +25,7 @@ RUN apk add --update coreutils && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*
 
-# User
-# --- Fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid
-ARG USER_NAME
-ARG USER_UID
-ARG DOCKER_GID
-RUN sed -i "s/999/99/" /etc/group && \
-	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
+# Privileges
 USER "$USER_NAME"
 WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
 

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

@@ -1,6 +1,11 @@
 FROM ruby:2.6.4-alpine3.10
 LABEL maintainer="Timeboard <hello@timeboard.me>"
 
+# User
+ARG USER_UID
+ARG USER_NAME
+RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
+
 # Ruby on Rails Essentials
 RUN apk add --update build-base && \
 	apk add --update tzdata && \
@@ -13,10 +18,7 @@ RUN apk add --update build-base && \
 	apk add --update mupdf-tools && \
     rm -rf /var/cache/apk/*
 
-# User
-ARG USER_UID
-ARG USER_NAME
-RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
+# Privileges
 USER "$USER_NAME"
 WORKDIR "/app"
 

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.205
+  version: 0.0.209
 platform: ruby
 authors:
 - Timeboard