smartcloud 0.0.58 → 0.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d924ab065d2e704d4a6ee9b7553edccf9bfe4c347021b7350700763dd6dc87
-  data.tar.gz: 2361fa31d62cf1ab31c9ac29cee8d8bf18787e228ec4945198978d88d42c2858
+  metadata.gz: 60ffcf8723cff346b850754c1699dabddfb77cb2c5da32ade9546d81089d66d1
+  data.tar.gz: defff013409825d5e260e206c619be0d91bc545ecc9c092d1545ace95ddbf0a6
 SHA512:
-  metadata.gz: fed4824fea5a577012f162baaa622ef44f0ddab629e7c9adb75ad020fb991e115d521837221850719ced58deef619d6f385be2fc4a3aad7bead857ace1883533
-  data.tar.gz: b44bfd6c25c636b7e35800fe335c7f58ce2e4a90908db59ad8be87a347327cac1732002185b7a7d5698b9c540de0184fec08e2253d1b994f3f4aa0e3c1db05ec
+  metadata.gz: 1a7db48110a4de14f855e7968f56b3bd090902ebbbe2f944e987e61a7fc4c8eb46f0843a03b448e6a4fc6518e01ef3779c3655065699ad43d659e5f0f845b037
+  data.tar.gz: 668058410b8617e36f62b8a9c121f4912161d16be01cdb4d0e93cd78172545da2bf256805de54aed5ac0e819af1881656efdb11a6210bcb01972e428f2460a0b

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

@@ -1,4 +1,4 @@
-FROM ruby:2.6.3-alpine
+FROM docker:latest
 MAINTAINER Timeboard <hello@timeboard.me>
 
 # Setting up group and user
@@ -19,6 +19,7 @@ RUN sed -i "s/999/99/" /etc/group && \
 # - spawn-fcgi, to launch fcgiwrap and to create the unix socket
 RUN apk add --update git && \
 	apk add --update git-daemon && \
+	apk add --update ruby && \
     apk add --update fcgiwrap && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*

data/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb

@@ -0,0 +1,23 @@
+class Buildpacker
+	def initialize
+		puts "---------------------------------------------------------------"
+
+		if File.exist? "bin/rails"			
+			# Remove server.pid if it exists
+			FileUtils.rm("tmp/pids/server.pid") if File.exist? "tmp/pids/server.pid"
+
+			puts "-----> Performing bundle install ... "
+			if system("bundle install")
+				puts "-----> Compiling Assets ... "
+				if system("bundle exec rails assets:precompile")
+					system("foreman start -f Procfile")
+				end
+			end
+		end
+
+		puts "failed."
+		exit 1
+	end
+end
+
+Buildpacker.new

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

@@ -7,24 +7,8 @@ RUN apk add --update tzdata && \
     rm -rf /var/cache/apk/*
 
 # Install bundler and foreman gems
-RUN gem install bundler; gem install foreman;
-
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-\n\
-cd /code\n\
-test -f ./tmp/pids/server.pid && rf ./tmp/pids/server.pid; true\n\
-\n\
-echo "---------------------------------------------------------------"\n\
-echo "-----> Performing bundle install"\n\
-bundle install\n\
-echo "-----> Compiling Assets"\n\
-bundle exec rails assets:precompile\n\
-\n\
-exec "$@"' >> /entrypoint; chmod +x /entrypoint;
-
-# Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+RUN gem install bundler && \
+	gem install foreman
 
 # Command to execute at container start
-CMD foreman start -f Procfile
+CMD ["ruby", "buildpacker.rb"]

data/lib/smartcloud/grids/runner.rb

@@ -285,6 +285,10 @@ module Smartcloud
 
 						container_path_with_now_date = "#{container_path}/#{app_version}"
 
+						# Setup Buildpacker
+						buildpacker_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb"
+						FileUtils.cp(buildpacker_path, container_path_with_now_date)
+
 						puts "-----> Launching Application ... "
 
 						if File.exist? "#{container_path_with_now_date}/bin/rails"
@@ -294,12 +298,12 @@ module Smartcloud
 							# Starting Rails App
 							self.start_rails_app(appname, container_path, container_path_with_now_date)
 						end
-					end
-
-					# This line is important to cancel pre-receive push if finally the app could not be started.
-					# If the app was finally started, then this line should never be executed.
-					exit 1
+					end				
 				end
+
+				# This line is important to cancel pre-receive push if finally the app could not be started.
+				# If the app was finally started, then this line should never be executed.
+				exit 1
 			end
 
 			def self.stop_app(appname)
@@ -353,6 +357,7 @@ module Smartcloud
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
 					--volume='#{container_path_with_now_date}:/code' \
+					--workdir='/code' \
 					--restart='always' \
 					--network='nginx-network' \
 					smartcloud/buildpacks/rails", out: File::NULL)
@@ -364,7 +369,6 @@ module Smartcloud
 					print "-----> Starting container #{appname} ... "
 					if system("docker start #{appname}", out: File::NULL)
 						puts "done"
-						system("docker logs #{appname} --follow")
 						exit 0
 					end
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.58
+  version: 0.0.63
 platform: ruby
 authors:
 - Timeboard
@@ -31,6 +31,7 @@ files:
 - lib/smartcloud/grids/grid-nginx/fastcgi.conf
 - lib/smartcloud/grids/grid-nginx/nginx.tmpl
 - lib/smartcloud/grids/grid-runner/Dockerfile
+- lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb
 - lib/smartcloud/grids/grid-runner/buildpacks/rails/Dockerfile
 - lib/smartcloud/grids/grid-solr/docker-entrypoint-initdb.d/.keep
 - lib/smartcloud/grids/grid-solr/sunspot/conf/schema.xml