Migrate from Infisical to Vault for secret loading
Some checks failed
Build Docker Image / build (push) Failing after 34s

This commit is contained in:
Ruslan Bakiev
2026-03-09 14:30:10 +07:00
parent e4d6c9ce81
commit 84e857ffc1
3 changed files with 45 additions and 43 deletions

View File

@@ -12,6 +12,8 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
with:
driver-opts: network=dokploy-network
- name: Login to Gitea Registry - name: Login to Gitea Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -26,12 +28,12 @@ jobs:
context: . context: .
push: true push: true
tags: gitea.dsrptlab.com/optovia/webapp/webapp:latest tags: gitea.dsrptlab.com/optovia/webapp/webapp:latest
network: dokploy-network
build-args: | build-args: |
INFISICAL_API_URL=${{ secrets.INFISICAL_API_URL }} VAULT_ADDR=${{ secrets.VAULT_ADDR }}
INFISICAL_CLIENT_ID=${{ secrets.INFISICAL_CLIENT_ID }} VAULT_TOKEN=${{ secrets.VAULT_TOKEN }}
INFISICAL_CLIENT_SECRET=${{ secrets.INFISICAL_CLIENT_SECRET }} VAULT_SHARED_PATH=shared
INFISICAL_PROJECT_ID=${{ secrets.INFISICAL_PROJECT_ID }} VAULT_PROJECT_PATH=webapp
INFISICAL_ENV=prod
- name: Deploy to Dokploy - name: Deploy to Dokploy
run: curl -X POST "https://dokploy.optovia.ru/api/deploy/0_iNAXPDx28BLZIddGTzB" run: curl -X POST "https://dokploy.optovia.ru/api/deploy/0_iNAXPDx28BLZIddGTzB"

View File

@@ -12,17 +12,15 @@ WORKDIR /app
RUN corepack enable RUN corepack enable
ARG INFISICAL_API_URL ARG VAULT_ADDR
ARG INFISICAL_CLIENT_ID ARG VAULT_TOKEN
ARG INFISICAL_CLIENT_SECRET ARG VAULT_SHARED_PATH
ARG INFISICAL_PROJECT_ID ARG VAULT_PROJECT_PATH
ARG INFISICAL_ENV
ENV INFISICAL_API_URL=$INFISICAL_API_URL \ ENV VAULT_ADDR=$VAULT_ADDR \
INFISICAL_CLIENT_ID=$INFISICAL_CLIENT_ID \ VAULT_TOKEN=$VAULT_TOKEN \
INFISICAL_CLIENT_SECRET=$INFISICAL_CLIENT_SECRET \ VAULT_SHARED_PATH=$VAULT_SHARED_PATH \
INFISICAL_PROJECT_ID=$INFISICAL_PROJECT_ID \ VAULT_PROJECT_PATH=$VAULT_PROJECT_PATH
INFISICAL_ENV=$INFISICAL_ENV
COPY package.json pnpm-lock.yaml ./ COPY package.json pnpm-lock.yaml ./
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile

View File

@@ -1,48 +1,50 @@
/** /**
* Load secrets from Infisical using Machine Identity (Universal Auth) * Load secrets from Vault HTTP API
* Writes secrets to .env.infisical file for sourcing * Writes secrets to .env.infisical file for sourcing
*/ */
import { InfisicalSDK } from "@infisical/sdk";
import { writeFileSync } from "fs"; import { writeFileSync } from "fs";
const INFISICAL_API_URL = process.env.INFISICAL_API_URL; const VAULT_ADDR = process.env.VAULT_ADDR;
const INFISICAL_CLIENT_ID = process.env.INFISICAL_CLIENT_ID; const VAULT_TOKEN = process.env.VAULT_TOKEN;
const INFISICAL_CLIENT_SECRET = process.env.INFISICAL_CLIENT_SECRET; const VAULT_KV_MOUNT = process.env.VAULT_KV_MOUNT || "secret";
const INFISICAL_PROJECT_ID = process.env.INFISICAL_PROJECT_ID; const VAULT_SHARED_PATH = process.env.VAULT_SHARED_PATH;
const INFISICAL_ENV = process.env.INFISICAL_ENV || "prod"; const VAULT_PROJECT_PATH = process.env.VAULT_PROJECT_PATH;
if (!INFISICAL_API_URL || !INFISICAL_CLIENT_ID || !INFISICAL_CLIENT_SECRET || !INFISICAL_PROJECT_ID) { if (!VAULT_ADDR || !VAULT_TOKEN) {
process.stderr.write("Missing required Infisical environment variables\n"); process.stderr.write("Missing required Vault environment variables (VAULT_ADDR, VAULT_TOKEN)\n");
process.exit(1); process.exit(1);
} }
const client = new InfisicalSDK({ siteUrl: INFISICAL_API_URL }); process.stderr.write(`Loading secrets from Vault...\n`);
await client.auth().universalAuth.login({
clientId: INFISICAL_CLIENT_ID,
clientSecret: INFISICAL_CLIENT_SECRET,
});
process.stderr.write(`Loading secrets from Infisical (env: ${INFISICAL_ENV})...\n`);
const envLines = []; const envLines = [];
for (const secretPath of ["/webapp", "/shared"]) { async function loadPath(path, sourceName) {
const response = await client.secrets().listSecrets({ if (!path) return;
projectId: INFISICAL_PROJECT_ID,
environment: INFISICAL_ENV, const url = `${VAULT_ADDR.replace(/\/$/, "")}/v1/${VAULT_KV_MOUNT}/data/${path}`;
secretPath: secretPath, const response = await fetch(url, {
expandSecretReferences: true, headers: { "X-Vault-Token": VAULT_TOKEN },
}); });
for (const secret of response.secrets) { if (!response.ok) {
// Escape special characters for shell throw new Error(`Failed to load Vault path ${VAULT_KV_MOUNT}/${path}: ${response.status}`);
const escapedValue = secret.secretValue.replace(/'/g, "'\\''");
envLines.push(`export ${secret.secretKey}='${escapedValue}'`);
} }
process.stderr.write(` ${secretPath}: ${response.secrets.length} secrets loaded\n`); const json = await response.json();
const secrets = json?.data?.data || {};
const keys = Object.keys(secrets);
for (const [key, value] of Object.entries(secrets)) {
const escapedValue = String(value).replace(/'/g, "'\\''");
envLines.push(`export ${key}='${escapedValue}'`);
}
process.stderr.write(` ${sourceName}: ${keys.length} secrets loaded from ${VAULT_KV_MOUNT}/${path}\n`);
} }
await loadPath(VAULT_SHARED_PATH, "shared");
await loadPath(VAULT_PROJECT_PATH, "project");
writeFileSync(".env.infisical", envLines.join("\n")); writeFileSync(".env.infisical", envLines.join("\n"));
process.stderr.write("Secrets written to .env.infisical\n"); process.stderr.write("Secrets written to .env.infisical\n");