浏览代码

fix: load env files for cli (#3503)

Jason Rasmussen 1 年之前
父节点
当前提交
2835919931

+ 0 - 1
server/bin/admin-cli.sh

@@ -1 +0,0 @@
-node ./dist/main cli "$@"

+ 1 - 1
server/package-lock.json

@@ -54,7 +54,7 @@
       },
       "bin": {
         "immich": "bin/cli.sh",
-        "immich-admin": "bin/admin-cli.sh"
+        "immich-admin": "start.sh admin-cli"
       },
       "devDependencies": {
         "@nestjs/cli": "^9.1.8",

+ 1 - 1
server/package.json

@@ -7,7 +7,7 @@
   "license": "UNLICENSED",
   "bin": {
     "immich": "./bin/cli.sh",
-    "immich-admin": "./bin/admin-cli.sh"
+    "immich-admin": "./start.sh admin-cli"
   },
   "scripts": {
     "build": "nest build",

+ 0 - 0
server/src/cli/app.module.ts → server/src/admin-cli/app.module.ts


+ 0 - 0
server/src/cli/commands/list-users.command.ts → server/src/admin-cli/commands/list-users.command.ts


+ 0 - 0
server/src/cli/commands/password-login.ts → server/src/admin-cli/commands/password-login.ts


+ 0 - 0
server/src/cli/commands/reset-admin-password.command.ts → server/src/admin-cli/commands/reset-admin-password.command.ts


+ 0 - 0
server/src/cli/constants.ts → server/src/admin-cli/constants.ts


+ 0 - 0
server/src/cli/immich.ts → server/src/admin-cli/main.ts


+ 3 - 3
server/src/main.ts

@@ -1,4 +1,4 @@
-import { bootstrap as cli } from './cli/immich';
+import { bootstrap as adminCli } from './admin-cli/main';
 import { bootstrap as immich } from './immich/main';
 import { bootstrap as microservices } from './microservices/main';
 
@@ -14,8 +14,8 @@ function bootstrap() {
       return immich();
     case 'microservices':
       return microservices();
-    case 'cli':
-      return cli();
+    case 'admin-cli':
+      return adminCli();
     default:
       console.log(`Invalid app name: ${immichApp}. Expected one of immich|microservices|cli`);
       process.exit(1);

+ 5 - 0
server/start.sh

@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if [ "$DB_URL_FILE" ]; then
+	export DB_URL=$(cat $DB_URL_FILE)
+	unset DB_URL_FILE
+fi
+
 if [ "$DB_HOSTNAME_FILE" ]; then
 	export DB_HOSTNAME=$(cat $DB_HOSTNAME_FILE)
 	unset DB_HOSTNAME_FILE