diff --git a/.dockerignore b/.dockerignore index 7cc41b07..9308628d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -16,5 +16,3 @@ coverage .DS_Store .vscode .idea - -apps/project.env diff --git a/Dockerfile b/Dockerfile index 781cbf76..cb7fab03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,9 @@ COPY --from=prod-deps --chown=nonroot:nonroot /app/node_modules ./node_modules COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/package.json ./apps/api/package.json COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/node_modules ./apps/api/node_modules COPY --from=build --chown=nonroot:nonroot /app/apps/api/dist ./apps/api/dist +COPY --chown=nonroot:nonroot apps/project.env ./project.env +COPY --chown=nonroot:nonroot apps/api/docker-entrypoint.js ./apps/api/docker-entrypoint.js EXPOSE 10712 -CMD ["apps/api/dist/main.js"] +CMD ["apps/api/docker-entrypoint.js"] diff --git a/apps/api/docker-entrypoint.js b/apps/api/docker-entrypoint.js new file mode 100644 index 00000000..267e7b42 --- /dev/null +++ b/apps/api/docker-entrypoint.js @@ -0,0 +1,72 @@ +'use strict'; + +const fs = require('node:fs'); +const path = require('node:path'); + +const MACHINE_ENV_PATHS = [ + process.env.MachineEnvFile, + process.env.MACHINE_ENV_FILE, + '/source/global-env-vars.txt', + process.env.HOME + ? path.join(process.env.HOME, 'source/global-env-vars.txt') + : '', +].filter(Boolean); + +const PROJECT_ENV_PATHS = [ + 'project.env', + '/app/project.env', + 'apps/project.env', +]; + +function stripQuotes(value) { + const trimmed = value.trim(); + if ( + (trimmed.startsWith('"') && trimmed.endsWith('"')) || + (trimmed.startsWith("'") && trimmed.endsWith("'")) + ) { + return trimmed.slice(1, -1); + } + return trimmed; +} + +function loadEnvFile(filePath, options = {}) { + const { override = false } = options; + const content = fs.readFileSync(filePath, 'utf8'); + for (const line of content.split(/\r?\n/u)) { + if (!line.trim() || /^\s*#/u.test(line)) continue; + + const match = line.match(/^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)\s*$/u); + if (!match) continue; + + if (!override && process.env[match[1]] !== undefined) continue; + process.env[match[1]] = stripQuotes(match[2]); + } +} + +const machineEnvFile = MACHINE_ENV_PATHS.find((candidate) => + fs.existsSync(candidate), +); +if (machineEnvFile) { + loadEnvFile(machineEnvFile, { override: true }); +} + +for (const projectEnvFile of PROJECT_ENV_PATHS) { + if (fs.existsSync(projectEnvFile)) { + loadEnvFile(projectEnvFile); + } +} + +const missing = [ + 'INFISICAL_CLIENT_ID', + 'INFISICAL_CLIENT_SECRET', + 'INFISICAL_PROJECT_ID', +].filter((key) => !process.env[key]); + +if (missing.length > 0) { + console.error( + `Missing required environment variables: ${missing.join(', ')}`, + ); + process.exit(1); +} + +require('./dist/main.js'); diff --git a/apps/api/src/modules/global/secret/secret.service.ts b/apps/api/src/modules/global/secret/secret.service.ts index 6fc5f27c..bfa6c3c7 100644 --- a/apps/api/src/modules/global/secret/secret.service.ts +++ b/apps/api/src/modules/global/secret/secret.service.ts @@ -47,8 +47,16 @@ export class SecretService { this.projectId = this.config.get('INFISICAL_PROJECT_ID') as string; // console.log(this.siteUrl, this.clientSecret, this.clientId, this.projectId) - if (!this.siteUrl || !this.clientSecret || !this.clientId) { - throw new Error('Missing required Infisical configuration'); + const missing = [ + !this.siteUrl && 'INFISICAL_SITE_URL', + !this.clientId && 'INFISICAL_CLIENT_ID', + !this.clientSecret && 'INFISICAL_CLIENT_SECRET', + !this.projectId && 'INFISICAL_PROJECT_ID', + ].filter(Boolean); + if (missing.length > 0) { + throw new Error( + `Missing required Infisical configuration: ${missing.join(', ')}`, + ); } this.infisicalClient = new InfisicalSDK({ siteUrl: this.siteUrl }); diff --git a/apps/api/start.ps1 b/apps/api/start.ps1 index 81e48504..20e3329c 100644 --- a/apps/api/start.ps1 +++ b/apps/api/start.ps1 @@ -56,8 +56,13 @@ if (-not $env:INFISICAL_CLIENT_SECRET) { exit 1 } +if (-not $env:INFISICAL_PROJECT_ID) { + Write-Error "INFISICAL_PROJECT_ID is not set." + exit 1 +} + if ($UsePm2) { pm2 start $MainScript --name $Pm2Name --update-env } else { node $MainScript -} \ No newline at end of file +}