From d43822a910634a844b6d75ee9109357876ba9faf Mon Sep 17 00:00:00 2001 From: Quanyi Ma Date: Wed, 21 Aug 2024 17:29:26 +0800 Subject: [PATCH] Update the README.md, refactoring Dockerfile and scripts Signed-off-by: Quanyi Ma --- docker/README.md | 21 ++++++++++++++++----- docker/mono-pg-dockerfile | 6 +++--- docker/start-mono.sh | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/docker/README.md b/docker/README.md index 9743e7baf..a2b68c687 100644 --- a/docker/README.md +++ b/docker/README.md @@ -25,8 +25,8 @@ docker buildx build -t mono-ui:0.1-pre-release -f ./docker/moon-ui-dockerfile . # create network docker network create mono-network -docker run --rm -it -d --network mono-network --name mono-engine mono-engine:0.1-pre-release -docker run --rm -it -d --network mono-network -e NEXT_PUBLIC_API_URL=http://mono-engine:8000 -p 3000:3000 mono-ui:0.1-pre-release +docker run --rm -it -d --network mono-network --name mono-engine -p 8000:8000 -p 22:9000 mono-engine:0.1-pre-release +docker run --rm -it -d --network mono-network --name mono-ui -e NEXT_PUBLIC_API_URL=http://mono-engine:8000 -p 3000:3000 mono-ui:0.1-pre-release ``` visit http://localhost:3000 to see the frontend @@ -37,16 +37,27 @@ visit http://localhost:3000 to see the frontend ```bash # create network -docker network create mega-network +docker network create mono-network # run postgres -docker run --rm -it -d --network mega-network --name mega-db mega-db:0.1-pre-release +docker run --rm -it -d --name mono-pg --network mono-network -v /mnt/data/mono/pg-data:/var/lib/postgresql/data -p 5432:5432 mono-pg:0.1-pre-release +docker run --rm -it -d --name mono-engine --network mono-network -v /mnt/data/mono/mono-data:/opt/mega -p 8000:8000 -p 22:9000 mono-engine:0.1-pre-release +``` + +[3] edit `config.toml`, change `db_type` to `postgres` and db_url to `postgres://mega:mega@mega-db:5432/mega` + +```toml +[database] +db_type = "postgres" + +# database connection url +db_url = "postgres://mono:mono@mono-pg:5432/mono" ``` [2] create default config ```bash -docker run --rm -it -d --network mega-network --name mega-mono -v ./mega_base:/opt/mega/etc mega-mono:0.1-pre-release +docker run --rm -it -d --network mono-network --name mono-engine -v ./mega_base:/opt/mega/etc mega-mono:0.1-pre-release docker stop mega-mono ``` diff --git a/docker/mono-pg-dockerfile b/docker/mono-pg-dockerfile index 43349ba94..960d5732a 100644 --- a/docker/mono-pg-dockerfile +++ b/docker/mono-pg-dockerfile @@ -1,8 +1,8 @@ FROM postgres:16 -ENV POSTGRES_DB=mega -ENV POSTGRES_USER=mega -ENV POSTGRES_PASSWORD=mega +ENV POSTGRES_DB=mono +ENV POSTGRES_USER=mono +ENV POSTGRES_PASSWORD=mono EXPOSE 5432 diff --git a/docker/start-mono.sh b/docker/start-mono.sh index 31ff233ad..3e2c31e40 100755 --- a/docker/start-mono.sh +++ b/docker/start-mono.sh @@ -6,7 +6,7 @@ CONFIG_FILE="$MEGA_BASE_DIR/etc/config.toml" # check if config file exists if [ -f "$CONFIG_FILE" ]; then echo "Using config file: $CONFIG_FILE" - exec /usr/local/bin/mono -c "$CONFIG_FILE" service multi --host 0.0.0.0 --ssh-port 22 + exec /usr/local/bin/mono -c "$CONFIG_FILE" service multi --host 0.0.0.0 --http-port 8000 --ssh-port 9000 else exec /usr/local/bin/mono service multi --host 0.0.0.0 --ssh-port 22 fi \ No newline at end of file