diff --git a/external-lb-docker.yml b/external-lb-docker.yml index d63c561..ebe6405 100644 --- a/external-lb-docker.yml +++ b/external-lb-docker.yml @@ -4,9 +4,10 @@ services: image: rancher/lb-service-haproxy:v0.6.2 ports: - 80:80/tcp - - 8080:8080/tcp - 200:200/tcp - 201:201/tcp + - 8080:8080/tcp + - 53306:53306/tcp labels: io.rancher.container.agent.role: environmentAdmin io.rancher.container.create_agent: 'true' diff --git a/external-lb-rancher.yml b/external-lb-rancher.yml index 496dacf..c39e4de 100644 --- a/external-lb-rancher.yml +++ b/external-lb-rancher.yml @@ -5,64 +5,80 @@ services: lb_config: certs: [] port_rules: - - hostname: video.vlibras.preprod.nuvem.gov.br - priority: 12 + - hostname: video.vlibras.gov.br + priority: 1 protocol: http - service: video/video + service: video-portal/web source_port: 80 target_port: 8080 - - hostname: vlibras.preprod.nuvem.gov.br - priority: 13 + - hostname: wiki.vlibras.gov.br + priority: 7 protocol: http - service: portal/web + service: wikilibras/web source_port: 80 - target_port: 8080 - - hostname: traducao.vlibras.preprod.nuvem.gov.br - priority: 14 + target_port: 80 + - hostname: wiki.vlibras.gov.br + path: '' + priority: 8 protocol: http - service: traducao/api - source_port: 80 + service: wikilibras/web + source_port: 200 + target_port: 200 + - hostname: wiki.vlibras.gov.br + priority: 9 + protocol: http + service: wikilibras/web + source_port: 201 + target_port: 201 + - hostname: api.videos.vlibras.gov.br + path: '' + priority: 10 + protocol: http + service: video/video + source_port: 8080 target_port: 8080 - - hostname: dicionario.vlibras.preprod.nuvem.gov.br - priority: 15 + - hostname: api.videos.vlibras.gov.br + priority: 11 protocol: http - service: traducao/api + service: video/video source_port: 80 target_port: 8080 - - hostname: video.vlibras.preprod.nuvem.gov.br - path: '' - priority: 16 + - priority: 12 protocol: http - service: video/video + service: video-portal/web source_port: 80 target_port: 8080 - - hostname: video.vlibras.preprod.nuvem.gov.br - priority: 17 + - priority: 13 protocol: http service: video/video source_port: 8080 target_port: 8080 - - hostname: wiki.vlibras.preprod.nuvem.gov.br - priority: 18 + - hostname: dicionario.vlibras.gov.br + priority: 15 protocol: http - service: wikilibras/web + service: Tradutor/api source_port: 80 - target_port: 80 - - hostname: wiki.vlibras.preprod.nuvem.gov.br - priority: 19 + target_port: 8080 + - hostname: traducao.vlibras.gov.br + priority: 16 protocol: http - service: wikilibras/web - source_port: 200 - target_port: 200 - - hostname: wiki.vlibras.preprod.nuvem.gov.br - priority: 20 + service: Tradutor/api + source_port: 80 + target_port: 8080 + - priority: 17 + protocol: tcp + service: video-portal/db + source_port: 53306 + target_port: 3306 + - hostname: dicionario.vlibras.gov.br + priority: 18 protocol: http - service: wikilibras/web - source_port: 201 - target_port: 201 + service: video/rabbit + source_port: 8080 + target_port: 15672 stickiness_policy: cookie: lb-vlibras - domain: vlibras.preprod.nuvem.gov.br + domain: video.vlibras.gov.br indirect: false mode: insert nocache: false diff --git a/portal-docker.yml b/portal-docker.yml index b18525e..bec3280 100644 --- a/portal-docker.yml +++ b/portal-docker.yml @@ -11,15 +11,15 @@ volumes: driver: 'null' services: web: - image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.2 + image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.3 environment: DATABASE_DB: vlibrasvideo DATABASE_HOST: db - DATABASE_PASSWORD: d426ff41c6d096db6f033c89b17b403e + DATABASE_PASSWORD: DATABASE_USER: vlibrasuser - DOMAIN_NAME: vlibras.preprod.nuvem.gov.br - VLIBRAS_API: video.vlibras.preprod.nuvem.gov.br:80 - VLIBRAS_API_URL: http://video.vlibras.preprod.nuvem.gov.br/api/ + DOMAIN_NAME: video.vlibras.gov.br + VLIBRAS_API: api.videos.vlibras.gov.br:8080 + VLIBRAS_API_URL: http://api.videos.vlibras.gov.br:8080/api/ volumes: - portal_data:/vlibraslportal/ - portal_logs:/myapp/log @@ -32,8 +32,8 @@ services: image: hub.docker.planejamento.gov.br/capgov/mysql:5.6 environment: MYSQL_DATABASE: vlibrasvideo - MYSQL_PASSWORD: d426ff41c6d096db6f033c89b17b403e - MYSQL_ROOT_PASSWORD: iedeeb0ohj6eiphahSahroosh9jeiH + MYSQL_PASSWORD: + MYSQL_ROOT_PASSWORD: MYSQL_USER: vlibrasuser volumes: - portal_db:/var/lib/mysql diff --git a/tradutor-docker.yml b/tradutor-docker.yml index 604ac34..df35c29 100644 --- a/tradutor-docker.yml +++ b/tradutor-docker.yml @@ -9,6 +9,9 @@ volumes: core_db: external: true driver: 'null' + tradutor_storage: + external: true + driver: 'null' tradutor_bd: external: true driver: 'null' @@ -22,12 +25,15 @@ services: volumes: - tradutor_rabbitmq:/var/lib/rabbitmq api: - image: hub.docker.planejamento.gov.br/vlibras/tradutor:1.1.0 + image: hub.docker.planejamento.gov.br/vlibras/tradutor:1.1.1 volumes: - core_db:/home/vlibras/storage/ - tradutor_logs:/home/vlibras/translate-api/logs + - tradutor_storage:/storage links: - rabbit:rabbit - mongo:mongo + ports: + - 8081:8080/tcp labels: io.rancher.container.pull_image: always diff --git a/tradutor-rancher.yml b/tradutor-rancher.yml index 62fd244..9d5d57f 100644 --- a/tradutor-rancher.yml +++ b/tradutor-rancher.yml @@ -7,5 +7,5 @@ services: scale: 1 start_on_create: true api: - scale: 1 + scale: 2 start_on_create: true diff --git a/video-docker.yml b/video-docker.yml index 77f18bd..d0504a0 100644 --- a/video-docker.yml +++ b/video-docker.yml @@ -1,5 +1,8 @@ version: '2' volumes: + video_uploads: + external: true + driver: 'null' video_bd: external: true driver: 'null' @@ -25,14 +28,15 @@ services: volumes: - videos_rabbitmq:/var/lib/rabbitmq video: - image: hub.docker.planejamento.gov.br/vlibras/video_container:1.0.1 + image: hub.docker.planejamento.gov.br/vlibras/video_container:1.0.2 environment: - VLIBRAS_VIDEO_IP: video.vlibras.preprod.nuvem.gov.br + VLIBRAS_VIDEO_IP: api.videos.vlibras.gov.br VLIBRAS_VIDEO_PORT: '8080' volumes: - core_storage:/storage/ - video_logs:/home/vlibras/vlibras-api/logsystem/logs - video_py_logs:/home/vlibras/log + - video_uploads:/home/vlibras/vlibras-api/uploads links: - mongo:mongo - rabbit:rabbit diff --git a/wikilibras-docker.yml b/wikilibras-docker.yml index 0f8520b..8509c30 100644 --- a/wikilibras-docker.yml +++ b/wikilibras-docker.yml @@ -3,6 +3,9 @@ volumes: wikilibras_blender: external: true driver: 'null' + wikilibras-wikilibrasdbapi_public: + external: true + driver: 'null' wikilibras_mongodb: external: true driver: 'null' @@ -47,7 +50,7 @@ volumes: driver: 'null' services: web: - image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.4 + image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.7 stdin_open: true volumes: - wikilibras_postgresql:/var/lib/postgresql @@ -65,4 +68,5 @@ services: - wikilibras-corretor_uploads:/home/vlibras/container/corretor_sinais/view/uploads - wikilibras-validador_uploads:/home/vlibras/container/validador_sinais/view/uploads - wikilibras-core_users:/home/vlibras/container/wikilibras-core/users + - wikilibras-wikilibrasdbapi_public:/home/vlibras/container/wikilibrasdbapi/public/users tty: true diff --git a/wikilibras-rancher.yml b/wikilibras-rancher.yml index fa1579d..734fec6 100644 --- a/wikilibras-rancher.yml +++ b/wikilibras-rancher.yml @@ -3,3 +3,13 @@ services: web: scale: 1 start_on_create: true + health_check: + healthy_threshold: 2 + response_timeout: 2000 + port: 80 + unhealthy_threshold: 3 + initializing_timeout: 1800000 + interval: 2000 + strategy: recreate + request_line: GET "http://wiki.vlibras.gov.br/pybossa/project/wikilibras/newtask" "HTTP/1.0" + reinitializing_timeout: 60000 -- libgit2 0.21.2