diff --git a/external-lb-docker.yml b/external-lb-docker.yml index 48835af..d63c561 100644 --- a/external-lb-docker.yml +++ b/external-lb-docker.yml @@ -5,6 +5,8 @@ services: ports: - 80:80/tcp - 8080:8080/tcp + - 200:200/tcp + - 201:201/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 9d28afa..496dacf 100644 --- a/external-lb-rancher.yml +++ b/external-lb-rancher.yml @@ -5,30 +5,64 @@ services: lb_config: certs: [] port_rules: - - path: /translate - priority: 1 + - hostname: video.vlibras.preprod.nuvem.gov.br + priority: 12 protocol: http - service: tradutor/api + service: video/video + source_port: 80 + target_port: 8080 + - hostname: vlibras.preprod.nuvem.gov.br + priority: 13 + protocol: http + service: portal/web + source_port: 80 + target_port: 8080 + - hostname: traducao.vlibras.preprod.nuvem.gov.br + priority: 14 + protocol: http + service: traducao/api source_port: 80 target_port: 8080 - - path: /video - priority: 2 + - hostname: dicionario.vlibras.preprod.nuvem.gov.br + priority: 15 protocol: http - service: tradutor/api + service: traducao/api source_port: 80 target_port: 8080 - - priority: 3 + - hostname: video.vlibras.preprod.nuvem.gov.br + path: '' + priority: 16 + protocol: http + service: video/video + source_port: 80 + target_port: 8080 + - hostname: video.vlibras.preprod.nuvem.gov.br + priority: 17 protocol: http service: video/video source_port: 8080 target_port: 8080 - - priority: 4 + - hostname: wiki.vlibras.preprod.nuvem.gov.br + priority: 18 protocol: http - service: portal/web + service: wikilibras/web source_port: 80 - target_port: 8080 + target_port: 80 + - hostname: wiki.vlibras.preprod.nuvem.gov.br + priority: 19 + protocol: http + service: wikilibras/web + source_port: 200 + target_port: 200 + - hostname: wiki.vlibras.preprod.nuvem.gov.br + priority: 20 + protocol: http + service: wikilibras/web + source_port: 201 + target_port: 201 stickiness_policy: cookie: lb-vlibras + domain: vlibras.preprod.nuvem.gov.br indirect: false mode: insert nocache: false @@ -39,3 +73,4 @@ services: port: 42 unhealthy_threshold: 3 interval: 2000 + strategy: recreate diff --git a/portal-docker.yml b/portal-docker.yml index 911e79b..b18525e 100644 --- a/portal-docker.yml +++ b/portal-docker.yml @@ -11,27 +11,23 @@ volumes: driver: 'null' services: web: - image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.1 + image: hub.docker.planejamento.gov.br/vlibras/portal:1.0.2 environment: - DOMAIN_NAME: vlibras.preprod.nuvem.gov.br:80 - VLIBRAS_API: video.vlibras.preprod.nuvem.gov.br:80 - VLIBRAS_API_URL: http://video.vlibras.preprod.nuvem.gov.br/api/ + DATABASE_DB: vlibrasvideo DATABASE_HOST: db - DATABASE_USER: vlibrasuser DATABASE_PASSWORD: d426ff41c6d096db6f033c89b17b403e - DATABASE_DB: vlibrasvideo + 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/ volumes: - portal_data:/vlibraslportal/ - portal_logs:/myapp/log links: - - redis:redis - db:db + - redis:redis labels: io.rancher.container.pull_image: always - redis: - image: hub.docker.planejamento.gov.br/capgov/redis:3.2.8 - command: - - /etc/redis/redis.conf db: image: hub.docker.planejamento.gov.br/capgov/mysql:5.6 environment: @@ -41,3 +37,9 @@ services: MYSQL_USER: vlibrasuser volumes: - portal_db:/var/lib/mysql + command: + - --general-log=1 + redis: + image: hub.docker.planejamento.gov.br/capgov/redis:3.2.8 + command: + - /etc/redis/redis.conf diff --git a/portal-rancher.yml b/portal-rancher.yml index 79ec6e7..632402c 100644 --- a/portal-rancher.yml +++ b/portal-rancher.yml @@ -3,9 +3,9 @@ services: web: scale: 1 start_on_create: true - redis: + db: scale: 1 start_on_create: true - db: + redis: scale: 1 start_on_create: true diff --git a/tradutor-docker.yml b/tradutor-docker.yml index 8be4520..604ac34 100644 --- a/tradutor-docker.yml +++ b/tradutor-docker.yml @@ -3,13 +3,13 @@ volumes: tradutor_logs: external: true driver: 'null' - tradutor_bd: + tradutor_rabbitmq: external: true driver: 'null' core_db: external: true driver: 'null' - tradutor_rabbitmq: + tradutor_bd: external: true driver: 'null' services: @@ -27,7 +27,7 @@ services: - core_db:/home/vlibras/storage/ - tradutor_logs:/home/vlibras/translate-api/logs links: - - mongo:mongo - rabbit:rabbit + - mongo:mongo labels: io.rancher.container.pull_image: always diff --git a/video-docker.yml b/video-docker.yml index 541113f..77f18bd 100644 --- a/video-docker.yml +++ b/video-docker.yml @@ -1,6 +1,6 @@ version: '2' volumes: - videos_bd: + video_bd: external: true driver: 'null' videos_rabbitmq: @@ -12,11 +12,14 @@ volumes: video_logs: external: true driver: 'null' + video_py_logs: + external: true + driver: 'null' services: mongo: image: hub.docker.planejamento.gov.br/capgov/mongodb volumes: - - videos_bd:/data/db + - video_bd:/data/db rabbit: image: hub.docker.planejamento.gov.br/capgov/rabbitmq:3.6.9-1-management volumes: @@ -29,7 +32,7 @@ services: volumes: - core_storage:/storage/ - video_logs:/home/vlibras/vlibras-api/logsystem/logs - - vide_py_logs:/home/vlibras/log + - video_py_logs:/home/vlibras/log links: - mongo:mongo - rabbit:rabbit diff --git a/wikilibras-docker.yml b/wikilibras-docker.yml new file mode 100644 index 0000000..0f8520b --- /dev/null +++ b/wikilibras-docker.yml @@ -0,0 +1,68 @@ +version: '2' +volumes: + wikilibras_blender: + external: true + driver: 'null' + wikilibras_mongodb: + external: true + driver: 'null' + wikilibras-corretor_videos: + external: true + driver: 'null' + wikilibras-validador_videos: + external: true + driver: 'null' + wikilibras-wikilibrasv2_videos: + external: true + driver: 'null' + wikilibras_redis: + external: true + driver: 'null' + wikilibras-corretor_uploads: + external: true + driver: 'null' + wikilibras-wikilibrasv2_uploads: + external: true + driver: 'null' + wikilibras-core_users: + external: true + driver: 'null' + wikilibras_sinais: + external: true + driver: 'null' + wikilibras_avatar: + external: true + driver: 'null' + wikilibras_uploads: + external: true + driver: 'null' + wikilibras-validador_uploads: + external: true + driver: 'null' + wikilibras_apache2_logs: + external: true + driver: 'null' + wikilibras_postgresql: + external: true + driver: 'null' +services: + web: + image: hub.docker.planejamento.gov.br/vlibras/wikilibras:1.0.4 + stdin_open: true + volumes: + - wikilibras_postgresql:/var/lib/postgresql + - wikilibras_mongodb:/var/lib/mongodb + - wikilibras_redis:/var/lib/redis + - wikilibras_blender:/home/vlibras/container/wikilibrasdbapi/blender + - wikilibras_sinais:/home/vlibras/container/wikilibrasdbapi/sinais + - wikilibras_avatar:/home/vlibras/container/wikilibrasdbapi/avatar + - wikilibras_uploads:/home/vlibras/container/wikilibrasdbapi/uploads + - wikilibras_apache2_logs:/var/log/apache2 + - wikilibras-wikilibrasv2_videos:/home/vlibras/container/wikilibrasV2/view/videos + - wikilibras-corretor_videos:/home/vlibras/container/corretor_sinais/view/videos + - wikilibras-validador_videos:/home/vlibras/container/validador_sinais/view/videos + - wikilibras-wikilibrasv2_uploads:/home/vlibras/container/wikilibrasV2/view/uploads + - 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 + tty: true diff --git a/wikilibras-rancher.yml b/wikilibras-rancher.yml new file mode 100644 index 0000000..fa1579d --- /dev/null +++ b/wikilibras-rancher.yml @@ -0,0 +1,5 @@ +version: '2' +services: + web: + scale: 1 + start_on_create: true -- libgit2 0.21.2