smartcloud 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c232578df6b9c605cd12ffea381afdc7b96be07fac4965d67428a4672450fb45
-  data.tar.gz: 380004759b4c0ada658329ccf2b3a35bab6d7ba9318fecbb46789a0496e46149
+  metadata.gz: 6c4a12cc5b76d2ef4beade090ae25d0ace5b859dfc4cc16d907bf5be47a82284
+  data.tar.gz: 8d618cccb5ef06a31657d2f19dc996ef9bb137a5c0d4c5a2f9c845082766ac4e
 SHA512:
-  metadata.gz: cf1f39b846803fcd00457b5f4a747006cb95149e5e21847ec71e91e310b5b7fc4e97559505825ad01fa974ce15cd7fc487c2dabf7c8d6fe17dbc28ea8143848f
-  data.tar.gz: b13454b0a7a6b00cbafe34d391e8efbc23e10fe66333cbe89b72ebdffeb655b2185c9dd8c1235d0c32323972fb6a5ed1ef048fd9d0d636d21d262b96dc260555
+  metadata.gz: 825c357f42ddb91660b77508a5bf5fbdc9905603ae8c29029cb0c324c93b43cad442c747483db9a04ab7a99e37f6ffdd27bab99d354cd8441b08c5f482d86432
+  data.tar.gz: c6d82cd5f710c9d45569999cf5ff729cf91de4b7d58e6730c3b1f688984bcd99d8b935424a6ef85f0b4268152187fd926f7fc8e75b47cbfb4aa359006bb93a6e

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

@@ -7,24 +7,11 @@ 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;
+RUN gem install bundler && \
+	gem install foreman
 
 # Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["ruby", "builder.rb"]
 
 # Command to execute at container start
 CMD foreman start -f Procfile

data/lib/smartcloud/grids/grid-runner/buildpacks/rails/builder.rb

@@ -0,0 +1,22 @@
+class Builder
+	def initialize
+		puts "---------------------------------------------------------------"
+
+		FileUtils.rm("./tmp/pids/server.pid") if File.exist? "./tmp/pids/server.pid"
+
+		puts "Performing bundle install ... "
+		if system("bundle install")
+			puts "done"
+			puts "Compiling Assets ... "
+			if system("bundle exec rails assets:precompile")
+				puts "done"
+				# exec "$@"
+				exit 0
+			end
+		end
+
+		exit 1		
+	end
+end
+
+Builder.new

data/lib/smartcloud/grids/runner.rb

@@ -294,12 +294,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)
@@ -342,6 +342,11 @@ module Smartcloud
 					EOF")
 				end
 
+				# Setup Builder
+				builder_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/rails/builder.rb"
+				%x[chmod +x #{builder_path}]
+				FileUtils.cp(builder_path, container_path_with_now_date)
+
 				# Creating & Starting container
 				# IMPORTANT NOTE:
 				# The below commands of docker are executed here. However, they run from the host.
@@ -353,6 +358,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)

metadata

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