瀏覽代碼

fix: setting env vars on home server in e2e environment

Karol Sójko 1 年之前
父節點
當前提交
f87036e3a8

+ 1 - 0
.github/workflows/common-e2e.yml

@@ -113,6 +113,7 @@ jobs:
         echo "DB_USERNAME=standardnotes" >> packages/home-server/.env
         echo "DB_PASSWORD=standardnotes" >> packages/home-server/.env
         echo "DB_TYPE=${{ matrix.db_type }}" >> packages/home-server/.env
+        echo "DB_SQLITE_DATABASE_PATH=$(pwd)/data/database/sqlite_${{ matrix.cache_type }}/db.sqlite
         echo "REDIS_URL=redis://cache" >> packages/home-server/.env
         echo "CACHE_TYPE=${{ matrix.cache_type }}" >> packages/home-server/.env
         echo "FILES_SERVER_URL=http://localhost:3123" >> packages/home-server/.env

+ 8 - 0
packages/domain-core/src/Domain/Env/AbstractEnv.ts

@@ -23,4 +23,12 @@ export abstract class AbstractEnv {
 
     return <string>process.env[key]
   }
+
+  getAll(): { [key: string]: string } {
+    if (!this.env) {
+      this.load()
+    }
+
+    return this.env as { [key: string]: string }
+  }
 }

+ 5 - 0
packages/home-server/bin/server.ts

@@ -1,7 +1,11 @@
+import { Env } from '../src/Bootstrap/Env'
 import { HomeServer } from '../src/Server/HomeServer'
 
 const homeServer = new HomeServer()
 
+const env: Env = new Env()
+env.load()
+
 Promise.resolve(
   homeServer.start({
     dataDirectoryPath: `${__dirname}/../data`,
@@ -9,6 +13,7 @@ Promise.resolve(
       // eslint-disable-next-line no-console
       console.log(chunk.toString())
     },
+    environment: env.getAll(),
   }),
 ).catch((error) => {
   // eslint-disable-next-line no-console