Download as
Browse Code »

Commit 4756f2016cbdeeb3ee1a446448d2b29f0142f84c

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

Atualizando composes de prod

Showing 8 changed files with 89 additions and 48 deletions   Show diff stats
external-lb-docker.yml
  Diff comments   View file @4756f20
@@ -4,9 +4,10 @@ services: @@ -4,9 +4,10 @@ services:
4 image: rancher/lb-service-haproxy:v0.6.2 4 image: rancher/lb-service-haproxy:v0.6.2
5 ports: 5 ports:
6 - 80:80/tcp 6 - 80:80/tcp
7 - - 8080:8080/tcp  
8 - 200:200/tcp 7 - 200:200/tcp
9 - 201:201/tcp 8 - 201:201/tcp
  9 + - 8080:8080/tcp
  10 + - 53306:53306/tcp
10 labels: 11 labels:
11 io.rancher.container.agent.role: environmentAdmin 12 io.rancher.container.agent.role: environmentAdmin
12 io.rancher.container.create_agent: 'true' 13 io.rancher.container.create_agent: 'true'
external-lb-rancher.yml
  Diff comments   View file @4756f20
@@ -5,64 +5,80 @@ services: @@ -5,64 +5,80 @@ services:
5 lb_config: 5 lb_config:
6 certs: [] 6 certs: []
7 port_rules: 7 port_rules:
8 - - hostname: video.vlibras.preprod.nuvem.gov.br  
9 - priority: 12 8 + - hostname: video.vlibras.gov.br
  9 + priority: 1
10 protocol: http 10 protocol: http
11 - service: video/video 11 + service: video-portal/web
12 source_port: 80 12 source_port: 80
13 target_port: 8080 13 target_port: 8080
14 - - hostname: vlibras.preprod.nuvem.gov.br  
15 - priority: 13 14 + - hostname: wiki.vlibras.gov.br
  15 + priority: 7
16 protocol: http 16 protocol: http
17 - service: portal/web 17 + service: wikilibras/web
18 source_port: 80 18 source_port: 80
19 - target_port: 8080  
20 - - hostname: traducao.vlibras.preprod.nuvem.gov.br  
21 - priority: 14 19 + target_port: 80
  20 + - hostname: wiki.vlibras.gov.br
  21 + path: ''
  22 + priority: 8
22 protocol: http 23 protocol: http
23 - service: traducao/api  
24 - source_port: 80 24 + service: wikilibras/web
  25 + source_port: 200
  26 + target_port: 200
  27 + - hostname: wiki.vlibras.gov.br
  28 + priority: 9
  29 + protocol: http
  30 + service: wikilibras/web
  31 + source_port: 201
  32 + target_port: 201
  33 + - hostname: api.videos.vlibras.gov.br
  34 + path: ''
  35 + priority: 10
  36 + protocol: http
  37 + service: video/video
  38 + source_port: 8080
25 target_port: 8080 39 target_port: 8080
26 - - hostname: dicionario.vlibras.preprod.nuvem.gov.br  
27 - priority: 15 40 + - hostname: api.videos.vlibras.gov.br
  41 + priority: 11
28 protocol: http 42 protocol: http
29 - service: traducao/api 43 + service: video/video
30 source_port: 80 44 source_port: 80
31 target_port: 8080 45 target_port: 8080
32 - - hostname: video.vlibras.preprod.nuvem.gov.br  
33 - path: ''  
34 - priority: 16 46 + - priority: 12
35 protocol: http 47 protocol: http
36 - service: video/video 48 + service: video-portal/web
37 source_port: 80 49 source_port: 80
38 target_port: 8080 50 target_port: 8080
39 - - hostname: video.vlibras.preprod.nuvem.gov.br  
40 - priority: 17 51 + - priority: 13
41 protocol: http 52 protocol: http
42 service: video/video 53 service: video/video
43 source_port: 8080 54 source_port: 8080
44 target_port: 8080 55 target_port: 8080
45 - - hostname: wiki.vlibras.preprod.nuvem.gov.br  
46 - priority: 18 56 + - hostname: dicionario.vlibras.gov.br
  57 + priority: 15
47 protocol: http 58 protocol: http
48 - service: wikilibras/web 59 + service: Tradutor/api
49 source_port: 80 60 source_port: 80
50 - target_port: 80  
51 - - hostname: wiki.vlibras.preprod.nuvem.gov.br  
52 - priority: 19 61 + target_port: 8080
  62 + - hostname: traducao.vlibras.gov.br
  63 + priority: 16
