diff --git a/Docker/.env.example b/Docker/.env.example index 847f6ef1..88be79fe 100644 --- a/Docker/.env.example +++ b/Docker/.env.example @@ -92,8 +92,8 @@ WEBHOOK_EVENTS_ERRORS_WEBHOOK= # 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/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 diff --git a/Dockerfile b/Dockerfile index 6959ea30..df4b3176 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,7 +93,7 @@ ENV WEBHOOK_EVENTS_ERRORS=false ENV WEBHOOK_EVENTS_ERRORS_WEBHOOK= 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/docker-compose.yaml.example b/docker-compose.yaml.example index 93e04cc0..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 @@ -24,5 +25,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..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 @@ -75,5 +76,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 deleted file mode 100755 index d72e56dd..00000000 --- a/docker.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 diff --git a/src/config/env.config.ts b/src/config/env.config.ts index 94f67a7f..070e7279 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -239,7 +239,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: { @@ -278,7 +278,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 7f686cb1..e670f1ec 100644 --- a/src/dev-env.yml +++ b/src/dev-env.yml @@ -132,7 +132,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: