smartcloud 0.0.108 → 0.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea9438900ce4c811e7aae65af11c236f409a368e51004a94a0c290011e0f05b
-  data.tar.gz: 20d8359651c045fdbe5a9c8c6b200d25002ecd963634f620f7bff239a21b2a7f
+  metadata.gz: b1959f1513b05ee9189632dcab9ac8090ea8c3f56c551c95a0a51ece3d7cd8c2
+  data.tar.gz: 8e64115a830e5c87a4d80a2b2181e29613f8b6c42364bb62ebe2888a3f0f9fd9
 SHA512:
-  metadata.gz: 278ee8b22644bce5f89db156e20e092035d3052dbeea3ca64518feebccf56ceb714fd3ad67f7e5fd2adefe9e34d7be636eb98159c8a296656e183bbc8c58c0c0
-  data.tar.gz: b43d692c52505bb7bfcd6023df28c65d63719877eff90bd2bad1077532f84332c19f25840280da250aaf307b3ac0e1693484dc48ae9a6f73fb48229602757b37
+  metadata.gz: 61a84ee569779102d0a53a35a22c5297e2602337ac0c33e55f8f0441823eebfb07f8de3049ee596b96a1676d40cf7629dbac3d5e6713b3bf65d220a7d5588e40
+  data.tar.gz: 61e217a2aa70e8080d768b09277388063004dddf3a8b762c172934a1db4d06062bf1e44bddaa65024b43b5809f85817ea706319590b1f69c5e74cad7b07b4923

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

@@ -14,21 +14,21 @@ RUN sed -i "s/999/99/" /etc/group && \
 	adduser "$USER_NAME" "docker"
 
 # We need the following:
-# - git and git-daemon, because that gets us the git-http-backend CGI script
-# - ruby, to run smartcloud gem
 # - 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
 COPY fcgiwrap /root/apk-packages/fcgiwrap
+RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.0-r3.apk --allow-untrusted && \
+	rm -rf /root/apk-packages
 RUN apk add --update coreutils && \
 	apk add --update git && \
 	apk add --update git-daemon && \
-	apk add --update ruby && \
-	apk add --update fcgiwrap --repository /root/apk-packages/fcgiwrap/release --allow-untrusted && \
+	apk add --update ruby && \	
     apk add --update spawn-fcgi && \
-	rm -rf /root/apk-packages && \
     rm -rf /var/cache/apk/*
 
 RUN gem install smartcloud --no-rdoc --no-ri

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

@@ -14,13 +14,14 @@ 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
+# This source has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek. Please note the use of master branch instead of $pkgver.
 #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
+source="$pkgname-$pkgver.tar.gz::https://github.com/notr1ch/$pkgname/archive/master.tar.gz
 	$pkgname.initd
 	$pkgname.confd"
 
-builddir="$srcdir/$pkgname-$pkgver"
+#builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-master"
 
 build() {
 	cd "$builddir"
@@ -41,6 +42,6 @@ package() {
 }
 
 
-sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
+sha512sums="4ffacd247f48ff0827531da1e9fbf19262d51827668d90cde1ec30ea23139cdf6f45a3b2a955a2a3b8e9ddbc85e7e4fa4dd18217e71288441c8cabdff5c24846  fcgiwrap-1.1.0.tar.gz
 0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453  fcgiwrap.initd
 893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6  fcgiwrap.confd"

data/lib/smartcloud/grids/runner.rb

@@ -25,7 +25,6 @@ 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' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.108
+  version: 0.0.113
 platform: ruby
 authors:
 - Timeboard
@@ -37,10 +37,10 @@ files:
 - 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-runner/fcgiwrap/packages/main/x86_64/APKINDEX.tar.gz
+- lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.0-r3.apk
+- lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-doc-1.1.0-r3.apk
+- lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/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