Merge branch 'feature/Bug-fixing-round-after-containerization' into develop

This commit is contained in:
Josako
2024-06-28 14:56:53 +02:00
19 changed files with 285 additions and 129 deletions

BIN
docker/.DS_Store vendored

Binary file not shown.

View File

@@ -39,6 +39,7 @@ services:
- ../migrations:/app/migrations
- ../scripts:/app/scripts
- ./logs:/app/logs
- ./tenant_files:/app/tenant_files
depends_on:
db:
condition: service_healthy
@@ -66,6 +67,7 @@ services:
- ../config:/app/config
- ../scripts:/app/scripts
- ./logs:/app/logs
- ./tenant_files:/app/tenant_files
depends_on:
db:
condition: service_healthy
@@ -103,6 +105,7 @@ services:
interval: 10s
timeout: 5s
retries: 5
command: ["sh", "-c", "scripts/start_eveai_chat.sh"]
eveai_chat_workers:
build:
@@ -162,9 +165,10 @@ services:
interval: 10s
timeout: 5s
retries: 5
volumes:
db-data:
redis-data:
#volumes:
# db-data:
# redis-data:
# tenant-files:
#secrets:
# db-password:
# file: ./db/password.txt

BIN
docker/db/.DS_Store vendored

Binary file not shown.

29
docker/reload-nginx.sh Executable file
View File

@@ -0,0 +1,29 @@
#!/bin/bash
# Check if the service name is provided
if [ -z "$1" ]; then
echo "Usage: $0 <service_name>"
exit 1
fi
SERVICE_NAME=$1
# Get the container ID of the service
CONTAINER_ID=$(docker-compose ps -q $SERVICE_NAME)
# Check if the container ID is found
if [ -z "$CONTAINER_ID" ]; then
echo "Service $SERVICE_NAME not found or not running."
exit 1
fi
# Reload Nginx inside the container
docker exec $CONTAINER_ID nginx -s reload
# Output the result
if [ $? -eq 0 ]; then
echo "Nginx reloaded successfully in $SERVICE_NAME."
else
echo "Failed to reload Nginx in $SERVICE_NAME."
exit 1
fi