smartcloud 0.0.101 → 0.0.106

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/smartcloud/grids/grid-nginx/fastcgi.conf +2 -2
  3. data/lib/smartcloud/grids/grid-runner/Dockerfile +9 -2
  4. data/lib/smartcloud/grids/grid-runner/fcgiwrap/APKBUILD +46 -0
  5. data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.confd +6 -0
  6. data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.initd +43 -0
  7. data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.pre-install +7 -0
  8. data/lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/APKINDEX.tar.gz +0 -0
  9. data/lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-1.1.0-r3.apk +0 -0
  10. data/lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-doc-1.1.0-r3.apk +0 -0
  11. data/lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-openrc-1.1.0-r3.apk +0 -0
  12. data/lib/smartcloud/grids/runner.rb +2 -1
  13. metadata +9 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: da509bb8a43c0fa4bd5249f9376ac9dde43ea9e97ef42be5b082f3b91712eee5
4
- data.tar.gz: 1363f3eddca16d20ed34e7a75322465d92c1e54eb21798a6309db8ded61d7b87
3
+ metadata.gz: 2239a9733235a678202992069c617f069fd2b23de59860bd41941cc0aa27a05e
4
+ data.tar.gz: 5fbfc8ed037f6c9a821cecdd580cf17e0a515954fe416b584dba293a979d40b5
5
5
  SHA512:
6
- metadata.gz: e324be2815de00140660df9ad151a49da654caa01f15fab28c0bca3b6da9332bf1bc968cb596041509046940ad7b4cf558fbcd23fe90eb7f5fecdc294ab7005a
7
- data.tar.gz: 0e4475ebef34c42702ea037e408a5053faf2004fc1e7baa05d993269f5a3201702bd9304734309674b3a74eba2e5a5481db8b598a4e19cb2e9a8c0293877506c
6
+ metadata.gz: 2f62f43b075f7071be61f9da36e0900d6d83aa79187c198a99d06e35596817afeb140c0f07a39100cc0c8a908307c620c9d319101baa3143c9876e9e6878d47d
7
+ data.tar.gz: 2d730ac5fd1044bdfbddbb6df8bfad62f8cac4c5f9eae7732e41d2055ebf862659a57d5a4681c7ac91f387474c95caad050f4a23715123b26d7e5d6deabe8bf5
data/lib/smartcloud/grids/grid-nginx/fastcgi.conf CHANGED
@@ -1,9 +1,9 @@
1
1
  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
2
- fastcgi_buffering off; # disables buffering of responses from the FastCGI server to nginx
2
+ fastcgi_buffering off; # disables buffering of responses from the FastCGI server on nginx
3
3
 
4
4
  include fastcgi_params; # Include the default fastcgi configs
5
5
 
6
- fastcgi_param NO_BUFFERING 1; # disables buffering of fcgiwrap
6
+ fastcgi_param NO_BUFFERING 1; # disables buffering on fcgiwrap
7
7
  fastcgi_param SCRIPT_FILENAME /usr/libexec/git-core/git-http-backend; # Tells fastcgi to pass the request to the git http backend executable.
8
8
  fastcgi_param PATH_INFO $uri; # Takes the capture group from our location directive and gives git that.
9
9
  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 CHANGED
@@ -14,14 +14,21 @@ RUN sed -i "s/999/99/" /etc/group && \
14
14
  adduser "$USER_NAME" "docker"
15
15
 
16
16
  # We need the following:
17
- # - git, because that gets us the git-http-backend CGI script
18
17
  # - fcgiwrap, because that is how nginx does CGI
