From debb4cb110b5f1dedcc86814065b100a06a07e0b Mon Sep 17 00:00:00 2001
From: MingxuanGame <MingxuanGame@outlook.com>
Date: Sun, 24 Aug 2025 16:43:06 +0000
Subject: [PATCH] deploy(docker): update configuration

---
 .env.example             | 14 +++++++++++---
 Dockerfile-osurx         |  2 +-
 docker-compose-osurx.yml | 20 +++-----------------
 docker-compose.yml       | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/.env.example b/.env.example
index 1f9ee5c..4431f20 100644
--- a/.env.example
+++ b/.env.example
@@ -118,7 +118,15 @@ STORAGE_SERVICE="local"
 #   "s3_region_name": "us-east-1",
 #   "s3_public_url_base": "https://your-custom
 
-# 启用资源代理功能
+# Asset Proxy
 ENABLE_ASSET_PROXY=true
-# 自定义资源域名
-CUSTOM_ASSET_DOMAIN=assets-ppy.g0v0.top
\ No newline at end of file
+CUSTOM_ASSET_DOMAIN=g0v0.top
+ASSET_PROXY_PREFIX=assets-ppy
+AVATAR_PROXY_PREFIX=a-ppy
+BEATMAP_PROXY_PREFIX=b-ppy
+
+# Spectator Server
+SAVE_REPLAYS=0
+REDIS_HOST=localhost
+SHARED_INTEROP_DOMAIN=http://localhost:8000
+SERVER_PORT=8006
diff --git a/Dockerfile-osurx b/Dockerfile-osurx
index 93a08b8..e50b797 100644
--- a/Dockerfile-osurx
+++ b/Dockerfile-osurx
@@ -40,7 +40,7 @@ RUN mkdir -p /app/logs
 VOLUME ["/app/logs"]
 
 COPY docker-entrypoint.sh /app/docker-entrypoint.sh
-RUN sed -i 's/\r$//' /app/docker-entrypoint.sh && chmod +x /app/docker-entrypoint.sh
+RUN chmod +x /app/docker-entrypoint.sh
 
 EXPOSE 8000
 
diff --git a/docker-compose-osurx.yml b/docker-compose-osurx.yml
index c3beaeb..97fbc23 100644
--- a/docker-compose-osurx.yml
+++ b/docker-compose-osurx.yml
@@ -17,7 +17,6 @@ services:
       - ENABLE_ALL_MODS_PP=true
       - ENABLE_SUPPORTER_FOR_ALL_USERS=true
       - ENABLE_ALL_BEATMAP_LEADERBOARD=true
-      - NEW_RELIC_ENVIRONMENT=production
     env_file:
       - .env
     depends_on:
@@ -76,33 +75,20 @@ services:
     command: redis-server --appendonly yes
 
   spectator:
-    image:  ghcr.io/googuteam/osu-server-spectator:sha-b94d1c4
+    image:  ghcr.io/googuteam/osu-server-spectator:latest
     pull_policy: never
     environment:
       - SAVE_REPLAYS=${SAVE_REPLAYS:-}
       - REPLAY_UPLOAD_THREADS=${REPLAY_UPLOAD_THREADS:-1}
-      - REPLAYS_PATH=${REPLAYS_PATH:-replays}
-      - S3_KEY=${S3_KEY:-}
-      - S3_SECRET=${S3_SECRET:-}
-      - REPLAYS_BUCKET=${REPLAYS_BUCKET:-}
       - TRACK_BUILD_USER_COUNTS=${TRACK_BUILD_USER_COUNTS:-}
       - SERVER_PORT=${SERVER_PORT:-80}
       - REDIS_HOST=redis
-      - DD_AGENT_HOST=${DD_AGENT_HOST:-localhost}
-      - DB_HOST=mysql
-      - DB_PORT=3306
-      - DB_USER=${MYSQL_USER}
-      - DB_PASSWORD=${MYSQL_PASSWORD}
-      - DB_NAME=${MYSQL_DATABASE}
       - SENTRY_DSN=${SENTRY_DSN:-}
       - SHARED_INTEROP_DOMAIN=http://app:8000
       - SHARED_INTEROP_SECRET=${SHARED_INTEROP_SECRET:-}
       - JWT_SECRET_KEY=${JWT_SECRET_KEY}
-      - USE_LEGACY_RSA_AUTH=0
     env_file:
       - .env
-    volumes:
-      - ./replays:/app/replays
     depends_on:
       - app
       - mysql
@@ -112,7 +98,7 @@ services:
       - osu-network
 
   nginx:
-    image: docker.1ms.run/nginx:1.25-alpine
+    image: nginx:1.25-alpine
     ports:
       - "8000:80"
     volumes:
@@ -127,4 +113,4 @@ volumes:
 
 networks:
   osu-network:
-    driver: bridge
\ No newline at end of file
+    driver: bridge
diff --git a/docker-compose.yml b/docker-compose.yml
index 19e81fe..3785685 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,6 +51,39 @@ services:
     networks:
       - osu-network
 
+  spectator:
+    image:  ghcr.io/googuteam/osu-server-spectator:latest
+    pull_policy: never
+    environment:
+      - SAVE_REPLAYS=${SAVE_REPLAYS:-}
+      - REPLAY_UPLOAD_THREADS=${REPLAY_UPLOAD_THREADS:-1}
+      - TRACK_BUILD_USER_COUNTS=${TRACK_BUILD_USER_COUNTS:-}
+      - SERVER_PORT=${SERVER_PORT:-80}
+      - REDIS_HOST=redis
+      - SENTRY_DSN=${SENTRY_DSN:-}
+      - SHARED_INTEROP_DOMAIN=http://app:8000
+      - SHARED_INTEROP_SECRET=${SHARED_INTEROP_SECRET:-}
+      - JWT_SECRET_KEY=${JWT_SECRET_KEY}
+    env_file:
+      - .env
+    depends_on:
+      - app
+      - mysql
+      - redis
+    restart: unless-stopped
+    networks:
+      - osu-network
+
+  nginx:
+    image: nginx:1.25-alpine
+    ports:
+      - "8000:80"
+    volumes:
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
+    restart: unless-stopped
+    networks:
+      - osu-network
+
   redis:
     image: redis:7-alpine
     container_name: osu_api_redis