summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKapil Viren Ahuja <k.v.ahuja@gmail.com>2017-04-10 12:26:40 +0530
committerKapil Viren Ahuja <k.v.ahuja@gmail.com>2017-04-10 12:26:40 +0530
commit2b732205079c1321f7bcdde9c730aee88a8e909c (patch)
tree503bc24052aaa43d9456d9201ac9d634904126af
parent90dfd65538d09a78bffe64b4424bfb7c91bbeab4 (diff)
parent3c6e1c29981a7abae84902f94b0fb5bab53d409d (diff)
downloadvaindock-2b732205079c1321f7bcdde9c730aee88a8e909c.tar.gz
vaindock-2b732205079c1321f7bcdde9c730aee88a8e909c.zip
Merge branch 'release/2.0.0' of https://gitlab.com/vainglorygame/vaindock into release/2.0.0
-rw-r--r--docker-compose.yml12
-rw-r--r--rabbitmq/add_users.sh2
2 files changed, 0 insertions, 14 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 1072b16..e97d158 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,18 +129,6 @@ services:
- RABBITMQ_URI=amqp://processor:processor@vaindock_queue/
- DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb
- vaindock_compiler:
- build: ../compiler
- volumes:
- - ../compiler:/usr/src/app
- - ../orm:/usr/src/orm
- depends_on:
- - vaindock_queue
- - vaindock_db-web
- environment:
- - RABBITMQ_URI=amqp://compiler:compiler@vaindock_queue/
- - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb
-
vaindock_analyzer:
build: ../analyzer
volumes:
diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh
index c6e2168..1587b6e 100644
--- a/rabbitmq/add_users.sh
+++ b/rabbitmq/add_users.sh
@@ -19,8 +19,6 @@ 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. *** ***"