smartcloud 0.0.133 → 0.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ca411e8d6df4e0c0bae131d586b856e01bff30817186ad178e7d18eb7447fc
-  data.tar.gz: ec3c3ec243ca52b34561fe7df6f99539220aff04c19ab4d83be03301cacaed25
+  metadata.gz: 290d733d7d1544f87382e5df27a868e7a18ae120e09be189b1be9c20bc710fdb
+  data.tar.gz: 30dc990d866c842274cec684ab0febaa9d630400171dae5cd6f34321481ad3fc
 SHA512:
-  metadata.gz: be8e3311fbf37bf422547717e684c427b42b39ca97f6cd3e4e2623e25addd0c5f24143dffb632661fd389a79adc41a8a16550790af0f4238db84b7cb57032988
-  data.tar.gz: b58a3d5a4efaff1773f8c67ae471678823d80fcaeb459b122b15be52fd53cd2f3aaee0c9fba4983e737c23bfe88cf05c40a80ffadd465d070f73760be4ae146c
+  metadata.gz: fb83a259a9a11a8db3c9a9c6d5bb3239fb8943b6fdade9261792003ce5daa05a6ddf9024818326564cfc62f0496d135a7853ee0d60a714a320e2e4245313647a
+  data.tar.gz: 5542ef39f8271606c550b61e2a67b5b56c88ae184d1bda29f35a7413d40f85955e10347c7c6ef0e02bc4943cbd0ea3bd25de1e1be0f71007b26f442bc0a2e24c

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

@@ -21,29 +21,18 @@ RUN sed -i "s/999/99/" /etc/group && \
 # - git and git-daemon, because that gets us the git-http-backend CGI script
 # - ruby, to run smartcloud gem
 # - spawn-fcgi, to launch fcgiwrap and to create the unix socket
-COPY fcgiwrap /root/apk-packages/fcgiwrap
-RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk --allow-untrusted && \
-	rm -rf /root/apk-packages
+# COPY fcgiwrap /root/apk-packages/fcgiwrap
+# RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk --allow-untrusted && \
+	# rm -rf /root/apk-packages
 RUN apk add --update coreutils && \
+	apk add --update util-linux && \
 	apk add --update git && \
 	apk add --update git-daemon && \
 	apk add --update ruby && \
+	apk add --update fcgiwrap && \
     apk add --update spawn-fcgi && \
-	apk add --update lsof && \
     rm -rf /var/cache/apk/*
 
 RUN gem install smartcloud --no-rdoc --no-ri
 
-COPY spawner.rb "/spawner.rb"
-
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-\n\
-ruby /spawner.rb
-\n\
-exec "$@"' >> /entrypoint; chmod +x /entrypoint;
-
-# Set entrypoint
-ENTRYPOINT ["/entrypoint"]
-
-CMD ["spawn-fcgi", "-v"]
+CMD "git, fcgiwrap & spawn-fcgi installed"

data/lib/smartcloud/grids/nginx.rb

@@ -34,7 +34,6 @@ module Smartcloud
 					# Creating & Starting containers
 					print "-----> Creating container nginx ... "
 					if system("docker create \
-						--log-opt mode=non-blocking --log-opt max-buffer-size=4m \
 						--name='nginx' \
 						#{"--publish='80:80' --publish='443:443'" if exposed == '--exposed'} \
 						--volume='nginx-confd:/etc/nginx/conf.d/' \

data/lib/smartcloud/grids/runner.rb

@@ -17,7 +17,6 @@ module Smartcloud
 					if system("docker image inspect smartcloud/runner", [:out, :err] => File::NULL) && system("docker image inspect smartcloud/buildpacks/rails", [:out, :err] => File::NULL)
 						print "-----> Creating container runner ... "
 						if system("docker create \
-							--log-opt mode=non-blocking --log-opt max-buffer-size=4m \
 							--name='runner' \
 							--env VIRTUAL_PROTO=fastcgi \
 							--env VIRTUAL_HOST=#{Smartcloud.config.git_domain} \
@@ -30,10 +29,12 @@ module Smartcloud
 							--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' \
 							--volume='/var/run/docker.sock:/var/run/docker.sock' \
+							--user=#{File.basename(Smartcloud.config.user_home_path)} \
 							--workdir='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps' \
 							--restart='always' \
 							--network='nginx-network' \
-							smartcloud/runner", out: File::NULL)
+							smartcloud/runner \
+							spawn-fcgi -n -p 9000 /usr/bin/fcgiwrap -f", out: File::NULL)
 							puts "done"
 
 							print "-----> Starting container runner ... "

data/lib/smartcloud/templates/dotsmartcloud/grids/grid-runner/pre-receive

@@ -9,5 +9,5 @@ while read oldrev newrev refname; do
 	else
 	    REPOSITORY_BASENAME=$(basename $(readlink -nf "$PWD"/..))
 	fi
-	runner prereceive $REPOSITORY_BASENAME $REMOTE_USER $oldrev $newrev $refname
+	script -qfc "runner prereceive $REPOSITORY_BASENAME $REMOTE_USER $oldrev $newrev $refname" /home/$(whoami)/.smartcloud/grids/grid-runner/apps/containers/$REPOSITORY_BASENAME/typescript
 done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.133
+  version: 0.0.138
 platform: ruby
 authors:
 - Timeboard
@@ -41,7 +41,6 @@ files:
 - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk
 - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-doc-1.1.1-r4.apk
 - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-openrc-1.1.1-r4.apk
-- lib/smartcloud/grids/grid-runner/spawner.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

data/lib/smartcloud/grids/grid-runner/spawner.rb

@@ -1,14 +0,0 @@
-require "pty"
-
-begin
-  PTY.spawn("spawn-fcgi -p 9000 /usr/bin/fcgiwrap -f") do |stdout, stdin, pid|
-    begin
-      # Do stuff with the output here. Just printing to show it works
-      stdout.each { |line| print line }
-    rescue Errno::EIO
-      # puts "Errno:EIO error, but this probably just means that the process has finished giving output"
-    end
-  end
-rescue PTY::ChildExited
-  puts "The child process exited!"
-end