smartcloud 0.0.57 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 891d83721c59043e1eb4eefc6b96825d5d557f54b63d523ca5e7f42c74c27bc2
-  data.tar.gz: 9069fe3985cf4c46df661575d26989c92355c307b866261503b3647e588509af
+  metadata.gz: 54c39d34ceaa5c208501171a9f415b7d24e75d4db1ce5b6c994c13640069c54e
+  data.tar.gz: 3e085817a21ffb50de48463b976a380512efb6a1ce1e87df1ae244fcb4322177
 SHA512:
-  metadata.gz: b6fa7ac7a2124f8a85fb78b6bb8183da88cd9be4b45ec346d61ae66b0dfc02f7636d69255e34e30e01628c8c38c04b236238e6ed3d8c4008616fba1d62b607ba
-  data.tar.gz: a9a909922a57022f08fdf178f8f30055e95b41a4a75fced769301b9f938400ca126e95ebf5c484d9f132e7afaec2c1435bb77afe956cd1c78778c52423afa9d7
+  metadata.gz: a462a67925b5bdaab7cf644bd4fe655d0be4b0e485adf462db4500f3f9bc968f54c5b24bfc190df7dc060dc7fe9c147a50cbda5ac8cbec9a72781b29f734999f
+  data.tar.gz: 663beca1d5bac206591e051679105b1b097d7efe004535a26a0e14f0d2292a91cc61d1247cda56d09a7ebf1286cccfd9ccfa6637646597f61840fba4177f8d97

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/grid-runner/buildpacks/rails/buildpacker.rb

@@ -0,0 +1,20 @@
+class Buildpacker
+	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 "-----> Compiling Assets ... "
+			if system("bundle exec rails assets:precompile")
+				system("foreman start -f Procfile")
+			end
+		end
+
+		puts "failed."
+		exit 1		
+	end
+end
+
+Buildpacker.new

data/lib/smartcloud/grids/runner.rb

@@ -24,6 +24,7 @@ module Smartcloud
 							--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
 							--env LETSENCRYPT_TEST=#{Smartcloud.config.letsencrypt_test} \
 							--env GIT_PROJECT_ROOT=#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories \
+							--env GIT_HTTP_EXPORT_ALL="" \
 							--expose='9000' \
 							--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 							--volume='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner:#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner' \
@@ -293,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)
@@ -341,6 +342,10 @@ module Smartcloud
 					EOF")
 				end
 
+				# Setup Buildpacker
+				buildpacker_path = "#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner/buildpacks/rails/buildpacker.rb"
+				FileUtils.cp(buildpacker_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.
@@ -352,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.62
 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/buildpacker.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