Download as
Browse Code »

Commit f7a1469e9314d962b99deebb89e19e98962e7c88

Authored by João Vitor Rebouças
1 parent 9ea1e9e0
Exists in master

Atualizando docker-composes de produção

Showing 8 changed files with 144 additions and 29 deletions   Show diff stats
external-lb-docker.yml
  Diff comments   View file @f7a1469
@@ -5,6 +5,8 @@ services: @@ -5,6 +5,8 @@ services:
5 ports: 5 ports:
6 - 80:80/tcp 6 - 80:80/tcp
7 - 8080:8080/tcp 7 - 8080:8080/tcp
  8 + - 200:200/tcp
  9 + - 201:201/tcp
8 labels: 10 labels:
9 io.rancher.container.agent.role: environmentAdmin 11 io.rancher.container.agent.role: environmentAdmin
10 io.rancher.container.create_agent: 'true' 12 io.rancher.container.create_agent: 'true'
external-lb-rancher.yml
  Diff comments   View file @f7a1469
@@ -5,30 +5,64 @@ services: @@ -5,30 +5,64 @@ services:
5 lb_config: 5 lb_config:
6 certs: [] 6 certs: []
7 port_rules: 7 port_rules:
8 - - path: /translate  
9 - priority: 1 8 + - hostname: video.vlibras.preprod.nuvem.gov.br
  9 + priority: 12
10 protocol: http 10 protocol: http
11 - service: tradutor/api 11 + service: video/video
  12 + source_port: 80
  13 + target_port: 8080
  14 + - hostname: vlibras.preprod.nuvem.gov.br
  15 + priority: 13
  16 + protocol: http
  17 + service: portal/web
  18 + source_port: 80
  19 + target_port: 8080
  20 + - hostname: traducao.vlibras.preprod.nuvem.gov.br
  21 + priority: 14
  22 + protocol: http
  23 + service: traducao/api
12 source_port: 80 24 source_port: 80
13 target_port: 8080 25 target_port: 8080
14 - - path: /video  
15 - priority: 2 26 + - hostname: dicionario.vlibras.preprod.nuvem.gov.br
  27 + priority: 15
16 protocol: http 28 protocol: http
17 - service: tradutor/api 29 + service: traducao/api
18 source_port: 80 30 source_port: 80
19 target_port: 8080 31 target_port: 8080
20 - - priority: 3 32 + - hostname: video.vlibras.preprod.nuvem.gov.br
  33 + path: ''
  34 + priority: 16
  35 + protocol: http
  36 + service: video/video
  37 + source_port: 80
  38 + target_port: 8080
  39 + - hostname: video.vlibras.preprod.nuvem.gov.br
  40 + priority: 17
21 protocol: http 41 protocol: http
22 service: video/video 42 service: video/video
23 source_port: 8080 43 source_port: 8080
24 target_port: 8080 44 target_port: 8080
25 - - priority: 4 45 + - hostname: wiki.vlibras.preprod.nuvem.gov.br
  46 + priority: 18
26 protocol: http 47 protocol: http
27 - service: portal/web 48 + service: wikilibras/web
28 source_port: 80 49 source_port: 80
29 - target_port: 8080 50 + target_port: 80
  51 + - hostname: wiki.vlibras.preprod.nuvem.gov.br
  52 + priority: 19
  53 + protocol: http
  54 + service: wikilibras/web
  55 + source_port: 200
  56 + target_port: 200
  57 + - hostname: wiki.vlibras.preprod.nuvem.gov.br
  58 + priority: 20
  59 + protocol: http
  60 + service: wikilibras/web
  61 + source_port: 201
  62 + target_port: 201
30 stickiness_policy: 63 stickiness_policy:
31 cookie: lb-vlibras 64 cookie: lb-vlibras
  65 + domain: vlibras.preprod.nuvem.gov.br
32 indirect: false 66 indirect: false
33 mode: insert 67 mode: insert
34 nocache: false 68 nocache: false
@@ -39,3 +73,4 @@ services: @@ -39,3 +73,4 @@ services:
39 port: 42 73 port: 42
40 unhealthy_threshold: 3 74 unhealthy_threshold: 3
41 interval: 2000 75 interval: 2000
  76 + strategy: recreate
portal-docker.yml
  Diff comments   View file @f7a1469
@@ -11,27 +11,23 @@ volumes: @@ -11,27 +11,23 @@ volumes:
11 driver: 'null' 11 driver: 'null'
12 services: 12 services:
13 web: 13 web:
14 - image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.1 14 + image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.2
15 environment: 15 environment:
16 - DOMAIN_NAME: vlibras.preprod.nuvem.gov.br:80  
17 - VLIBRAS_API: video.vlibras.preprod.nuvem.gov.br:80  
18 - VLIBRAS_API_URL: http://video.vlibras.preprod.nuvem.gov.br/api/ 16 + DATABASE_DB: vlibrasvideo
19 DATABASE_HOST: db 17 DATABASE_HOST: db
20 - DATABASE_USER: vlibrasuser  
21 DATABASE_PASSWORD: d426ff41c6d096db6f033c89b17b403e 18 DATABASE_PASSWORD: d426ff41c6d096db6f033c89b17b403e
22 - DATABASE_DB: vlibrasvideo 19 + DATABASE_USER: vlibrasuser
  20 + DOMAIN_NAME: vlibras.preprod.nuvem.gov.br
  21 + VLIBRAS_API: video.vlibras.preprod.nuvem.gov.br:80
  22 + VLIBRAS_API_URL: http://video.vlibras.preprod.nuvem.gov.br/api/
23 volumes: 23 volumes:
24 - portal_data:/vlibraslportal/ 24 - portal_data:/vlibraslportal/
25 - portal_logs:/myapp/log 25 - portal_logs:/myapp/log
26 links: 26 links:
27 - - redis:redis  
28 - db:db 27 - db:db
  28 + - redis:redis
29 labels: 29 labels:
30 io.rancher.container.pull_image: always 30 io.rancher.container.pull_image: always
31 - redis:  
32 - image: hub.docker.planejamento.gov.br/capgov/redis:3.2.8  
33 - command:  
34 - - /etc/redis/redis.conf  
35 db: 31 db:
36 image: hub.docker.planejamento.gov.br/capgov/mysql:5.6 32 image: hub.docker.planejamento.gov.br/capgov/mysql:5.6
37 environment: 33 environment:
@@ -41,3 +37,9 @@ services: @@ -41,3 +37,9 @@ services:
41 MYSQL_USER: vlibrasuser 37 MYSQL_USER: vlibrasuser
42 volumes: 38 volumes:
43 - portal_db:/var/lib/mysql 39 - portal_db:/var/lib/mysql
  40 + command:
  41 + - --general-log=1
  42 + redis:
  43 + image: hub.docker.planejamento.gov.br/capgov/redis:3.2.8
  44 + command:
  45 + - /etc/redis/redis.conf
portal-rancher.yml
  Diff comments   View file @f7a1469
@@ -3,9 +3,9 @@ services: @@ -3,9 +3,9 @@ services:
3 web: 3 web:
4 scale: 1 4 scale: 1
5 start_on_create: true 5 start_on_create: true
6 - redis: 6 + db:
7 scale: 1 7 scale: 1
8 start_on_create: true 8 start_on_create: true
9 - db: 9 + redis:
10 scale: 1 10 scale: 1
11 start_on_create: true 11 start_on_create: true
tradutor-docker.yml
  Diff comments   View file @f7a1469
@@ -3,13 +3,13 @@ volumes: @@ -3,13 +3,13 @@ volumes:
3 tradutor_logs: 3 tradutor_logs:
4 external: true 4 external: true
5 driver: 'null' 5 driver: 'null'
6 - tradutor_bd: 6 + tradutor_rabbitmq:
7 external: true 7 external: true
8 driver: 'null' 8 driver: 'null'
9 core_db: 9 core_db:
10 external: true 10 external: true
11 driver: 'null' 11 driver: 'null'
12 - tradutor_rabbitmq: 12 + tradutor_bd:
13 external: true 13 external: true
14 driver: 'null' 14 driver: 'null'
15 services: 15 services:
@@ -27,7 +27,7 @@ services: @@ -27,7 +27,7 @@ services:
27 - core_db:/home/vlibras/storage/ 27 - core_db:/home/vlibras/storage/
28 - tradutor_logs:/home/vlibras/translate-api/logs 28 - tradutor_logs:/home/vlibras/translate-api/logs
29 links: 29 links:
30 - - mongo:mongo  
31 - rabbit:rabbit 30 - rabbit:rabbit
  31 + - mongo:mongo
32 labels: 32 labels:
33 io.rancher.container.pull_image: always 33 io.rancher.container.pull_image: always
video-docker.yml
  Diff comments   View file @f7a1469
1 version: '2' 1 version: '2'
2 volumes: 2 volumes:
3 - videos_bd: 3 + video_bd:
4 external: true 4 external: true
5 driver: 'null' 5 driver: 'null'
6 videos_rabbitmq: 6 videos_rabbitmq:
@@ -12,11 +12,14 @@ volumes: @@ -12,11 +12,14 @@ volumes:
12 video_logs: 12 video_logs:
13 external: true 13 external: true
14 driver: 'null' 14 driver: 'null'
  15 + video_py_logs:
  16 + external: true
  17 + driver: 'null'
15 services: 18 services:
16 mongo: 19 mongo:
17 image: hub.docker.planejamento.gov.br/capgov/mongodb 20 image: hub.docker.planejamento.gov.br/capgov/mongodb
18 volumes: 21 volumes:
19 - - videos_bd:/data/db 22 + - video_bd:/data/db
20 rabbit: 23 rabbit:
21 image: hub.docker.planejamento.gov.br/capgov/rabbitmq:3.6.9-1-management 24 image: hub.docker.planejamento.gov.br/capgov/rabbitmq:3.6.9-1-management
22 volumes: 25 volumes:
@@ -29,7 +32,7 @@ services: @@ -29,7 +32,7 @@ services:
29 volumes: 32 volumes:
30 - core_storage:/storage/ 33 - core_storage:/storage/
31 - video_logs:/home/vlibras/vlibras-api/logsystem/logs 34 - video_logs:/home/vlibras/vlibras-api/logsystem/logs
32 - - vide_py_logs:/home/vlibras/log 35 + - video_py_logs:/home/vlibras/log
33 links: 36 links:
34 - mongo:mongo 37 - mongo:mongo
35 - rabbit:rabbit 38 - rabbit:rabbit
wikilibras-docker.yml 0 → 100644
  Diff comments   View file @f7a1469
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
  1 +version: '2'
  2 +volumes:
  3 + wikilibras_blender:
  4 + external: true
  5 + driver: 'null'
  6 + wikilibras_mongodb:
  7 + external: true
  8 + driver: 'null'
  9 + wikilibras-corretor_videos:
  10 + external: true
  11 + driver: 'null'
  12 + wikilibras-validador_videos:
  13 + external: true
  14 + driver: 'null'
  15 + wikilibras-wikilibrasv2_videos:
  16 + external: true
  17 + driver: 'null'
  18 + wikilibras_redis:
  19 + external: true
  20 + driver: 'null'
  21 + wikilibras-corretor_uploads:
  22 + external: true
  23 + driver: 'null'
  24 + wikilibras-wikilibrasv2_uploads:
  25 + external: true
  26 + driver: 'null'
  27 + wikilibras-core_users:
  28 + external: true
  29 + driver: 'null'
  30 + wikilibras_sinais:
  31 + external: true
  32 + driver: 'null'
  33 + wikilibras_avatar:
  34 + external: true
  35 + driver: 'null'
  36 + wikilibras_uploads:
  37 + external: true
  38 + driver: 'null'
  39 + wikilibras-validador_uploads:
  40 + external: true
  41 + driver: 'null'
  42 + wikilibras_apache2_logs:
  43 + external: true
  44 + driver: 'null'
  45 + wikilibras_postgresql:
  46 + external: true
  47 + driver: 'null'
  48 +services:
  49 + web:
  50 + image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.4
  51 + stdin_open: true
  52 + volumes:
  53 + - wikilibras_postgresql:/var/lib/postgresql
  54 + - wikilibras_mongodb:/var/lib/mongodb
  55 + - wikilibras_redis:/var/lib/redis
  56 + - wikilibras_blender:/home/vlibras/container/wikilibrasdbapi/blender
  57 + - wikilibras_sinais:/home/vlibras/container/wikilibrasdbapi/sinais
  58 + - wikilibras_avatar:/home/vlibras/container/wikilibrasdbapi/avatar
  59 + - wikilibras_uploads:/home/vlibras/container/wikilibrasdbapi/uploads
  60 + - wikilibras_apache2_logs:/var/log/apache2
  61 + - wikilibras-wikilibrasv2_videos:/home/vlibras/container/wikilibrasV2/view/videos
  62 + - wikilibras-corretor_videos:/home/vlibras/container/corretor_sinais/view/videos
  63 + - wikilibras-validador_videos:/home/vlibras/container/validador_sinais/view/videos
  64 + - wikilibras-wikilibrasv2_uploads:/home/vlibras/container/wikilibrasV2/view/uploads
  65 + - wikilibras-corretor_uploads:/home/vlibras/container/corretor_sinais/view/uploads
  66 + - wikilibras-validador_uploads:/home/vlibras/container/validador_sinais/view/uploads
  67 + - wikilibras-core_users:/home/vlibras/container/wikilibras-core/users
  68 + tty: true
wikilibras-rancher.yml 0 → 100644
  Diff comments   View file @f7a1469
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +version: '2'
  2 +services:
  3 + web:
  4 + scale: 1
  5 + start_on_create: true