Skip to content

chore(docker): adjust default config path to $MEGA_BASE_DIR/etc/config.toml #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
genedna merged 1 commit into from
Aug 20, 2024
Merged

chore(docker): adjust default config path to $MEGA_BASE_DIR/etc/config.toml #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions common/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ impl Default for Config {
})
.collect::<Vec<String>>()
.join("\n");

let config_path = base_dir.join("config.toml");

// default config path: $MEGA_BASE_DIR/etc/config.toml
// ensure the directory exists
std::fs::create_dir_all(base_dir.join("etc")).unwrap();
let config_path = base_dir.join("etc").join("config.toml");
std::fs::write(&config_path, default_config).unwrap();
eprintln!("create default config.toml in {:?}", &config_path);

Expand Down
6 changes: 3 additions & 3 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ docker buildx build -t mega-moon:0.1-pre-release -f ./docker/mega_moon_dockerfil
# create network
docker network create mega-network

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 mega-network --name mega-mono -v ./mega_base:/opt/mega mega-mono:0.1-pre-release
docker run --rm -it -d --network mega-network -e NEXT_PUBLIC_API_URL=http://mega-mono:8000 -p 3000:3000 mega-moon:0.1-pre-release
```

Expand All @@ -45,7 +45,7 @@ docker run --rm -it -d --network mega-network --name mega-db mega-db:0.1-pre-rel
[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 mega-network --name mega-mono -v ./mega_base:/opt/mega mega-mono:0.1-pre-release
docker stop mega-mono
```

Expand All @@ -65,6 +65,6 @@ db_url = "postgres://mega:mega@mega-db:5432/mega"
[4] Start the mono again, and run the frontend.

```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 mega-network --name mega-mono -v ./mega_base:/opt/mega mega-mono:0.1-pre-release
docker run --rm -it -d --network mega-network -e NEXT_PUBLIC_API_URL=http://mega-mono:8000 -p 3000:3000 mega-moon:0.1-pre-release
```
4 changes: 2 additions & 2 deletions docker/start_mono.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 http --host 0.0.0.0
exec /usr/local/bin/mono -c "$CONFIG_FILE" service multi --host 127.0.0.1 --ssh-port 22
else
exec /usr/local/bin/mono service http --host 0.0.0.0
exec /usr/local/bin/mono service multi --host 127.0.0.1 --ssh-port 22
fi