Skip to content

Commit 394124f

Browse files
authored
fix: Update the Docker configuration for orion-server and mega storage. (#1888)
Signed-off-by: Ruizhi Huang <231220075@smail.nju.edu.cn>
1 parent 0e42b24 commit 394124f

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

docker/demo/docker-compose.demo.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ services:
130130

131131
# S3 / RustFS
132132
# To use S3 storage, set MEGA_MONOREPO__STORAGE_TYPE=s3 and ensure RustFS bucket is created
133-
MEGA_MONOREPO__STORAGE_TYPE: ${MEGA_MONOREPO__STORAGE_TYPE:-s3}
133+
MEGA_MONOREPO__STORAGE_TYPE: ${MEGA_MONOREPO__STORAGE_TYPE:-s3compatible}
134134
MEGA_OBJECT_STORAGE__S3__ENDPOINT_URL: ${MEGA_OBJECT_STORAGE__S3__ENDPOINT_URL:-http://rustfs:9000}
135135

136136
# RustFS requires bucket names to follow S3 naming rules: 3-63 chars, lowercase, alphanumeric, hyphens
@@ -250,17 +250,18 @@ services:
250250
postgres:
251251
condition: service_healthy
252252
environment:
253-
DATABASE_URL: ${ORION_DATABASE_URL:-postgres://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@postgres:5432/${POSTGRES_DB_MONO:-mono}}
254-
PORT: 8004
255-
BUILD_LOG_DIR: ${ORION_BUILD_LOG_DIR:-/tmp/buck2ctl}
256-
ALLOWED_CORS_ORIGINS: ${ORION_ALLOWED_CORS_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000,http://localhost:8000}
257-
LOGGER_STORAGE_TYPE: ${ORION_LOGGER_STORAGE_TYPE:-local}
258-
BUCKET_NAME: ${ORION_BUCKET_NAME:-orion-logs}
259-
AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-rustfsadmin}
260-
AWS_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-rustfsadmin}
261-
AWS_DEFAULT_REGION: ${S3_REGION:-us-east-1}
253+
# Use MEGA config scheme for orion-server
254+
CONFIG_PATH: /etc/mega/config.toml
255+
MEGA_ORION_SERVER__DB_URL: ${ORION_DATABASE_URL:-postgres://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@postgres:5432/${POSTGRES_DB_MONO:-mono}}
256+
MEGA_ORION_SERVER__PORT: 8004
257+
MEGA_ORION_SERVER__BUILD_LOG_DIR: ${ORION_BUILD_LOG_DIR:-/tmp/buck2ctl}
258+
MEGA_ORION_SERVER__LOGGER_STORAGE_MODE: ${ORION_LOGGER_STORAGE_MODE:-local}
259+
MEGA_ORION_SERVER__STORAGE_TYPE: ${ORION_STORAGE_TYPE:-local}
260+
MEGA_ORION_SERVER__MONOBASE_URL: ${ORION_MONOBASE_URL:-http://mega:8000}
261+
MEGA_OAUTH__ALLOWED_CORS_ORIGINS: ${ORION_ALLOWED_CORS_ORIGINS:-http://localhost:3000,http://127.0.0.1:3000,http://localhost:8000}
262262
volumes:
263263
- orion-logs:/tmp/buck2ctl
264+
- ../../config/config.toml:/etc/mega/config.toml:ro
264265
ports:
265266
# Container listens on 8004, host port is 8004
266267
- "8004:8004"

0 commit comments

Comments
 (0)