53 protocol: http 64 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 65 + service: Tradutor/api
  66 + source_port: 80
  67 + target_port: 8080
  68 + - priority: 17
  69 + protocol: tcp
  70 + service: video-portal/db
  71 + source_port: 53306
  72 + target_port: 3306
  73 + - hostname: dicionario.vlibras.gov.br
  74 + priority: 18
59 protocol: http 75 protocol: http
60 - service: wikilibras/web  
61 - source_port: 201  
62 - target_port: 201 76 + service: video/rabbit
  77 + source_port: 8080
  78 + target_port: 15672
63 stickiness_policy: 79 stickiness_policy:
64 cookie: lb-vlibras 80 cookie: lb-vlibras
65 - domain: vlibras.preprod.nuvem.gov.br 81 + domain: video.vlibras.gov.br
66 indirect: false 82 indirect: false
67 mode: insert 83 mode: insert
68 nocache: false 84 nocache: false
portal-docker.yml
  Diff comments   View file @4756f20
@@ -11,15 +11,15 @@ volumes: @@ -11,15 +11,15 @@ 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.2 14 + image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.3
15 environment: 15 environment:
16 DATABASE_DB: vlibrasvideo 16 DATABASE_DB: vlibrasvideo
17 DATABASE_HOST: db 17 DATABASE_HOST: db
18 - DATABASE_PASSWORD: d426ff41c6d096db6f033c89b17b403e 18 + DATABASE_PASSWORD:
19 DATABASE_USER: vlibrasuser 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/ 20 + DOMAIN_NAME: video.vlibras.gov.br
  21 + VLIBRAS_API: api.videos.vlibras.gov.br:8080
  22 + VLIBRAS_API_URL: http://api.videos.vlibras.gov.br:8080/api/
23 volumes: 23 volumes:
24 - portal_data:/vlibraslportal/ 24 - portal_data:/vlibraslportal/
25 - portal_logs:/myapp/log 25 - portal_logs:/myapp/log
@@ -32,8 +32,8 @@ services: @@ -32,8 +32,8 @@ services:
32 image: hub.docker.planejamento.gov.br/capgov/mysql:5.6 32 image: hub.docker.planejamento.gov.br/capgov/mysql:5.6
33 environment: 33 environment:
34 MYSQL_DATABASE: vlibrasvideo 34 MYSQL_DATABASE: vlibrasvideo
35 - MYSQL_PASSWORD: d426ff41c6d096db6f033c89b17b403e  
36 - MYSQL_ROOT_PASSWORD: iedeeb0ohj6eiphahSahroosh9jeiH 35 + MYSQL_PASSWORD:
  36 + MYSQL_ROOT_PASSWORD:
37 MYSQL_USER: vlibrasuser 37 MYSQL_USER: vlibrasuser
38 volumes: 38 volumes:
39 - portal_db:/var/lib/mysql 39 - portal_db:/var/lib/mysql
tradutor-docker.yml
  Diff comments   View file @4756f20
@@ -9,6 +9,9 @@ volumes: @@ -9,6 +9,9 @@ volumes:
9 core_db: 9 core_db:
10 external: true 10 external: true
11 driver: 'null' 11 driver: 'null'
  12 + tradutor_storage:
  13 + external: true
  14 + driver: 'null'
12 tradutor_bd: 15 tradutor_bd:
13 external: true 16 external: true
14 driver: 'null' 17 driver: 'null'
@@ -22,12 +25,15 @@ services: @@ -22,12 +25,15 @@ services:
22 volumes: 25 volumes:
23 - tradutor_rabbitmq:/var/lib/rabbitmq 26 - tradutor_rabbitmq:/var/lib/rabbitmq
24 api: 27 api:
25 - image: hub.docker.planejamento.gov.br/vlibras/tradutor:1.1.0 28 + image: hub.docker.planejamento.gov.br/vlibras/tradutor:1.1.1
26 volumes: 29 volumes:
27 - core_db:/home/vlibras/storage/ 30 - core_db:/home/vlibras/storage/
28 - tradutor_logs:/home/vlibras/translate-api/logs 31 - tradutor_logs:/home/vlibras/translate-api/logs
  32 + - tradutor_storage:/storage
29 links: 33 links:
30 - rabbit:rabbit 34 - rabbit:rabbit
31 - mongo:mongo 35 - mongo:mongo
  36 + ports:
  37 + - 8081:8080/tcp
32 labels: 38 labels:
33 io.rancher.container.pull_image: always 39 io.rancher.container.pull_image: always
tradutor-rancher.yml
  Diff comments   View file @4756f20
@@ -7,5 +7,5 @@ services: @@ -7,5 +7,5 @@ services:
7 scale: 1 7 scale: 1
8 start_on_create: true 8 start_on_create: true
9 api: 9 api:
10 - scale: 1 10 + scale: 2
11 start_on_create: true 11 start_on_create: true
video-docker.yml
  Diff comments   View file @4756f20
1 version: '2' 1 version: '2'
2 volumes: 2 volumes:
  3 + video_uploads:
  4 + external: true
  5 + driver: 'null'
3 video_bd: 6 video_bd:
4 external: true 7 external: true
5 driver: 'null' 8 driver: 'null'
@@ -25,14 +28,15 @@ services: @@ -25,14 +28,15 @@ services:
25 volumes: 28 volumes:
26 - videos_rabbitmq:/var/lib/rabbitmq 29 - videos_rabbitmq:/var/lib/rabbitmq
27 video: 30 video:
28 - image: hub.docker.planejamento.gov.br/vlibras/video_container:1.0.1 31 + image: hub.docker.planejamento.gov.br/vlibras/video_container:1.0.2
29 environment: 32 environment:
30 - VLIBRAS_VIDEO_IP: video.vlibras.preprod.nuvem.gov.br 33 + VLIBRAS_VIDEO_IP: api.videos.vlibras.gov.br
31 VLIBRAS_VIDEO_PORT: '8080' 34 VLIBRAS_VIDEO_PORT: '8080'
32 volumes: 35 volumes:
33 - core_storage:/storage/ 36 - core_storage:/storage/
34 - video_logs:/home/vlibras/vlibras-api/logsystem/logs 37 - video_logs:/home/vlibras/vlibras-api/logsystem/logs
35 - video_py_logs:/home/vlibras/log 38 - video_py_logs:/home/vlibras/log
  39 + - video_uploads:/home/vlibras/vlibras-api/uploads
36 links: 40 links:
37 - mongo:mongo 41 - mongo:mongo
38 - rabbit:rabbit 42 - rabbit:rabbit
wikilibras-docker.yml
  Diff comments   View file @4756f20
@@ -3,6 +3,9 @@ volumes: @@ -3,6 +3,9 @@ volumes:
3 wikilibras_blender: 3 wikilibras_blender:
4 external: true 4 external: true
5 driver: 'null' 5 driver: 'null'
  6 + wikilibras-wikilibrasdbapi_public:
  7 + external: true
  8 + driver: 'null'
6 wikilibras_mongodb: 9 wikilibras_mongodb:
7 external: true 10 external: true
8 driver: 'null' 11 driver: 'null'
@@ -47,7 +50,7 @@ volumes: @@ -47,7 +50,7 @@ volumes:
47 driver: 'null' 50 driver: 'null'
48 services: 51 services:
49 web: 52 web:
50 - image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.4 53 + image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.7
51 stdin_open: true 54 stdin_open: true
52 volumes: 55 volumes:
53 - wikilibras_postgresql:/var/lib/postgresql 56 - wikilibras_postgresql:/var/lib/postgresql
@@ -65,4 +68,5 @@ services: @@ -65,4 +68,5 @@ services:
65 - wikilibras-corretor_uploads:/home/vlibras/container/corretor_sinais/view/uploads 68 - wikilibras-corretor_uploads:/home/vlibras/container/corretor_sinais/view/uploads
66 - wikilibras-validador_uploads:/home/vlibras/container/validador_sinais/view/uploads 69 - wikilibras-validador_uploads:/home/vlibras/container/validador_sinais/view/uploads
67 - wikilibras-core_users:/home/vlibras/container/wikilibras-core/users 70 - wikilibras-core_users:/home/vlibras/container/wikilibras-core/users
  71 + - wikilibras-wikilibrasdbapi_public:/home/vlibras/container/wikilibrasdbapi/public/users
68 tty: true 72 tty: true
wikilibras-rancher.yml
  Diff comments   View file @4756f20
@@ -3,3 +3,13 @@ services: @@ -3,3 +3,13 @@ services:
3 web: 3 web:
4 scale: 1 4 scale: 1
5 start_on_create: true 5 start_on_create: true
  6 + health_check:
  7 + healthy_threshold: 2
  8 + response_timeout: 2000
  9 + port: 80
  10 + unhealthy_threshold: 3
  11 + initializing_timeout: 1800000
  12 + interval: 2000
  13 + strategy: recreate
  14 + request_line: GET "http://wiki.vlibras.gov.br/pybossa/project/wikilibras/newtask" "HTTP/1.0"
  15 + reinitializing_timeout: 60000