Kaynağa Gözat

Updates for multiple entrypoints to same image

master
jfederico 4 yıl önce
ebeveyn
işleme
6bd5a574d9

+ 21
- 14
docker-compose.yml Dosyayı Görüntüle

@@ -21,7 +21,7 @@ services:
21 21
     environment:
22 22
       - NGINX_DOMAIN=${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
23 23
     depends_on:
24
-      - scalelite
24
+      - scalelite.api
25 25
     command: /bin/bash -c "envsubst '$$NGINX_DOMAIN' < /etc/nginx/sites-available/sites.template > /etc/nginx/sites-enabled/sites.conf && exec nginx -g 'daemon off;'"
26 26
 
27 27
   redis:
@@ -29,12 +29,10 @@ services:
29 29
     restart: "no"
30 30
     ports:
31 31
       - 127.0.0.1:6379:6379
32
-    networks:
33
-      - default
34 32
     volumes:
35 33
       - ./redis/data/:/data
36 34
 
37
-  scalelite:
35
+  scalelite.api:
38 36
     entrypoint: [bin/start]
39 37
     image: blindsidenetwks/scalelite:master
40 38
     restart: "no"
@@ -42,21 +40,30 @@ services:
42 40
       - 127.0.0.1:3000:3000
43 41
     links:
44 42
       - redis
45
-    networks:
46
-      - default
47 43
     volumes:
48
-      - ./scalelite/log:/usr/src/app/log
49
-      - ./scalelite/bin/start:/usr/src/app/bin/start
44
+#      - ./scalelite/log/api:/srv/scalelite/log
45
+      - ./scalelite/bin/start:/srv/scalelite/bin/start
50 46
       - ./scalelite/tmp/pids/:/usr/src/app/tmp/pids
51 47
       - ./scalelite/tmp/sockets/:/usr/src/app/tmp/sockets
52 48
       - ./scalelite/tmp/cache/assets:/usr/src/app/tmp/cache/assets
53
-#    logging:
54
-#      driver: syslog
55
-#      options:
56
-#        syslog-address: udp://logs.$DOMAINNAME:1514
57
-#        tag: sl.$DOMAINNAME
58 49
     env_file: ./scalelite/.env
59 50
     environment:
60 51
       - REDIS_URL=redis://redis:6379
61
-      - REDIS_NAMESPACE=scalelite
62 52
       - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
53
+
54
+  scalelite.poller:
55
+    entrypoint: [bin/start-poller]
56
+    image: blindsidenetwks/scalelite:master
57
+    restart: "no"
58
+    ports:
59
+      - 127.0.0.1:3001:3000
60
+    links:
61
+      - redis
62
+    volumes:
63
+#      - ./scalelite/log/poller:/srv/scalelite/log
64
+      - ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller
65
+    env_file: ./scalelite/.env
66
+    environment:
67
+      - REDIS_URL=redis://redis:6379
68
+      - URL_HOST=sl.${DOMAIN_SUB:-lab}.${DOMAIN_ROOT:-bigbluebutton.org}
69
+      - INTERVAL=60

+ 1
- 1
nginx/sites.template Dosyayı Görüntüle

@@ -1,7 +1,7 @@
1 1
 #### For <sl.$NGINX_DOMAIN>
2 2
 
3 3
 upstream docker-scalelite {
4
-    server scalelite:3000;
4
+    server scalelite.api:3000;
5 5
 }
6 6
 
7 7
 server {

+ 1
- 0
scalelite/.env Dosyayı Görüntüle

@@ -1 +1,2 @@
1 1
 SECRET_KEY_BASE=secret_key_base
2
+LOADBALANCER_SECRET=8cd8ef52e8e101574e400365b55e11a6

+ 18
- 2
scalelite/bin/start Dosyayı Görüntüle

@@ -1,5 +1,21 @@
1
-#!/bin/bash
1
+#!/bin/sh
2 2
 
3
-bundle exec puma -C config/puma.rb
3
+
4
+
5
+servers="$(RAILS_ENV=$RAILS_ENV bundle exec rake servers 2>&1)"
6
+echo $servers
7
+
8
+if [ "$(echo "$servers" | cut -c0-2)" == "No" ]; then
9
+  echo ">>> Add test-install as the default server"
10
+  bundle exec rake servers:add["https://test-install.blindsidenetworks.com/bigbluebutton/api","8cd8ef52e8e101574e400365b55e11a6"]
11
+  bundle exec rake servers
12
+  bundle exec rake status
13
+else
14
+  echo ">>> Do nothing"
15
+fi
16
+
17
+
18
+exec tini -- bundle exec puma -C config/puma.rb "$@"
4 19
 #tail -f /dev/null
20
+#bundle exec puma -C config/puma.rb
5 21
 #bundle exec rails s -b 0.0.0.0 -p 3000

+ 5
- 0
scalelite/bin/start-poller Dosyayı Görüntüle

@@ -0,0 +1,5 @@
1
+#!/bin/sh
2
+
3
+echo "Poller is starting..."
4
+exec tini -- bundle exec rake poll["$INTERVAL"]
5
+#tail -f /dev/null

+ 1
- 0
scalelite/dotenv Dosyayı Görüntüle

@@ -1 +1,2 @@
1 1
 SECRET_KEY_BASE=secret_key_base
2
+LOADBALANCER_SECRET=8cd8ef52e8e101574e400365b55e11a6

Loading…
İptal
Kaydet