From 35c748006d36976216c04cc275014c91d3de4a39 Mon Sep 17 00:00:00 2001 From: Jeff Emmett Date: Mon, 23 Feb 2026 23:07:46 -0800 Subject: [PATCH] feat: wire mycofi-earth-website to Infisical for secret injection Add entrypoint.sh that fetches secrets from Infisical at container startup. GEMINI_API_KEY, RUNPOD_API_KEY, and FAL_KEY now come from Infisical instead of being passed directly in docker-compose. Co-Authored-By: Claude Opus 4.6 --- Dockerfile | 6 +++- docker-compose.yml | 6 ++-- entrypoint.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 4 deletions(-) create mode 100755 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index b3e8602..566ba51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,10 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static # Create data directory for zine storage with proper permissions RUN mkdir -p /app/data/zines && chown -R nextjs:nodejs /app/data +# Infisical entrypoint for secret injection +COPY --chown=nextjs:nodejs entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + USER nextjs EXPOSE 3000 @@ -48,5 +52,5 @@ EXPOSE 3000 ENV PORT=3000 ENV HOSTNAME="0.0.0.0" -# Start the Next.js server +ENTRYPOINT ["/entrypoint.sh"] CMD ["node", "server.js"] diff --git a/docker-compose.yml b/docker-compose.yml index 63890f6..831e056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,9 +17,9 @@ services: - NODE_ENV=production - HOSTNAME=0.0.0.0 - PORT=3000 - - GEMINI_API_KEY=${GEMINI_API_KEY} - - RUNPOD_API_KEY=${RUNPOD_API_KEY} - - FAL_KEY=${FAL_KEY} + - INFISICAL_CLIENT_ID=${INFISICAL_CLIENT_ID} + - INFISICAL_CLIENT_SECRET=${INFISICAL_CLIENT_SECRET} + - INFISICAL_PROJECT_SLUG=mycofi volumes: - zine-data:/app/data networks: diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100755 index 0000000..e82770e --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,83 @@ +#!/bin/sh +# Infisical secret injection entrypoint (Node.js) +# Fetches secrets from Infisical API and injects them as env vars before starting the app. +# Required env vars: INFISICAL_CLIENT_ID, INFISICAL_CLIENT_SECRET +# Optional: INFISICAL_PROJECT_SLUG, INFISICAL_ENV (default: prod), +# INFISICAL_URL (default: http://infisical:8080) + +set -e + +export INFISICAL_URL="${INFISICAL_URL:-http://infisical:8080}" +export INFISICAL_ENV="${INFISICAL_ENV:-prod}" +# IMPORTANT: Set INFISICAL_PROJECT_SLUG in your docker-compose.yml +export INFISICAL_PROJECT_SLUG="${INFISICAL_PROJECT_SLUG:?INFISICAL_PROJECT_SLUG must be set}" + +if [ -z "$INFISICAL_CLIENT_ID" ] || [ -z "$INFISICAL_CLIENT_SECRET" ]; then + echo "[infisical] No credentials set, starting without secret injection" + exec "$@" +fi + +echo "[infisical] Fetching secrets from ${INFISICAL_PROJECT_SLUG}/${INFISICAL_ENV}..." + +# Use Node.js (already in the image) for reliable JSON parsing and HTTP calls +EXPORTS=$(node -e " +const http = require('http'); +const https = require('https'); +const url = new URL(process.env.INFISICAL_URL); +const client = url.protocol === 'https:' ? https : http; + +const post = (path, body) => new Promise((resolve, reject) => { + const data = JSON.stringify(body); + const req = client.request({ hostname: url.hostname, port: url.port, path, method: 'POST', + headers: { 'Content-Type': 'application/json', 'Content-Length': data.length } + }, res => { let d = ''; res.on('data', c => d += c); res.on('end', () => resolve(JSON.parse(d))); }); + req.on('error', reject); + req.end(data); +}); + +const get = (path, token) => new Promise((resolve, reject) => { + const req = client.request({ hostname: url.hostname, port: url.port, path, method: 'GET', + headers: { 'Authorization': 'Bearer ' + token } + }, res => { let d = ''; res.on('data', c => d += c); res.on('end', () => resolve(JSON.parse(d))); }); + req.on('error', reject); + req.end(); +}); + +(async () => { + try { + const auth = await post('/api/v1/auth/universal-auth/login', { + clientId: process.env.INFISICAL_CLIENT_ID, + clientSecret: process.env.INFISICAL_CLIENT_SECRET + }); + if (!auth.accessToken) { console.error('[infisical] Auth failed'); process.exit(1); } + + const slug = process.env.INFISICAL_PROJECT_SLUG; + const env = process.env.INFISICAL_ENV; + const secrets = await get('/api/v3/secrets/raw?workspaceSlug=' + slug + '&environment=' + env + '&secretPath=/&recursive=true', auth.accessToken); + + if (!secrets.secrets) { console.error('[infisical] No secrets returned'); process.exit(1); } + + // Output as shell-safe export statements + for (const s of secrets.secrets) { + // Single-quote the value to prevent shell expansion, escape existing single quotes + const escaped = s.secretValue.replace(/'/g, \"'\\\\''\" ); + console.log('export ' + s.secretKey + \"='\" + escaped + \"'\"); + } + } catch (e) { console.error('[infisical] Error:', e.message); process.exit(1); } +})(); +" 2>&1) || { + echo "[infisical] WARNING: Failed to fetch secrets, starting with existing env vars" + exec "$@" +} + +# Check if we got export statements or error messages +if echo "$EXPORTS" | grep -q "^export "; then + COUNT=$(echo "$EXPORTS" | grep -c "^export ") + eval "$EXPORTS" + echo "[infisical] Injected ${COUNT} secrets" +else + echo "[infisical] WARNING: $EXPORTS" + echo "[infisical] Starting with existing env vars" +fi + +exec "$@"