smartcloud 0.0.115 → 0.0.116

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4722e96e10ea469e35df297f43f8cc6dcca93884aed7e4d521ed0cf46e3d4bb2
4
- data.tar.gz: 3e039fe79daafc58c60e143364246bae21fa6a959faa5046a19caf488c49036f
3
+ metadata.gz: bbab2519253b902489a5f01d64e0bd00759df0a12a79b9fb97cee959d07c6e60
4
+ data.tar.gz: 92d42a50082271f1cd32596c369833d7275f5e80f2cf27723ba60fffa58fa86e
5
5
  SHA512:
6
- metadata.gz: 5075ae5c20268e65fa8dd66e5a3d876048b8dbbd59b8abea9db471406161a847ffa1bcbfe3fc0bf978eee77b5e7b611ebc3c9318ce3d1847fc546637b1cd0cad
7
- data.tar.gz: 447ce9f678fe740210966b1cc81183a0fccf301c23aaf78a90a1079ededd82600b149da5874cb38142268199fd78e9e7f8f77b4976bb94012cd7bc1726846aa1
6
+ metadata.gz: 3f6fc5de03cad8a54d9c1b2f0930c1b3be402d1bc823d764f5c57cc97a3f26917b13708b33053f122053bbfa77c04ea7979ec5e8dd46f53a10df21e3a74ae195
7
+ data.tar.gz: f4636050ca05d25eefd0da2df44ad360d9a80b26b42b6812a1ee01f54e2a2cb1aaeacbc72b00eed1656d0e97f02b0fa2925cba7fdf4c9398dd701c81e7d62769
@@ -27,14 +27,12 @@ RUN apk add /root/apk-packages/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.a
27
27
  RUN apk add --update coreutils && \
28
28
  apk add --update git && \
29
29
  apk add --update git-daemon && \
30
- apk add --update ruby && \
30
+ apk add --update ruby && \
31
31
  apk add --update spawn-fcgi && \
32
32
  rm -rf /var/cache/apk/*
33
33
 
34
34
  RUN gem install smartcloud --no-rdoc --no-ri
35
35
 
36
- # launch fcgiwrap via spawn-fcgi; launch nginx in the foreground
37
- # so the container doesn't die on us; supposedly we should be
38
- # using supervisord or something like that instead, but this
39
- # will do
40
- CMD "git, fcgiwrap & spawn-fcgi installed"
36
+ COPY spawner.rb "/home/$USER_NAME/spawner.rb"
37
+
38
+ CMD ["ruby", "/home/$USER_NAME/spawner.rb"]
@@ -0,0 +1,13 @@
1
+ require "pty"
2
+
3
+ begin
4
+ PTY.spawn("spawn-fcgi -n -p 9000 /usr/bin/fcgiwrap -f") do |stdout, stdin, pid|
5
+ begin
6
+ stdout.each { |line| print line }
7
+ rescue Errno::EIO
8
+ puts "Errno:EIO error, but this probably just means that the process has finished giving output"
9
+ end
10
+ end
11
+ rescue PTY::ChildExited
12
+ puts "The child process exited!"
13
+ end
@@ -34,8 +34,7 @@ module Smartcloud
34
34
  --workdir='#{Smartcloud.config.user_home_path}/.smartcloud/grids/grid-runner/apps' \
35
35
  --restart='always' \
36
36
  --network='nginx-network' \
37
- smartcloud/runner \
38
- spawn-fcgi -n -p 9000 /usr/bin/fcgiwrap -f", out: File::NULL)
37
+ smartcloud/runner", out: File::NULL)
39
38
  puts "done"
40
39
 
41
40
  print "-----> Starting container runner ... "
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.115
4
+ version: 0.0.116
5
5
  platform: ruby
6
6
  authors:
7
7
  - Timeboard
@@ -41,6 +41,7 @@ files:
41
41
  - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-1.1.1-r4.apk
42
42
  - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-doc-1.1.1-r4.apk
43
43
  - lib/smartcloud/grids/grid-runner/fcgiwrap/packages/main/x86_64/fcgiwrap-openrc-1.1.1-r4.apk
44
+ - lib/smartcloud/grids/grid-runner/spawner.rb
44
45
  - lib/smartcloud/grids/grid-solr/docker-entrypoint-initdb.d/.keep
45
46
  - lib/smartcloud/grids/grid-solr/sunspot/conf/schema.xml
46
47
  - lib/smartcloud/grids/grid-solr/sunspot/conf/solrconfig.xml