smartcloud 0.0.101 → 0.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da509bb8a43c0fa4bd5249f9376ac9dde43ea9e97ef42be5b082f3b91712eee5
-  data.tar.gz: 1363f3eddca16d20ed34e7a75322465d92c1e54eb21798a6309db8ded61d7b87
+  metadata.gz: 2239a9733235a678202992069c617f069fd2b23de59860bd41941cc0aa27a05e
+  data.tar.gz: 5fbfc8ed037f6c9a821cecdd580cf17e0a515954fe416b584dba293a979d40b5
 SHA512:
-  metadata.gz: e324be2815de00140660df9ad151a49da654caa01f15fab28c0bca3b6da9332bf1bc968cb596041509046940ad7b4cf558fbcd23fe90eb7f5fecdc294ab7005a
-  data.tar.gz: 0e4475ebef34c42702ea037e408a5053faf2004fc1e7baa05d993269f5a3201702bd9304734309674b3a74eba2e5a5481db8b598a4e19cb2e9a8c0293877506c
+  metadata.gz: 2f62f43b075f7071be61f9da36e0900d6d83aa79187c198a99d06e35596817afeb140c0f07a39100cc0c8a908307c620c9d319101baa3143c9876e9e6878d47d
+  data.tar.gz: 2d730ac5fd1044bdfbddbb6df8bfad62f8cac4c5f9eae7732e41d2055ebf862659a57d5a4681c7ac91f387474c95caad050f4a23715123b26d7e5d6deabe8bf5

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

@@ -1,9 +1,9 @@
 client_max_body_size 0; # Git pushes can be massive, just to make sure nginx doesn't suddenly cut the connection add this. Setting to 0 disables checking of client_max_body_size
-fastcgi_buffering off; # disables buffering of responses from the FastCGI server to nginx
+fastcgi_buffering off; # disables buffering of responses from the FastCGI server on nginx
 
 include fastcgi_params; # Include the default fastcgi configs
 
-fastcgi_param NO_BUFFERING 1; # disables buffering of fcgiwrap
+fastcgi_param NO_BUFFERING 1; # disables buffering on fcgiwrap
 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 PATH_INFO $uri; # 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

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

@@ -14,14 +14,21 @@ RUN sed -i "s/999/99/" /etc/group && \
 	adduser "$USER_NAME" "docker"
 
 # We need the following:
-# - git, because that gets us the git-http-backend CGI script
 # - fcgiwrap, because that is how nginx does CGI
+# IMPORTANT NOTE: This is custom build fcgiwrap package to account for NO_BUFFERING OPTION.
+# Original URL: https://github.com/gnosek/fcgiwrap
+# Custom URL: https://github.com/notr1ch/fcgiwrap
+COPY fcgiwrap/* /root/apk-packages/fcgiwrap/
+RUN apk add /root/apk-packages/fcgiwrap/release fcgiwrap && \
+    rm -rf /root/apk-packages
+
+# - 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
 RUN apk add --update coreutils && \
 	apk add --update git && \
 	apk add --update git-daemon && \
 	apk add --update ruby && \
-    apk add --update fcgiwrap && \
     apk add --update spawn-fcgi && \
     rm -rf /var/cache/apk/*
 

data/lib/smartcloud/grids/grid-runner/fcgiwrap/APKBUILD

@@ -0,0 +1,46 @@
+# Contributor: Eivind Uggedal <eu@eju.no>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=fcgiwrap
+pkgver=1.1.0
+pkgrel=3
+pkgdesc="Simple server for running CGI applications over FastCGI"
+# This url has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek
+#url="https://github.com/gnosek/fcgiwrap"
+url="https://github.com/notr1ch/fcgiwrap"
+arch="all"
+license="MIT"
+pkgusers="fcgiwrap"
+pkggroups="www-data"
+install="$pkgname.pre-install"
+makedepends="$depends_dev autoconf libtool automake fcgi-dev"
+subpackages="$pkgname-doc $pkgname-openrc"
+# This source has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek
+#source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/notr1ch/$pkgname/archive/$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd"
+
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	autoreconf --install
+	CFLAGS="$CFLAGS -Wno-implicit-fallthrough" \
+	./configure --prefix=/usr \
+		--mandir=/share/man \
+		--sbindir=/bin
+	make
+}
+
+package() {
+	cd "$builddir"
+	install -d -m2775 -o fcgiwrap -g www-data  "$pkgdir"/run/fcgiwrap
+	make DESTDIR="$pkgdir" install
+	install -Dm755 $srcdir/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 $srcdir/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+
+
+sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
+0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453  fcgiwrap.initd
+893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6  fcgiwrap.confd"

data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.confd

@@ -0,0 +1,6 @@
+# set number of preforked children. defaults to number of system CPUs
+#nproc=$(nproc)
+
+# set listen socket. Defaults to unix:/run/fcgiwrap/fcgiwrap.sock
+#socket=unix:/run/fcgiwrap/fcgiwrap.sock
+

data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.initd

@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+
+name="fcgiwrap"
+description="fcgiwrap cgi daemon"
+
+command="/usr/bin/fcgiwrap"
+command_background="yes"
+user="fcgiwrap"
+group="www-data"
+: ${socket:=unix:/run/fcgiwrap/fcgiwrap.sock}
+
+depend() {
+	need net localmount
+	after firewall
+}
+
+start_pre() {
+	command_args="-c ${nproc:-$(nproc)} -s $socket"
+	case "$socket" in
+	unix:/*)
+		local socket_path=${socket#unix:}
+		checkpath --directory --mode 2775 --owner ${user}:${group} \
+			${socket_path%/*}
+		;;
+	esac
+}
+
+start() {
+	ebegin "Starting ${name}"
+	start-stop-daemon --exec ${command} \
+		--background \
+		-u ${user} -g ${group} \
+		--start -- ${command_args}
+	eend $?
+}
+
+stop_post() {
+	case "$socket" in
+	unix:/*)
+		rm -f "${socket#unix:}"
+		;;
+	esac
+}

data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.pre-install

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S www-data 2>/dev/null
+adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
+	fcgiwrap 2>/dev/null
+exit 0
+

data/lib/smartcloud/grids/runner.rb

@@ -25,6 +25,7 @@ module Smartcloud
 							--env LETSENCRYPT_TEST=#{Smartcloud.config.letsencrypt_test} \
 							--env GIT_PROJECT_ROOT=#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories \
 							--env GIT_HTTP_EXPORT_ALL="" \
+							--env NO_BUFFERING="" \
 							--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' \
@@ -115,7 +116,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", out: File::NULL)
+						#{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
 						puts "done"
 					end
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.101
+  version: 0.0.106
 platform: ruby
 authors:
 - Timeboard
@@ -33,6 +33,14 @@ files:
 - lib/smartcloud/grids/grid-runner/Dockerfile
 - lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb
 - lib/smartcloud/grids/grid-runner/buildpacks/rails/Dockerfile
+- lib/smartcloud/grids/grid-runner/fcgiwrap/APKBUILD
+- lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.confd
+- lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.initd
+- lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.pre-install
+- lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/APKINDEX.tar.gz
+- lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-1.1.0-r3.apk
+- lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-doc-1.1.0-r3.apk
+- lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-openrc-1.1.0-r3.apk
 - lib/smartcloud/grids/grid-solr/docker-entrypoint-initdb.d/.keep
 - lib/smartcloud/grids/grid-solr/sunspot/conf/schema.xml
 - lib/smartcloud/grids/grid-solr/sunspot/conf/solrconfig.xml