smartcloud 0.0.193 → 0.0.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1508f6de81ed608939780e8ae23c6db3f67af6f5e28762fe975ba688486fc3
-  data.tar.gz: 9b98709f1af7d4c4c90094cef42c42a3ebd709d70514950bf9380662ca468bdd
+  metadata.gz: 3158dd5d6a4b622aa0d3cbcd761e54437b6cfd3f1521f6098b0a40da6b8b8e6a
+  data.tar.gz: 8d7f4a4279455fe117e3d7e89b87beb2ce53d39174950319930692bf802a9b4e
 SHA512:
-  metadata.gz: d31be463e5617bede45e97afb61aa15bc27ba86040d166c437a43c48ec4a10f5598d6b65760516f37bfff8e792fa82e79e30d44a658576265bfbe3cf6516df71
-  data.tar.gz: 5541e2ad73a655d81b278b94d94404e3bd369ca5e1dbe07937de5d5fe599837bfcc43b1a6d01d35dd125a4ff21d3ee1e1a4ae4d15657a64b7555cbe0f6f9dedc
+  metadata.gz: f35424e99b062a841f69d6d1c504016fab164364c598be2daf8da374acba7654775b27c4bd4b71d56660c5063351e2d1cf22f813b336b965e4457aeb961b424c
+  data.tar.gz: b2e4cd1a9840534adcc46d7becb969c35b048414d5f3750d4dd7442388e4e41233ceaa51352c8cbd85779a9c5747c072d23a597a698744fa0547ed32f95a6142

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

@@ -32,12 +32,15 @@ RUN apk add --update coreutils && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*
 
+USER "$USER_NAME"
+WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
+
 # Generating entrypoint file
 RUN echo -e '#!/bin/sh\n\
 gem install --no-document --local smartcloud\n\
-exec "$@"' >> /entrypoint; chmod +x /entrypoint
+exec "$@"' >> "/home/$USER_NAME/entrypoint"; chmod +x "/home/$USER_NAME/entrypoint"
 
 # Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["/home/$USER_NAME/entrypoint"]
 
-CMD "git, fcgiwrap & spawn-fcgi installed"
+CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]

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

@@ -20,6 +20,9 @@ RUN apk add --update build-base && \
 	apk add --update mupdf-tools && \
     rm -rf /var/cache/apk/*
 
+USER "$USER_NAME"
+WORKDIR "/app"
+
 # Install gems
 RUN gem install bundler && \
 	gem install god
@@ -27,12 +30,10 @@ RUN gem install bundler && \
 # Generating entrypoint file
 RUN echo -e '#!/bin/sh\n\
 gem install --no-document --local smartcloud\n\
-exec "$@"' >> /entrypoint; chmod +x /entrypoint
-
-USER "$USER_NAME"
+exec "$@"' >> "/home/$USER_NAME/entrypoint"; chmod +x "/home/$USER_NAME/entrypoint"
 
 # Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["/home/$USER_NAME/entrypoint"]
 
 # Command to execute at container start
 CMD ["buildpacker", "start"]

data/lib/smartcloud/grids/runner.rb

@@ -27,16 +27,13 @@ module Smartcloud
 							--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}/.gem:#{Smartcloud.config.user_home_path}/.gem' \
 							--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='#{Smartcloud.config.user_home_path}/.gem/ruby:/usr/lib/ruby/gems' \
 							--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 \
-							spawn-fcgi -n -p 9000 /usr/bin/fcgiwrap -f", out: File::NULL)
+							smartcloud/runner", out: File::NULL)
 							puts "done"
 
 							print "-----> Starting container runner ... "
@@ -331,13 +328,12 @@ module Smartcloud
 					--name='#{appname}_new' \
 					--env-file='#{container_path}/env' \
 					--expose='5000' \
+					--volume='#{Smartcloud.config.user_home_path}/.gem:#{Smartcloud.config.user_home_path}/.gem' \
 					--volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
 					--volume='#{container_path_with_version}:/app' \
 					--volume='#{container_path}/app/vendor/bundle:/app/vendor/bundle' \
 					--volume='#{container_path}/app/public:/app/public' \
 					--volume='#{container_path}/app/node_modules:/app/node_modules' \
-					--volume='#{Smartcloud.config.user_home_path}/.gem/ruby:/usr/lib/ruby/gems' \
-					--workdir='/app' \
 					--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.193
+  version: 0.0.194
 platform: ruby
 authors:
 - Timeboard