smartcloud 0.0.210 → 0.2.3

data/lib/smartcloud/engine/Dockerfile

@@ -1,27 +1,27 @@
 FROM ruby:2.6.4-alpine3.10
-MAINTAINER Timeboard <hello@timeboard.me>
+LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-RUN apk add --update docker && \
-    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 && \
-	addgroup --gid $DOCKER_GID "docker" && 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"
+# Essentials
+RUN apk add --update build-base && \
+	apk add --update docker && \
+	apk add --update git && \
+    rm -rf /var/cache/apk/*
 
-# Generating entrypoint file
-RUN echo -e '#!/bin/sh\n\
-gem install --no-document smartcloud\n\
-exec smartcloud "$@"' >> "/home/$(whoami)/entrypoint"; chmod +x "/home/$(whoami)/entrypoint"
+# Smartcloud Gem
+ARG SMARTCLOUD_VERSION
+COPY ./smartcloud-$SMARTCLOUD_VERSION.gem ./smartcloud-$SMARTCLOUD_VERSION.gem
+RUN gem install --no-document smartcloud-$SMARTCLOUD_VERSION.gem && \
+	rm ./smartcloud-$SMARTCLOUD_VERSION.gem
 
-# Set entrypoint
-ENTRYPOINT "/home/$(whoami)/entrypoint"
+# Smartcloud Master Key
+ARG SMARTCLOUD_MASTER_KEY
+ENV SMARTCLOUD_MASTER_KEY=$SMARTCLOUD_MASTER_KEY

data/lib/smartcloud/{grids/grid-runner → engine}/buildpacks/rails/Dockerfile

@@ -1,11 +1,6 @@
-FROM ruby:2.6.4-alpine3.10
+FROM smartcloud:latest
 LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-# User
-ARG USER_UID
-ARG USER_NAME
-RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
-
 # Ruby on Rails Essentials
 RUN apk add --update build-base && \
 	apk add --update tzdata && \
@@ -18,13 +13,7 @@ RUN apk add --update build-base && \
 	apk add --update mupdf-tools && \
     rm -rf /var/cache/apk/*
 
-# Privileges
-USER "$USER_NAME"
-WORKDIR "/app"
-
 # Gems
-RUN gem install smartcloud && \
-	gem install bundler && \
-	gem install god
+RUN gem install bundler
 
-CMD ["buildpacker", "start"]
+CMD ["buildpacker", "pack"]

data/lib/smartcloud/grids/{grid-runner → grid-prereceiver}/Dockerfile

@@ -1,15 +1,6 @@
-FROM ruby:2.6.4-alpine3.10
+FROM smartcloud:latest
 LABEL maintainer="Timeboard <hello@timeboard.me>"
 
-# 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
-RUN sed -i "s/999/99/" /etc/group && \
-	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
-	addgroup --gid "$DOCKER_GID" "docker" && adduser "$USER_NAME" "docker"
-
 # 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
@@ -19,17 +10,9 @@ 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 spawn-fcgi && \
     rm -rf /var/cache/apk/*
 
-# Privileges
-USER "$USER_NAME"
-WORKDIR "/home/$USER_NAME/.smartcloud/grids/grid-runner/apps"
-
-# Gems
-RUN gem install smartcloud
-
 CMD ["spawn-fcgi", "-n", "-p", "9000", "/usr/bin/fcgiwrap", "-f"]