Private
Public Access
chg: pkg: remove all minio related stuff - & clean up and unificate the storage related code #16
Deploy to Production / deploy (push) Successful in 36s
Deploy to Production / deploy (push) Successful in 36s
This commit is contained in:
+17
-59
@@ -30,10 +30,10 @@ services:
|
||||
CAP_SECRET_KEY: ${CAP_SECRET_KEY}
|
||||
WEBAUTHN_RP_ID: ${WEBAUTHN_RP_ID:-localhost}
|
||||
WEBAUTHN_ORIGIN: ${WEBAUTHN_ORIGIN:-https://localhost}
|
||||
MINIO_ROOT_USER: ${MINIO_ROOT_USER}
|
||||
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
|
||||
MINIO_ENDPOINT: http://rustfs:9000
|
||||
MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9010}
|
||||
STORAGE_ACCESS_KEY: ${STORAGE_ACCESS_KEY}
|
||||
STORAGE_SECRET_KEY: ${STORAGE_SECRET_KEY}
|
||||
STORAGE_ENDPOINT: http://rustfs:9000
|
||||
STORAGE_PUBLIC_URL: ${STORAGE_PUBLIC_URL:-http://localhost:9010}
|
||||
# IMPORTANT: Set TRUSTED_PROXIES to your reverse proxy IP in production.
|
||||
# For Docker on same host, use: 172.17.0.1 (default bridge) or 172.16.0.0/12 (overlay network)
|
||||
# For Kubernetes or external proxy, use the proxy's IP address.
|
||||
@@ -56,7 +56,7 @@ services:
|
||||
condition: service_started
|
||||
rustfs:
|
||||
condition: service_healthy
|
||||
storage_init:
|
||||
rustfs_init:
|
||||
condition: service_completed_successfully
|
||||
scheduler:
|
||||
build:
|
||||
@@ -85,10 +85,10 @@ services:
|
||||
CAP_SECRET_KEY: ${CAP_SECRET_KEY}
|
||||
WEBAUTHN_RP_ID: ${WEBAUTHN_RP_ID:-localhost}
|
||||
WEBAUTHN_ORIGIN: ${WEBAUTHN_ORIGIN:-https://localhost}
|
||||
MINIO_ROOT_USER: ${MINIO_ROOT_USER}
|
||||
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
|
||||
MINIO_ENDPOINT: http://rustfs:9000
|
||||
MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9010}
|
||||
STORAGE_ACCESS_KEY: ${STORAGE_ACCESS_KEY}
|
||||
STORAGE_SECRET_KEY: ${STORAGE_SECRET_KEY}
|
||||
STORAGE_ENDPOINT: http://rustfs:9000
|
||||
STORAGE_PUBLIC_URL: ${STORAGE_PUBLIC_URL:-http://localhost:9010}
|
||||
TRUSTED_PROXIES: ${TRUSTED_PROXIES:-127.0.0.1}
|
||||
volumes:
|
||||
- app_var:/app/var
|
||||
@@ -99,7 +99,7 @@ services:
|
||||
condition: service_started
|
||||
rustfs:
|
||||
condition: service_healthy
|
||||
storage_init:
|
||||
rustfs_init:
|
||||
condition: service_completed_successfully
|
||||
healthcheck:
|
||||
disable: true
|
||||
@@ -109,8 +109,8 @@ services:
|
||||
restart: unless-stopped
|
||||
container_name: '${APP_NAME}-rustfs'
|
||||
environment:
|
||||
RUSTFS_ACCESS_KEY: ${MINIO_ROOT_USER}
|
||||
RUSTFS_SECRET_KEY: ${MINIO_ROOT_PASSWORD}
|
||||
RUSTFS_ACCESS_KEY: ${STORAGE_ACCESS_KEY}
|
||||
RUSTFS_SECRET_KEY: ${STORAGE_SECRET_KEY}
|
||||
RUSTFS_ADDRESS: ':9000'
|
||||
RUSTFS_CONSOLE_ADDRESS: ':9001'
|
||||
RUSTFS_CONSOLE_ENABLE: 'true'
|
||||
@@ -125,61 +125,21 @@ services:
|
||||
timeout: 5s
|
||||
retries: 20
|
||||
start_period: 15s
|
||||
storage_init:
|
||||
rustfs_init:
|
||||
build:
|
||||
context: ./docker/storage-migrate
|
||||
context: ./docker/storage-init
|
||||
entrypoint: ["python"]
|
||||
command: ["/usr/local/bin/storage-init.py"]
|
||||
restart: "no"
|
||||
container_name: '${APP_NAME}-storage-init'
|
||||
container_name: '${APP_NAME}-rustfs-init'
|
||||
depends_on:
|
||||
rustfs:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
TARGET_ENDPOINT: http://rustfs:9000
|
||||
STORAGE_ACCESS_KEY: ${MINIO_ROOT_USER}
|
||||
STORAGE_SECRET_KEY: ${MINIO_ROOT_PASSWORD}
|
||||
STORAGE_ACCESS_KEY: ${STORAGE_ACCESS_KEY}
|
||||
STORAGE_SECRET_KEY: ${STORAGE_SECRET_KEY}
|
||||
STORAGE_BUCKET: mineseeker
|
||||
minio:
|
||||
profiles: ["storage-migration"]
|
||||
image: ${MINIO_IMAGE:-minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1}
|
||||
pull_policy: never
|
||||
restart: unless-stopped
|
||||
container_name: '${APP_NAME}-minio'
|
||||
command: server /data --console-address ":9001"
|
||||
ports:
|
||||
- "${MINIO_PUBLISHED_API_PORT:-9012}:9000"
|
||||
- "${MINIO_PUBLISHED_CONSOLE_PORT:-9013}:9001"
|
||||
environment:
|
||||
MINIO_ROOT_USER: ${MINIO_ROOT_USER}
|
||||
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
|
||||
volumes:
|
||||
- minio_data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
start_period: 10s
|
||||
storage_migrate:
|
||||
profiles: ["storage-migration"]
|
||||
build:
|
||||
context: ./docker/storage-migrate
|
||||
restart: "no"
|
||||
container_name: '${APP_NAME}-storage-migrate'
|
||||
depends_on:
|
||||
minio:
|
||||
condition: service_healthy
|
||||
rustfs:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
SOURCE_ENDPOINT: http://minio:9000
|
||||
TARGET_ENDPOINT: http://rustfs:9000
|
||||
STORAGE_ACCESS_KEY: ${MINIO_ROOT_USER}
|
||||
STORAGE_SECRET_KEY: ${MINIO_ROOT_PASSWORD}
|
||||
STORAGE_BUCKET: mineseeker
|
||||
volumes:
|
||||
- storage_migration_state:/state
|
||||
mail:
|
||||
image: boky/postfix:latest
|
||||
restart: unless-stopped
|
||||
@@ -221,6 +181,4 @@ volumes:
|
||||
caddy_data:
|
||||
caddy_config:
|
||||
postfix_spool:
|
||||
minio_data:
|
||||
rustfs_data:
|
||||
storage_migration_state:
|
||||
|
||||
Reference in New Issue
Block a user