diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-24 15:03:44 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-24 15:03:44 +0200 |
| commit | ba1d9018fb77a4fa802243b8dbeba1646a353569 (patch) | |
| tree | f71023da0b8acdf9c57b698cfe28d5520704921a | |
| parent | 93a6a2164ead33b9ae59781a479d3196fa95d014 (diff) | |
| download | vaindock-ba1d9018fb77a4fa802243b8dbeba1646a353569.tar.gz vaindock-ba1d9018fb77a4fa802243b8dbeba1646a353569.zip | |
support second db for brawls
| -rw-r--r-- | docker-compose.yml | 68 | ||||
| -rw-r--r-- | rabbitmq/add_users.sh | 2 |
2 files changed, 68 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index b712b68..221c870 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,9 +100,11 @@ services: depends_on: - vaindock_queue - vaindock_db-web + - vaindock_db-brawl environment: - RABBITMQ_URI=amqp://bridge:bridge@vaindock_queue/ - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb + - DATABASE_BRAWL_URI=mysql://vainbrawl:vainbrawl@vaindock_db-brawl/vainbrawl env_file: - local.env @@ -110,11 +112,49 @@ services: build: ../apigrabber volumes: - ../apigrabber:/usr/src/app + - ../orm:/usr/src/orm + depends_on: + - vaindock_queue + - vaindock_db-web + environment: + - RABBITMQ_URI=amqp://apigrabber:apigrabber@vaindock_queue/ + - QUEUE=grab + - PROCESS_QUEUE=process + - SAMPLE_QUEUE=sample + - GRABBERS=2 + env_file: + - local.env + + vaindock_apigrabber_brawl: + build: ../apigrabber + volumes: + - ../apigrabber:/usr/src/app + - ../orm:/usr/src/orm depends_on: - vaindock_queue - vaindock_db-web environment: - RABBITMQ_URI=amqp://apigrabber:apigrabber@vaindock_queue/ + - QUEUE=grab_brawl + - PROCESS_QUEUE=process_brawl + - SAMPLE_QUEUE=sample + - GRABBERS=1 + env_file: + - local.env + + vaindock_sampler: + build: ../sampler + volumes: + - ../sampler:/usr/src/app + - ../orm:/usr/src/orm + depends_on: + - vaindock_queue + environment: + - RABBITMQ_URI=amqp://sampler:sampler@vaindock_queue/ + - QUEUE=sample + - PROCESS_QUEUE=process + - PROCESS_BRAWL_QUEUE=process_brawl + - SAMPLERS=5 env_file: - local.env @@ -142,7 +182,20 @@ services: environment: - RABBITMQ_URI=amqp://processor:processor@vaindock_queue/ - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb - #- PREMIUM_FEATURES=true + - QUEUE=process + + vaindock_processor_brawl: + build: ../processor + volumes: + - ../processor:/usr/src/app + - ../orm:/usr/src/orm + depends_on: + - vaindock_queue + - vaindock_db-brawl + environment: + - RABBITMQ_URI=amqp://processor:processor@vaindock_queue/ + - DATABASE_URI=mysql://vainbrawl:vainbrawl@vaindock_db-brawl/vainbrawl + - QUEUE=process_brawl vaindock_cruncher: build: ../cruncher @@ -179,11 +232,20 @@ services: MYSQL_PASSWORD: vainweb MYSQL_ALLOW_EMPTY_PASSWORD: 1 + vaindock_db-brawl: + image: mariadb:10 + volumes: + - vaindock_db-brawl-data:/var/lib/mysql + environment: + MYSQL_DATABASE: vainbrawl + MYSQL_USER: vainbrawl + MYSQL_PASSWORD: vainbrawl + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + vaindock_phpmyadmin: image: phpmyadmin/phpmyadmin:4.6 environment: - PMA_ARBITRARY=1 - - PMA_HOST=vaindock_db-web ports: - "8882:80" volumes: @@ -208,6 +270,8 @@ services: volumes: vaindock_db-web-data: driver: "local" + vaindock_db-brawl-data: + driver: "local" vaindock_queue-data: driver: "local" sessions: ## nothing is connected to this (- ./data/sessions:/sessions) diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh index 5cc45c3..527c83d 100644 --- a/rabbitmq/add_users.sh +++ b/rabbitmq/add_users.sh @@ -17,6 +17,8 @@ rabbitmqctl add_user bridge bridge rabbitmqctl set_permissions -p / bridge ".*" ".*" ".*" rabbitmqctl add_user apigrabber apigrabber rabbitmqctl set_permissions -p / apigrabber ".*" ".*" ".*" +rabbitmqctl add_user sampler sampler +rabbitmqctl set_permissions -p / sampler ".*" ".*" ".*" rabbitmqctl add_user processor processor rabbitmqctl set_permissions -p / processor ".*" ".*" ".*" rabbitmqctl add_user analyzer analyzer |