Merge pull request 'save' (#104) from Backend_Fix into main

Reviewed-on: #104
This commit was merged in pull request #104.
This commit is contained in:
2025-11-24 23:16:28 +00:00
4 changed files with 80 additions and 2 deletions
+2 -2
View File
@@ -7,8 +7,8 @@ WORKDIR /app
# Copy package files # Copy package files
COPY package.json package-lock.json* ./ COPY package.json package-lock.json* ./
# Install dependencies # Install dependencies (including devDependencies needed for build)
RUN npm ci --only=production RUN npm ci
# Copy source code # Copy source code
COPY . . COPY . .
@@ -0,0 +1,14 @@
{
"Servers": {
"1": {
"Name": "SerpentRace Production",
"Group": "Servers",
"Host": "postgres",
"Port": 5432,
"MaintenanceDB": "serpentrace",
"Username": "postgres",
"SSLMode": "prefer",
"Comment": "SerpentRace Production Database"
}
}
}
@@ -132,6 +132,45 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
# Redis Commander for internal administration
redis-commander:
image: rediscommander/redis-commander:latest
container_name: serpentrace-redis-commander-dev
restart: unless-stopped
ports:
- "8081:8081"
environment:
- REDIS_HOSTS=local:redis:6379
depends_on:
redis:
condition: service_healthy
networks:
- serpentrace-network
# Database administration tool for internal administration
pgadmin:
image: dpage/pgadmin4:latest
container_name: serpentrace-pgadmin
restart: unless-stopped
ports:
- "5050:80"
environment:
PGADMIN_DEFAULT_EMAIL: admin@serpentrace.dev
PGADMIN_DEFAULT_PASSWORD: admin
PGADMIN_CONFIG_SERVER_MODE: 'False'
PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
PGADMIN_CONFIG_WTF_CSRF_ENABLED: 'False'
volumes:
- pgadmin_data:/var/lib/pgadmin
- ./deployment/pgadmin_servers_deployment.json:/pgadmin4/servers.json:ro
depends_on:
postgres:
condition: service_healthy
networks:
- serpentrace-network
volumes: volumes:
postgres_data: postgres_data:
driver: local driver: local
@@ -141,6 +180,8 @@ volumes:
driver: local driver: local
backend_logs: backend_logs:
driver: local driver: local
pgadmin_data:
driver: local
networks: networks:
serpentrace-network: serpentrace-network:
+23
View File
@@ -116,6 +116,28 @@ git show main:SerpentRace_Docker/deployment/load-images.sh > SerpentRace_Docker\
echo [INFO] Copying SQL schema... echo [INFO] Copying SQL schema...
git show main:SerpentRace_Docker/deployment/sql_schema_only.sql > SerpentRace_Docker\deployment\sql_schema_only.sql 2>nul git show main:SerpentRace_Docker/deployment/sql_schema_only.sql > SerpentRace_Docker\deployment\sql_schema_only.sql 2>nul
echo [INFO] Copying pgAdmin configuration...
git show main:SerpentRace_Docker/deployment/pgadmin_servers_deployment.json > SerpentRace_Docker\deployment\pgadmin_servers_deployment.json 2>nul
if %errorlevel% neq 0 (
echo [WARN] pgadmin_servers_deployment.json not found in main, creating default...
(
echo {
echo "Servers": {
echo "1": {
echo "Name": "SerpentRace Production",
echo "Group": "Servers",
echo "Host": "postgres",
echo "Port": 5432,
echo "MaintenanceDB": "serpentrace",
echo "Username": "postgres",
echo "SSLMode": "prefer",
echo "Comment": "SerpentRace Production Database"
echo }
echo }
echo }
) > SerpentRace_Docker\deployment\pgadmin_servers_deployment.json
)
echo. echo.
echo [INFO] Step 3/7: Building Docker images from main branch... echo [INFO] Step 3/7: Building Docker images from main branch...
@@ -218,6 +240,7 @@ REM Create deployment info file
echo - load-images.sh echo - load-images.sh
echo - README.md echo - README.md
echo - sql_schema_only.sql echo - sql_schema_only.sql
echo - pgadmin_servers_deployment.json
echo. echo.
echo To deploy: echo To deploy:
echo 1. Copy the entire SerpentRace_Docker/deployment folder to your server echo 1. Copy the entire SerpentRace_Docker/deployment folder to your server