18
+ # IMPORTANT NOTE: This is custom build fcgiwrap package to account for NO_BUFFERING OPTION.
19
+ # Original URL: https://github.com/gnosek/fcgiwrap
20
+ # Custom URL: https://github.com/notr1ch/fcgiwrap
21
+ COPY fcgiwrap/* /root/apk-packages/fcgiwrap/
22
+ RUN apk add /root/apk-packages/fcgiwrap/release fcgiwrap && \
23
+ rm -rf /root/apk-packages
24
+
25
+ # - git and git-daemon, because that gets us the git-http-backend CGI script
26
+ # - ruby, to run smartcloud gem
19
27
  # - spawn-fcgi, to launch fcgiwrap and to create the unix socket
20
28
  RUN apk add --update coreutils && \
21
29
  apk add --update git && \
22
30
  apk add --update git-daemon && \
23
31
  apk add --update ruby && \
24
- apk add --update fcgiwrap && \
25
32
  apk add --update spawn-fcgi && \
26
33
  rm -rf /var/cache/apk/*
27
34
 
data/lib/smartcloud/grids/grid-runner/fcgiwrap/APKBUILD ADDED
@@ -0,0 +1,46 @@
1
+ # Contributor: Eivind Uggedal <eu@eju.no>
2
+ # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
3
+ pkgname=fcgiwrap
4
+ pkgver=1.1.0
5
+ pkgrel=3
6
+ pkgdesc="Simple server for running CGI applications over FastCGI"
7
+ # This url has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek
8
+ #url="https://github.com/gnosek/fcgiwrap"
9
+ url="https://github.com/notr1ch/fcgiwrap"
10
+ arch="all"
11
+ license="MIT"
12
+ pkgusers="fcgiwrap"
13
+ pkggroups="www-data"
14
+ install="$pkgname.pre-install"
15
+ makedepends="$depends_dev autoconf libtool automake fcgi-dev"
16
+ subpackages="$pkgname-doc $pkgname-openrc"
17
+ # This source has been changed to add no_buffering feature for fcgiwrap where has not been currently merged by gnosek
18
+ #source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
19
+ source="$pkgname-$pkgver.tar.gz::https://github.com/notr1ch/$pkgname/archive/$pkgver.tar.gz
20
+ $pkgname.initd
21
+ $pkgname.confd"
22
+
23
+ builddir="$srcdir/$pkgname-$pkgver"
24
+
25
+ build() {
26
+ cd "$builddir"
27
+ autoreconf --install
28
+ CFLAGS="$CFLAGS -Wno-implicit-fallthrough" \
29
+ ./configure --prefix=/usr \
30
+ --mandir=/share/man \
31
+ --sbindir=/bin
32
+ make
33
+ }
34
+
35
+ package() {
36
+ cd "$builddir"
37
+ install -d -m2775 -o fcgiwrap -g www-data "$pkgdir"/run/fcgiwrap
38
+ make DESTDIR="$pkgdir" install
39
+ install -Dm755 $srcdir/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
40
+ install -Dm644 $srcdir/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
41
+ }
42
+
43
+
44
+ sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc fcgiwrap-1.1.0.tar.gz
45
+ 0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453 fcgiwrap.initd
46
+ 893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6 fcgiwrap.confd"
data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.confd ADDED
@@ -0,0 +1,6 @@
1
+ # set number of preforked children. defaults to number of system CPUs
2
+ #nproc=$(nproc)
3
+
4
+ # set listen socket. Defaults to unix:/run/fcgiwrap/fcgiwrap.sock
5
+ #socket=unix:/run/fcgiwrap/fcgiwrap.sock
6
+
data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.initd ADDED
@@ -0,0 +1,43 @@
1
+ #!/sbin/openrc-run
2
+
3
+ name="fcgiwrap"
4
+ description="fcgiwrap cgi daemon"
5
+
6
+ command="/usr/bin/fcgiwrap"
7
+ command_background="yes"
8
+ user="fcgiwrap"
9
+ group="www-data"
10
+ : ${socket:=unix:/run/fcgiwrap/fcgiwrap.sock}
11
+
12
+ depend() {
13
+ need net localmount
14
+ after firewall
15
+ }
16
+
17
+ start_pre() {
18
+ command_args="-c ${nproc:-$(nproc)} -s $socket"
19
+ case "$socket" in
20
+ unix:/*)
21
+ local socket_path=${socket#unix:}
22
+ checkpath --directory --mode 2775 --owner ${user}:${group} \
23
+ ${socket_path%/*}
24
+ ;;
25
+ esac
26
+ }
27
+
28
+ start() {
29
+ ebegin "Starting ${name}"
30
+ start-stop-daemon --exec ${command} \
31
+ --background \
32
+ -u ${user} -g ${group} \
33
+ --start -- ${command_args}
34
+ eend $?
35
+ }
36
+
37
+ stop_post() {
38
+ case "$socket" in
39
+ unix:/*)
40
+ rm -f "${socket#unix:}"
41
+ ;;
42
+ esac
43
+ }
data/lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.pre-install ADDED
@@ -0,0 +1,7 @@
1
+ #!/bin/sh
2
+
3
+ addgroup -S www-data 2>/dev/null
4
+ adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
5
+ fcgiwrap 2>/dev/null
6
+ exit 0
7
+
data/lib/smartcloud/grids/runner.rb CHANGED
@@ -25,6 +25,7 @@ module Smartcloud
25
25
  --env LETSENCRYPT_TEST=#{Smartcloud.config.letsencrypt_test} \
26
26
  --env GIT_PROJECT_ROOT=#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps/repositories \
27
27
  --env GIT_HTTP_EXPORT_ALL="" \
28
+ --env NO_BUFFERING="" \
28
29
  --expose='9000' \
29
30
  --volume='#{Smartcloud.config.user_home_path}/.smartcloud/config:#{Smartcloud.config.user_home_path}/.smartcloud/config' \
30
31
  --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
115
116
  --build-arg DOCKER_GID=`getent group docker | cut -d: -f3` \
116
117
  --build-arg USER_UID=`id -u` \
117
118
  --build-arg USER_NAME=`id -un` \
118
- #{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner", out: File::NULL)
119
+ #{Smartcloud.config.root_path}/lib/smartcloud/grids/grid-runner")
119
120
  puts "done"
120
121
  end
121
122
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smartcloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.101
4
+ version: 0.0.106
5
5
  platform: ruby
6
6
  authors:
7
7
  - Timeboard
@@ -33,6 +33,14 @@ files:
33
33
  - lib/smartcloud/grids/grid-runner/Dockerfile
34
34
  - lib/smartcloud/grids/grid-runner/buildpacks/buildpacker.rb
35
35
  - lib/smartcloud/grids/grid-runner/buildpacks/rails/Dockerfile
36
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/APKBUILD
37
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.confd
38
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.initd
39
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/fcgiwrap.pre-install
40
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/APKINDEX.tar.gz
41
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-1.1.0-r3.apk
42
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-doc-1.1.0-r3.apk
43
+ - lib/smartcloud/grids/grid-runner/fcgiwrap/release/x86_64/fcgiwrap-openrc-1.1.0-r3.apk
36
44
  - lib/smartcloud/grids/grid-solr/docker-entrypoint-initdb.d/.keep
37
45
  - lib/smartcloud/grids/grid-solr/sunspot/conf/schema.xml
38
46
  - lib/smartcloud/grids/grid-solr/sunspot/conf/solrconfig.xml