Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0

3 files changed, 38 insertions, 25 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index d6e936f..1072b16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,7 @@ services:
         - vaindock_db-web
       environment:
         - RABBITMQ_URI=amqp://bridge:bridge@vaindock_queue/
+        - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb
       env_file:
         - local.env
 
@@ -140,6 +141,17 @@ services:
           - RABBITMQ_URI=amqp://compiler:compiler@vaindock_queue/
           - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb
 
+    vaindock_analyzer:
+        build: ../analyzer
+        volumes:
+          - ../analyzer:/usr/src/app
+        depends_on:
+          - vaindock_queue
+          - vaindock_db-web
+        environment:
+          - RABBITMQ_URI=amqp://analyzer:analyzer@vaindock_queue/
+          - DATABASE_URI=mysql+cymysql://vainweb:vainweb@vaindock_db-web/vainweb
+
     vaindock_db-web:
       image: mariadb:10
       volumes:
@@ -164,6 +176,7 @@ services:
 
     vaindock_queue:
         build: ./rabbitmq
+        hostname: vaindock_queue
         volumes:
           - vaindock_queue-data:/var/lib/queue
         ports:
@@ -175,6 +188,7 @@ services:
           - "8881:15672"  # management guest/guest
         environment:
           - RABBITMQ_HIPE_COMPILE=1
+          - RABBITMQ_RECREATE_ON_STARTUP=true  # for debugging
 
 volumes:
     vaindock_db-web-data:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index b6bafec..c6a9581 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -34,6 +34,7 @@ http {
     }
 
     upstream websocket {
+        # server 192.168.1.37:15674;
         server vaindock_queue:15674;
     }
 }
diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh
index d3dbb36..c6e2168 100644
--- a/rabbitmq/add_users.sh
+++ b/rabbitmq/add_users.sh
@@ -1,31 +1,29 @@
 #!/usr/bin/env bash
-set -e
-
 (
-count=0;
-# Execute list_users until service is up and running
-until timeout 5 rabbitmqctl list_users >/dev/null 2>/dev/null || (( count++ >= 20 )); do sleep 1; done;
-if ! rabbitmqctl list_users | grep bridge > /dev/null
-then
-   # rabbitmqctl delete_user guest
-   rabbitmqctl add_user web web
-   rabbitmqctl set_permissions -p / web "^stomp-subscription-" "^stomp-subscription-" "^(amq.topic$|stomp-subscription-)"
-   # read only amq.topic on host /, but allow stomp subscribe
-   # services below: all allowed
-   rabbitmqctl add_user bridge bridge
-   rabbitmqctl set_permissions -p / bridge ".*" ".*" ".*"
-   rabbitmqctl add_user apigrabber apigrabber
-   rabbitmqctl set_permissions -p / apigrabber ".*" ".*" ".*"
-   rabbitmqctl add_user processor processor
-   rabbitmqctl set_permissions -p / processor ".*" ".*" ".*"
-   rabbitmqctl add_user compiler compiler
-   rabbitmqctl set_permissions -p / compiler ".*" ".*" ".*"
-
-   echo "setup completed"
-else
-   echo "already setup"
+if [[ $RABBITMQ_RECREATE_ON_STARTUP ]]; then
+    echo "*** *** deleting all data *** ***"
+    rm -r "/var/lib/rabbitmq/mnesia/rabbit@$(hostname)/"
 fi
+echo "*** *** waiting for rabbitmq *** ***"
+until rabbitmqctl status &>/dev/null; do sleep 1; done
+sleep 5
+echo "*** *** creating users *** ***"
+# rabbitmqctl delete_user guest
+rabbitmqctl add_user web web
+rabbitmqctl set_permissions -p / web "^stomp-subscription-" "^stomp-subscription-" "^(amq.topic$|stomp-subscription-)"
+# read only amq.topic on host /, but allow stomp subscribe
+# services below: all allowed
+rabbitmqctl add_user bridge bridge
+rabbitmqctl set_permissions -p / bridge ".*" ".*" ".*"
+rabbitmqctl add_user apigrabber apigrabber
+rabbitmqctl set_permissions -p / apigrabber ".*" ".*" ".*"
+rabbitmqctl add_user processor processor
+rabbitmqctl set_permissions -p / processor ".*" ".*" ".*"
+rabbitmqctl add_user compiler compiler
+rabbitmqctl set_permissions -p / compiler ".*" ".*" ".*"
+rabbitmqctl add_user analyzer analyzer
+rabbitmqctl set_permissions -p / analyzer ".*" ".*" ".*"
+echo "*** *** custom rabbitmq setup done. *** ***"
 ) &
 
-# Call original entrypoint
 exec docker-entrypoint.sh rabbitmq-server $@