.env.example

@@ -1,26 +1,17 @@
-# 站点基础域名，末尾不需要/
 BASE_URL=https://zpic.demo.mba
 
-# PGSQL 数据库配置
 DB_USER=zpic_user
 DB_PASSWORD=ZR8e0b2G4eIp
 DB_HOST=postgres
 DB_PORT=5432
 DB_NAME=zpic
 
-# Redis 配置
 REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_DB=0
 REDIS_PASSWORD=phLoaoPLWx9h
 
-# NSFW Token，用于色情图像识别
 NSFW_TOKEN=7l2OqQqvuMmG
 
-# Imgproxy 配置
 IMGPROXY_KEY=738407de5b7c42efddc6483dbec41d95
-IMGPROXY_SALT=f396da2b4802d257
+IMGPROXY_SALT=f396da2b4802d257
-IMGPROXY_QUALITY=80
-IMGPROXY_AUTO_ROTATE=true
-IMGPROXY_AUTO_WEBP=true
-IMGPROXY_MAX_SRC_FILE_SIZE=10485760

1panel.yaml

@@ -1,53 +0,0 @@
-services:
-  zpic:
-    container_name: zpic
-    image: pub.tcp.mk/helloz/zpic
-    networks:
-      - 1panel-network
-    ports:
-      - "2080:2080"
-    volumes:
-      - ./data:/opt/zpic/app/data
-    env_file:
-      - 1panel.env
-    # 环境变量
-    environment:
-      - WORKERS=2
-    restart: always
-
-  nsfw:
-    container_name: nsfw
-    image: pub.tcp.mk/helloz/nsfw
-    networks:
-      - 1panel-network
-    ports:
-      - "6086:6086"
-    env_file:
-      - 1panel.env
-    # 环境变量
-    environment:
-      - TOKEN=${NSFW_TOKEN}
-    restart: always
-
-  imgproxy:
-    image: pub.tcp.mk/helloz/imgproxy
-    container_name: imgproxy
-    networks:
-      - 1panel-network
-    ports:
-      - "8088:8080"
-    env_file:
-      - 1panel.env
-    environment:
-      - IMGPROXY_KEY=${IMGPROXY_KEY}
-      - IMGPROXY_SALT=${IMGPROXY_SALT}
-      #- IMGPROXY_ALLOWED_SOURCES=https://your-bucket.s3.amazonaws.com,https://cdn.yoursite.com
-      - IMGPROXY_QUALITY=80
-      - IMGPROXY_AUTO_ROTATE=true
-      - IMGPROXY_AUTO_WEBP=true
-      - IMGPROXY_MAX_SRC_FILE_SIZE=10485760
-    restart: unless-stopped
-
-networks:
-    1panel-network:
-        external: true

bt.yaml

@@ -1,80 +0,0 @@
-services:
-  zpic:
-    container_name: zpic
-    image: pub.tcp.mk/helloz/zpic
-    networks:
-      - baota_net
-    ports:
-      - "2080:2080"
-    volumes:
-      - ${APP_PATH}/data:/opt/zpic/app/data
-    env_file:
-      - .env
-    # 环境变量
-    environment:
-      - WORKERS=2
-    restart: always
-
-  postgres:
-    container_name: postgres
-    image: docker.1ms.run/postgres:17-bookworm
-    restart: unless-stopped
-    env_file:
-      - .env
-    environment:
-      - POSTGRES_DB=${DB_NAME}
-      - POSTGRES_USER=${DB_USER}
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-    volumes:
-      - ${APP_PATH}/pgsql/data:/var/lib/postgresql/data
-      - ${APP_PATH}/pgsql/postgres.conf:/etc/postgresql/postgresql.conf:ro
-    command: ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"]
-    networks:
-      - baota_net
-
-  redis:
-    image: docker.1ms.run/redis:8-alpine
-    container_name: redis
-    networks:
-      - baota_net
-    restart: always
-    volumes:
-      - ${APP_PATH}/redis/data:/data
-      - ${APP_PATH}/redis/redis.conf:/etc/redis/redis.conf
-    command: ["redis-server", "/etc/redis/redis.conf"]
-    
-  nsfw:
-    container_name: nsfw
-    image: pub.tcp.mk/helloz/nsfw
-    networks:
-      - baota_net
-    ports:
-      - "6086:6086"
-    env_file:
-      - .env
-    # 环境变量
-    environment:
-      - TOKEN=${NSFW_TOKEN}
-    restart: always
-
-  imgproxy:
-    image: pub.tcp.mk/helloz/imgproxy
-    container_name: imgproxy
-    networks:
-      - baota_net
-    env_file:
-      - .env
-    ports:
-      - "8088:8080"
-    environment:
-      - IMGPROXY_KEY=${IMGPROXY_KEY}
-      - IMGPROXY_SALT=${IMGPROXY_SALT}
-      - IMGPROXY_QUALITY=80
-      - IMGPROXY_AUTO_ROTATE=true
-      - IMGPROXY_AUTO_WEBP=true
-      - IMGPROXY_MAX_SRC_FILE_SIZE=10485760
-    restart: unless-stopped
-
-networks:
-  baota_net:
-    driver: bridge

compose.yaml

@@ -22,8 +22,6 @@ services:
     container_name: postgres
     image: postgres:17-bookworm
     restart: unless-stopped
-    env_file:
-      - .env
     environment:
       - POSTGRES_DB=${DB_NAME}
       - POSTGRES_USER=${DB_USER}
@@ -58,8 +56,6 @@ services:
     ports:
       - "6086:6086"
     # 环境变量
-    env_file:
-      - .env
     environment:
       - TOKEN=${NSFW_TOKEN}
     restart: always
@@ -70,9 +66,15 @@ services:
     networks:
       - mynet
     ports:
-      - "8088:8080"
+      - "8080:8080"
-    env_file:
+    environment:
-      - .env
+      - IMGPROXY_KEY=${IMGPROXY_KEY}
+      - IMGPROXY_SALT=${IMGPROXY_SALT}
+      #- IMGPROXY_ALLOWED_SOURCES=https://your-bucket.s3.amazonaws.com,https://cdn.yoursite.com
+      - IMGPROXY_QUALITY=80
+      - IMGPROXY_AUTO_ROTATE=true
+      - IMGPROXY_AUTO_WEBP=true
+      - IMGPROXY_MAX_SRC_FILE_SIZE=10485760
     restart: unless-stopped
 
 networks: