smartcloud 0.0.42 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a71ebe7320e8f91fd5eab896e1bce1ec7d9e91d0ae4c9634405348753fdbca
-  data.tar.gz: 5a43560d74881d0543765f55dbc3b707bebdcb33bcf38dc3825345a062771e9c
+  metadata.gz: f429da1f686f6163272299d7f7ed73630d61a8cdec0b55eea74a15c61a5b634e
+  data.tar.gz: d93355d2a7692b9e0ee7c3b5fd6e5d8cb00fc88f1debb1ae8c97a6d74f4c327d
 SHA512:
-  metadata.gz: 2d3a6165a04ed0c0ffd11f484605fdf4931612d79f3368f98c72a5f6b0283254e941129f865f17cf946f17bed989e9a247403f33877a9c44f1b04437126c7fea
-  data.tar.gz: 228d812ca142504e2663fb0ad487d94a8a42f695321fc417dfb5a0eb158c9d074f0e766522d96e757183faa88a7b04ad5aeda34ca595b9165b27a9202e05ef9a
+  metadata.gz: f4f88c0453021d2cfe5208f9f368eca481fddcb325a8c06837d9ebe699e9e3351d261b590d21840bbe0827eb580be76864eaa11f5eae05deeddb16edc53c547c
+  data.tar.gz: 6ee91f75362a2c378460a7a993286dca4181d66f642834bfcb907785f8b8ca477fcbfa304428d84138c37b0d94fae3943a1f0310b2b9efdad7e9e78bb067e9e8

data/lib/smartcloud/grids/grid-nginx/fastcgi.conf

@@ -4,6 +4,8 @@ include fastcgi_params; # Include the default fastcgi configs
 
 fastcgi_param SCRIPT_FILENAME /usr/libexec/git-core/git-http-backend; # Tells fastcgi to pass the request to the git http backend executable.
 fastcgi_param GIT_HTTP_EXPORT_ALL "";
-fastcgi_param GIT_PROJECT_ROOT /.smartcloud/grids/grid-runner/apps/repositories; # is the location of all of your git repositories.
-fastcgi_param PATH_INFO $uri; # Takes the capture group from our location directive and gives git that.
+# fastcgi_param GIT_PROJECT_ROOT /.smartcloud/grids/grid-runner/apps/repositories; # is the location of all of your git repositories.
+fastcgi_param PATH_INFO $path_info; # Takes the capture group from our location directive and gives git that.
 fastcgi_param REMOTE_USER $remote_user; # Forward REMOTE_USER as we want to know when we are authenticated
+
+# IMPORTANT NOTE: Other required fastcgi_params have been defined already as environment variables in the runner container and hence need not be passed here.

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

@@ -2,12 +2,16 @@ FROM docker:latest
 MAINTAINER Timeboard <hello@timeboard.me>
 
 # Setting up group and user
+# - envs
 ARG DOCKER_GID
 ARG USER_UID
 ARG USER_NAME
-# RUN addgroup --gid "$DOCKER_GID" "docker"
-RUN adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME"
-# RUN adduser "$USER_NAME" "docker"
+# - 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 && \
+	addgroup --gid "$DOCKER_GID" "docker" && \
+	adduser --disabled-password --gecos "" --uid "$USER_UID" "$USER_NAME" && \
+	adduser "$USER_NAME" "docker"
 
 # We need the following:
 # - git, because that gets us the git-http-backend CGI script

data/lib/smartcloud/grids/runner.rb

@@ -23,7 +23,7 @@ module Smartcloud
 							--env LETSENCRYPT_HOST=#{Smartcloud.config.git_domain} \
 							--env LETSENCRYPT_EMAIL=#{Smartcloud.config.sysadmin_email} \
 							--env LETSENCRYPT_TEST=#{Smartcloud.config.letsencrypt_test} \
-							--env USER_HOME_PATH=#{Smartcloud.config.user_home_path} \
+							--env GIT_PROJECT_ROOT='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories'
 							--expose='9000' \
 							--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' \
@@ -110,7 +110,7 @@ module Smartcloud
 						--build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
 						--build-arg USER_UID=`id -u` \
 						--build-arg USER_NAME=`id -un` \
-						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
+						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner", out: File::NULL)
 						puts "done"
 					end
 				end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.47
 platform: ruby
 authors:
 - Timeboard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies: []
 description: Smartcloud is a full-stack deployment framework for rails optimized for
   programmer happiness and peaceful administration. It encourages natural simplicity