From bbc2b8a3960e89e65d506f2f59429481779b9dfc Mon Sep 17 00:00:00 2001 From: AdsonCicilioti Date: Sat, 26 Aug 2023 00:29:58 -0300 Subject: [PATCH 1/5] clean: declarative bridge network instead shellscript check --- docker-compose.yaml.example | 4 ++-- docker-compose.yaml.example.complete | 4 ++-- docker-compose.yaml.example.dockerhub | 4 ++-- docker.sh | 9 +-------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index 93e04cc0..b3981999 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -24,5 +24,5 @@ volumes: networks: evolution-net: - external: true - \ No newline at end of file + name: evolution-net + driver: bridge diff --git a/docker-compose.yaml.example.complete b/docker-compose.yaml.example.complete index 4e453b51..790c6289 100644 --- a/docker-compose.yaml.example.complete +++ b/docker-compose.yaml.example.complete @@ -75,5 +75,5 @@ volumes: networks: evolution-net: - external: true - \ No newline at end of file + name: evolution-net + driver: bridge diff --git a/docker-compose.yaml.example.dockerhub b/docker-compose.yaml.example.dockerhub index 6136997d..562d1b07 100644 --- a/docker-compose.yaml.example.dockerhub +++ b/docker-compose.yaml.example.dockerhub @@ -24,5 +24,5 @@ volumes: networks: evolution-net: - external: true - \ No newline at end of file + name: evolution-net + driver: bridge diff --git a/docker.sh b/docker.sh index d72e56dd..579312b3 100755 --- a/docker.sh +++ b/docker.sh @@ -1,13 +1,6 @@ #!/bin/bash - -NET='evolution-net' IMAGE='evolution/api:local' -if !(docker network ls | grep ${NET} > /dev/null) -then - docker network create -d bridge ${NET} -fi - docker build -t ${IMAGE} . -docker compose up -d \ No newline at end of file +docker compose up -d From c9721d7bc9c623dc943a15e6e924330d5b3d7b9a Mon Sep 17 00:00:00 2001 From: AdsonCicilioti Date: Sat, 26 Aug 2023 02:36:45 -0300 Subject: [PATCH 2/5] clean: `docker build` will be remove in future releases / build into compose file --- docker-compose.yaml.example | 1 + docker-compose.yaml.example.complete | 1 + docker.sh | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100755 docker.sh diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index b3981999..d0a75a5d 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -4,6 +4,7 @@ services: api: container_name: evolution_api image: evolution/api:local + build: . restart: always ports: - 8080:8080 diff --git a/docker-compose.yaml.example.complete b/docker-compose.yaml.example.complete index 790c6289..de13de57 100644 --- a/docker-compose.yaml.example.complete +++ b/docker-compose.yaml.example.complete @@ -4,6 +4,7 @@ services: api: container_name: evolution_api image: evolution/api:local + build: . restart: always ports: - 8080:8080 diff --git a/docker.sh b/docker.sh deleted file mode 100755 index 579312b3..00000000 --- a/docker.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -IMAGE='evolution/api:local' - -docker build -t ${IMAGE} . - -docker compose up -d From adb43ec5b3b041e835c764f3e2ae53778c54416c Mon Sep 17 00:00:00 2001 From: AdsonCicilioti Date: Sat, 26 Aug 2023 02:53:02 -0300 Subject: [PATCH 3/5] clean: correct docker network declaration --- Docker/mongodb/docker-compose.yaml | 5 +++-- Docker/redis/docker-compose.yaml | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Docker/mongodb/docker-compose.yaml b/Docker/mongodb/docker-compose.yaml index 698ca50c..01220c54 100644 --- a/Docker/mongodb/docker-compose.yaml +++ b/Docker/mongodb/docker-compose.yaml @@ -35,7 +35,8 @@ volumes: evolution_mongodb_data: evolution_mongodb_configdb: + networks: evolution-net: - external: true - \ No newline at end of file + name: evolution-net + driver: bridge diff --git a/Docker/redis/docker-compose.yaml b/Docker/redis/docker-compose.yaml index b0bb5985..297b11db 100644 --- a/Docker/redis/docker-compose.yaml +++ b/Docker/redis/docker-compose.yaml @@ -5,17 +5,17 @@ services: image: redis:latest container_name: redis command: > - redis-server - --port 6379 - --appendonly yes + redis-server --port 6379 --appendonly yes volumes: - evolution_redis:/data ports: - 6379:6379 - + volumes: evolution_redis: + networks: evolution-net: - external: true + name: evolution-net + driver: bridge From 91c7b4f2cd5eb08925e37ce6b1be3f16ecb4b34c Mon Sep 17 00:00:00 2001 From: Alan Mosko Date: Mon, 28 Aug 2023 09:59:04 -0300 Subject: [PATCH 4/5] =?UTF-8?q?Corre=C3=A7=C3=A3o=20DEL=5FINSTANCE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/env.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/env.config.ts b/src/config/env.config.ts index 4f28dbd5..db425c17 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -225,7 +225,7 @@ export class ConfigService { BAILEYS: (process.env?.LOG_BAILEYS as LogBaileys) || 'error', }, DEL_INSTANCE: isBooleanString(process.env?.DEL_INSTANCE) - ? process.env.DEL_INSTANCE === 'true' + ? process.env.DEL_INSTANCE === 5 : Number.parseInt(process.env.DEL_INSTANCE) || false, WEBHOOK: { GLOBAL: { From 92632b2b96f16a25090c30ac2bfe9344422ab4c8 Mon Sep 17 00:00:00 2001 From: Alan Mosko Date: Tue, 29 Aug 2023 14:29:50 -0300 Subject: [PATCH 5/5] wip --- Docker/.env.example | 4 ++-- Dockerfile | 2 +- src/config/env.config.ts | 2 +- src/dev-env.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Docker/.env.example b/Docker/.env.example index bf21a71c..739d24c0 100644 --- a/Docker/.env.example +++ b/Docker/.env.example @@ -84,8 +84,8 @@ WEBHOOK_EVENTS_NEW_JWT_TOKEN=false # Name that will be displayed on smartphone connection CONFIG_SESSION_PHONE_CLIENT=EvolutionAPI -# Browser Name = chrome | firefox | edge | opera | safari -CONFIG_SESSION_PHONE_NAME=chrome +# Browser Name = Chrome | Firefox | Edge | Opera | Safari +CONFIG_SESSION_PHONE_NAME=Chrome # Set qrcode display limit QRCODE_LIMIT=30 diff --git a/Dockerfile b/Dockerfile index c9975782..2a241a1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,7 +85,7 @@ ENV WEBHOOK_EVENTS_CALL=true ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false ENV CONFIG_SESSION_PHONE_CLIENT=EvolutionAPI -ENV CONFIG_SESSION_PHONE_NAME=chrome +ENV CONFIG_SESSION_PHONE_NAME=Chrome ENV QRCODE_LIMIT=30 ENV QRCODE_COLOR=#198754 diff --git a/src/config/env.config.ts b/src/config/env.config.ts index db425c17..85e5ee70 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -259,7 +259,7 @@ export class ConfigService { }, CONFIG_SESSION_PHONE: { CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT || 'Evolution API', - NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'chrome', + NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'Chrome', }, QRCODE: { LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30, diff --git a/src/dev-env.yml b/src/dev-env.yml index 235ec1b7..66a65ef4 100644 --- a/src/dev-env.yml +++ b/src/dev-env.yml @@ -124,7 +124,7 @@ WEBHOOK: CONFIG_SESSION_PHONE: # Name that will be displayed on smartphone connection CLIENT: "Evolution API" - NAME: chrome # chrome | firefox | edge | opera | safari + NAME: Chrome # Chrome | Firefox | Edge | Opera | Safari # Set qrcode display limit QRCODE: