Skip to content

Commit

Permalink
Merge pull request EvolutionAPI#866 from EvolutionAPI/revert-862-v2-f…
Browse files Browse the repository at this point in the history
…ix-chatwoot-reply-quote

Revert "V2 fix chatwoot reply quote"
  • Loading branch information
DavidsonGomes authored Sep 5, 2024
2 parents 2c7288e + ff78954 commit 49410d7
Show file tree
Hide file tree
Showing 9 changed files with 389 additions and 1,433 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ DEL_INSTANCE=false

# Provider: postgresql | mysql
DATABASE_PROVIDER=postgresql
# DATABASE_DIRECT_URL='' # Direct connection to the database
DATABASE_CONNECTION_URI='postgresql://user:pass@localhost:5432/evolution?schema=public'
# Client name for the database connection
# It is used to separate an API installation from another that uses the same database.
Expand Down
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
"prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma",
"i18n-ally.localesPaths": [
"store/messages"
],
"typescript.tsdk": "node_modules/typescript/lib"
]
}
Binary file removed bun.lockb
Binary file not shown.
38 changes: 11 additions & 27 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,23 @@
version: '3.3'

services:
redis:
image: redis:latest
container_name: redis
command: >
redis-server --port 6379 --appendonly yes
networks:
- evolution-net
volumes:
- evolution_redis:/data
ports:
- 6379:6379
expose:
- 6379

postgres:
container_name: postgres
image: postgres:15
networks:
- evolution-net
command: ["postgres", "-c", "max_connections=1000"]
api:
container_name: evolution_api
image: atendai/evolution-api:v2.0.9-rc
restart: always
ports:
- 5432:5432
environment:
- POSTGRES_PASSWORD=PASSWORD
- 8080:8080
volumes:
- postgres_data:/var/lib/postgresql/data
- evolution_instances:/evolution/instances
networks:
- evolution-net
env_file:
- .env
expose:
- 5432
- 8080

volumes:
postgres_data:
evolution_redis:
evolution_instances:

networks:
evolution-net:
Expand Down
Loading

0 comments on commit 49410d7

Please sign in to comment.