fix: 開発環境で起動できない問題の修正 (#198)

m1sk9 · Sep 2, 2024 · e7b5d14 · e7b5d14
1 parent 9085fff
commit e7b5d14
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -1,2 +1,4 @@
-# Discord API のトークンを指定する
+# Configuration file path (relative path)
+CONFIG_FILE_PATH=
+# Discord API token
 DISCORD_API_TOKEN=
diff --git a/docs/src/installation.md b/docs/src/installation.md
@@ -21,9 +21,10 @@
 
    Key whose `Required` column is `Yes` must be specified. If not specified, babyrite will not start correctly.
 
-   | Key                 | Description       | Required | Default |
-   |---------------------|-------------------|----------|---------|
-   | `DISCORD_API_TOKEN` | Discord API Token | Yes      | ---     |
+   | Key                 | Description                             | Required | Default |
+   |---------------------|-----------------------------------------|----------|---------|
+   | `CONFIG_FILE_PATH`  | Configuration file path (relative path) | No       | ---     |
+   | `DISCORD_API_TOKEN` | Discord API Token                       | Yes      | ---     |
 
 3. Copy configuration files:
 
@@ -35,7 +36,7 @@
 4. Start babyrite:
 
     ```sh
-    docker run -e DISCORD_API_TOKEN=your_discord_api_token --volume ./config/config.yaml:/config/config.yaml ghcr.io/m1sk9/babyrite
+    docker run -e CONFIG_FILE_PATH=/path/to/your/config.yaml -e DISCORD_API_TOKEN=your_discord_api_token --volume ./config/config.yaml:/config/config.yaml ghcr.io/m1sk9/babyrite
     ```
 
 ## Using Docker Compose
@@ -58,6 +59,7 @@
 2. Create a `.env` file:
 
     ```sh
+    CONFIG_FILE_PATH=/path/to/your/config.yaml
     DISCORD_API_TOKEN=your_discord_api_token
     ```
 

diff --git a/src/env.rs b/src/env.rs
@@ -1,5 +1,6 @@
 #[derive(serde::Deserialize)]
 pub struct BabyriteEnv {
+    pub config_file_path: String,
     pub discord_api_token: String,
 }
 

diff --git a/src/model/config.rs b/src/model/config.rs
@@ -1,5 +1,7 @@
 use serde::Deserialize;
 
+use crate::env::babyrite_envs;
+
 #[derive(Debug, Deserialize)]
 pub struct BabyriteConfig {
     pub bypass_guilds: bool,
@@ -13,7 +15,7 @@ impl BabyriteConfig {
         BABYRITE_CONFIG
             .set(
                 serde_yaml::from_reader(std::io::BufReader::new(
-                    std::fs::File::open("/config/config.yaml")
+                    std::fs::File::open(&babyrite_envs().config_file_path)
                         .expect("Failed to open configuration file."),
                 ))
                 .expect("Failed to parse config.yaml. Please check if the settings are correct."),