From c2d78419d7d70370255e983ee73a059d18f51bb7 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 4 Apr 2017 12:02:30 +0200
Subject: rewrite rabbitmq user add script

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 07d85dd..48cefdb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -164,6 +164,7 @@ services:
 
     vaindock_queue:
         build: ./rabbitmq
+        hostname: vaindock_queue
         volumes:
           - vaindock_queue-data:/var/lib/queue
         ports:
-- 
cgit v1.3.1


From 23092ac9c2a6827f711498e1c8e1b2e9254e3c39 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 4 Apr 2017 12:56:00 +0200
Subject: add queue option to reset on start

---
 docker-compose.yml    |  1 +
 rabbitmq/add_users.sh | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 48cefdb..9a17675 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,6 +176,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/rabbitmq/add_users.sh b/rabbitmq/add_users.sh
index 4f49e76..70554e9 100644
--- a/rabbitmq/add_users.sh
+++ b/rabbitmq/add_users.sh
@@ -1,18 +1,13 @@
 #!/usr/bin/env bash
-set -e
-
 (
-echo "waiting for rabbitmq"
-while ! rabbitmqctl list_users &> /dev/null
-do
-    sleep 1
-done
-if rabbitmqctl list_users | grep "web"
-then
-    echo "users already exist, exiting"
-    exit 1
+if [[ $RABBITMQ_RECREATE_ON_STARTUP ]]; then
+    echo "*** *** deleting all data *** ***"
+    rm -r "/var/lib/rabbitmq/mnesia/rabbit@$(hostname)/"
 fi
-echo "creating new users"
+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-)"
@@ -26,7 +21,7 @@ rabbitmqctl add_user processor processor
 rabbitmqctl set_permissions -p / processor ".*" ".*" ".*"
 rabbitmqctl add_user compiler compiler
 rabbitmqctl set_permissions -p / compiler ".*" ".*" ".*"
-echo "custom rabbitmq setup done."
+echo "*** *** custom rabbitmq setup done. *** ***"
 ) &
 
 exec docker-entrypoint.sh rabbitmq-server $@
-- 
cgit v1.3.1


From f9884585dae45af6e4261fe3d73888240fd0acb5 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 4 Apr 2017 17:09:15 +0200
Subject: bridge needs db access

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a17675..7730392 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
 
-- 
cgit v1.3.1


From 8222adaa1e7e5276e3c13da48dca032d62717638 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 4 Apr 2017 21:05:58 +0200
Subject: add analyzer container

---
 docker-compose.yml    | 11 +++++++++++
 rabbitmq/add_users.sh |  2 ++
 2 files changed, 13 insertions(+)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 7730392..46da648 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,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:
diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh
index 70554e9..c6e2168 100644
--- a/rabbitmq/add_users.sh
+++ b/rabbitmq/add_users.sh
@@ -21,6 +21,8 @@ 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. *** ***"
 ) &
 
-- 
cgit v1.3.1