smartcloud 0.0.192 → 0.0.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08aae14de5119205ac1d149149c5c9eb1061c4c65425b4fb665a3770cc31826
-  data.tar.gz: a98c1326ef877b438f248bb9a1ae3f1440e87209dc6941fc3028225b0290a572
+  metadata.gz: 6982ca2164a94d1797d6c69ab7978d96bfa9fcf9321fd9b8068038486773ca5c
+  data.tar.gz: a5815a2805fe1b7ec18f694851ff69a42a5147e0e956effc32772529ed16ffb5
 SHA512:
-  metadata.gz: 1f87948942a572b47c2d49ebd6db66a1ef00a5e1ba8fe1db8a78b8ce50811b6475cdefadf364eb02c707ed0133ef618f578531c4946700b50d9eb361905689b5
-  data.tar.gz: 6da0ad66a53a66f3d015cafb15d46c1621f3a647d27412199db5311fd680cad4752e472f34aa07582c78101892fb7d227ecc4db554d09d7d0c9bea4086bf1838
+  metadata.gz: 5d0e2668008388ac6f3ec1fbbf00aaf8e0bdfec84f505587200d888959dd5dd65fa61aa120f8ebed79a2ffba64d9c7d631e378737df9d635db8a108d57b6b747
+  data.tar.gz: 3da3c36795e153ba2184495a7277f8e87e14ac0349510bc5a5a5f583ef74983a8c2d832df86b98b2a42e6ee8e403a2a812c8f7e0d800c3d8ed7e1258fd98dd15

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

@@ -1,4 +1,4 @@
-FROM docker:latest
+FROM ruby:2.6.4-alpine3.10
 MAINTAINER Timeboard <hello@timeboard.me>
 
 # Setting up group and user
@@ -26,18 +26,21 @@ RUN apk add fcgiwrap --repository /root/apk-packages/fcgiwrap/packages/main --al
 	rm -rf /root/apk-packages
 RUN apk add --update coreutils && \
 	apk add --update util-linux && \
+	apk add --update docker && \
 	apk add --update git && \
 	apk add --update git-daemon && \
-	apk add --update ruby && \
     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/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
 
 # Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT "/home/$(whoami)/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

@@ -21,6 +21,7 @@ RUN apk add --update build-base && \
     rm -rf /var/cache/apk/*
 
 USER "$USER_NAME"
+WORKDIR "/app"
 
 # Install gems
 RUN gem install bundler && \
@@ -29,10 +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
+exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
 
 # Set entrypoint
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT "/home/$(whoami)/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.192
+  version: 0.0.197
 platform: ruby
 authors:
 - Timeboard