smartcloud 0.0.202 → 0.0.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5a88e95ca46f647be2083461edb06439fae36a4cf0e195a019c2e1adbf32a08
-  data.tar.gz: 9013daed2b1d22f896af8e1318b5a1521f371b8e23607de90e999069832b6d60
+  metadata.gz: f39e9f8572245850d400240d2562d24233f0510f53576d5aa5618583b7f0a8a6
+  data.tar.gz: b994f906a8d88af94c62381f9a327159c253f4b639ec17d3c63f0d1ff2692dc6
 SHA512:
-  metadata.gz: 6cb8e4951c5702906be721a96a46f3055a026f202bbcec2d3362f9ba03a8137293b2d478778ba71791c92650e194372709bb8a9a2c48dc91a100fd332a2b4541
-  data.tar.gz: b7d85481136004af259f281824cb69d7eaf8190c827a40b5a2dd28bfc9138365314d8038e96911eac9d66973654824573670a980b04ca428f946d40fa6fb4c41
+  metadata.gz: 43656caf7f2c93f42bd216881260f2c4e7afc701c13742d0f55eb018c60ab28f1b6cf5833e09d6a6037a2503910f6a707d72a3b91ed9811259d9ae2f9c1c6a49
+  data.tar.gz: d5636d2f9f6ebef5666bf68a1ac179b2806a91f69bc268dcef9df2758d1d0eeae5f4dbdb27b8bf15aaede4f149a6a837b3cb834a4e72cc7e8f235ff6eaf75ca1

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

@@ -1,14 +1,10 @@
 FROM ruby:2.6.4-alpine3.10
 MAINTAINER Timeboard <hello@timeboard.me>
 
-# 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.
-# ----- Original fcgiwrap: https://github.com/gnosek/fcgiwrap
-# ----- Custom fcgiwrap: https://github.com/notr1ch/fcgiwrap
-# - 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
+# FCGI Essentials
+# --- IMPORTANT NOTE: This is custom built fcgiwrap package for alpine linux to account for NO_BUFFERING option.
+# --- Original fcgiwrap: https://github.com/gnosek/fcgiwrap
+# --- Custom fcgiwrap: https://github.com/notr1ch/fcgiwrap
 COPY fcgiwrap /root/apk-packages/fcgiwrap
 RUN apk add fcgiwrap --repository /root/apk-packages/fcgiwrap/packages/main --allow-untrusted && \
 	rm -rf /root/apk-packages
@@ -20,26 +16,18 @@ RUN apk add --update coreutils && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*
 
-# Setting up group and user
-# - envs
+# User
+# --- Fix to change gid of 999 to 99 so that addgroup is free to create a group with 999 as gid
 ARG USER_NAME
 ARG USER_UID
 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 && \
-	adduser $USER_NAME docker
-
+	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
+	addgroup --gid "$DOCKER_GID" "docker" && adduser "$USER_NAME" "docker"
 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 smartcloud\n\
-exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
-
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
+# Gems
+RUN gem install smartcloud
 
 CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]

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

@@ -1,7 +1,7 @@
 FROM ruby:2.6.4-alpine3.10
-MAINTAINER Timeboard <hello@timeboard.me>
+LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-# Install Ruby on Rails Essentials
+# Ruby on Rails Essentials
 RUN apk add --update build-base && \
 	apk add --update tzdata && \
 	apk add --update nodejs && \
@@ -13,27 +13,16 @@ RUN apk add --update build-base && \
 	apk add --update mupdf-tools && \
     rm -rf /var/cache/apk/*
 
-# Setting up user
-# - envs
+# User
 ARG USER_UID
 ARG USER_NAME
-# - Create user.
 RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
-
 USER "$USER_NAME"
 WORKDIR "/app"
 
-# Install gems
-RUN gem install bundler && \
+# Gems
+RUN gem install smartcloud && \
+	gem install bundler && \
 	gem install god
 
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-gem install --no-document smartcloud\n\
-exec "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
-
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
-
-# Command to execute at container start
 CMD ["buildpacker", "start"]

data/lib/smartcloud/grids/runner.rb

@@ -27,7 +27,6 @@ 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='/var/run/docker.sock:/var/run/docker.sock' \
@@ -328,7 +327,6 @@ 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' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.202
+  version: 0.0.203
 platform: ruby
 authors:
 - Timeboard