smartcloud 0.0.193 → 0.0.198

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1508f6de81ed608939780e8ae23c6db3f67af6f5e28762fe975ba688486fc3
-  data.tar.gz: 9b98709f1af7d4c4c90094cef42c42a3ebd709d70514950bf9380662ca468bdd
+  metadata.gz: dc8b9476cdd5ed8a6993d84f26b2ce1e6ebe966fd35f193622dff8532fd39ef2
+  data.tar.gz: 4922222e91746feb348eb887346567fc45cd3290dc3c875dbc882eb3bad11de1
 SHA512:
-  metadata.gz: d31be463e5617bede45e97afb61aa15bc27ba86040d166c437a43c48ec4a10f5598d6b65760516f37bfff8e792fa82e79e30d44a658576265bfbe3cf6516df71
-  data.tar.gz: 5541e2ad73a655d81b278b94d94404e3bd369ca5e1dbe07937de5d5fe599837bfcc43b1a6d01d35dd125a4ff21d3ee1e1a4ae4d15657a64b7555cbe0f6f9dedc
+  metadata.gz: 605b518da4a5d290f628198ddaa92aa060be0ec9cceadef487fa1dd1046e3929532aec9569a27db3afe13ecfd5722e7381427bc22eae29806d78ab9d8d0ee107
+  data.tar.gz: 720b3575168ecec626b12faedaf9cebd1c30b3d94f7a9dbbdbc7115afcd41e51b7ad30e84b82c028f463d280340460b0309145bd74835f150c7c952e79661cac

data/lib/smartcloud/engine/Dockerfile

@@ -0,0 +1,30 @@
+FROM ruby:2.6.4-alpine3.10
+MAINTAINER Timeboard <hello@timeboard.me>
+
+# Setting up group and user
+# - envs
+ARG USER_NAME
+ARG USER_UID
+ARG USER_GID
+ARG DOCKER_GID
+# - fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid
+# - Create group & user. Then add user to group
+RUN sed -i "s/999/99/" /etc/group && \
+	adduser --disabled-password --gecos "" --uid $USER_UID $USER_NAME && \
+	addgroup --gid $USER_GID $USER_NAME && adduser $USER_NAME $USER_NAME && \
+	addgroup --gid $DOCKER_GID "docker" && adduser $USER_NAME docker
+USER "$USER_NAME"
+WORKDIR "/home/$USER_NAME/.smartcloud"
+
+# Generating entrypoint file
+RUN echo -e '#!/bin/sh\n\
+gem install --no-document smartcloud\n\
+exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
+
+RUN apk add --update docker && \
+    rm -rf /var/cache/apk/*
+
+# Set entrypoint
+ENTRYPOINT "/home/$(whoami)/entrypoint"
+
+CMD ["smartcloud"]

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
@@ -12,7 +12,7 @@ RUN sed -i "s/999/99/" /etc/group && \
 	addgroup --gid "$DOCKER_GID" "docker" && \
 	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
 	adduser "$USER_NAME" "docker"
-
+USER "$USER_NAME"
 # We need the following:
 # - fcgiwrap, because that is how nginx does CGI
 # ----- IMPORTANT NOTE: This is custom build fcgiwrap package to account for NO_BUFFERING option.
@@ -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

@@ -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/$(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.193
+  version: 0.0.198
 platform: ruby
 authors:
 - Timeboard
@@ -30,6 +30,7 @@ files:
 - lib/smartcloud/base.rb
 - lib/smartcloud/boot.rb
 - lib/smartcloud/docker.rb
+- lib/smartcloud/engine/Dockerfile
 - lib/smartcloud/grids/buildpacker.rb
 - lib/smartcloud/grids/grid-buildpacker/.keep
 - lib/smartcloud/grids/grid-mysql/docker-entrypoint-initdb.d/.keep