diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml index 1f0163a..b5b5e6c 100644 --- a/.woodpecker/deploy.yml +++ b/.woodpecker/deploy.yml @@ -179,6 +179,12 @@ steps: from_secret: ai_open_webui_database_url AI_OAUTH_CLIENT_SECRET: from_secret: ai_oauth_client_secret + FLOWAGENT_AZURE_CLIENT_ID: + from_secret: flowagent_azure_client_id + FLOWAGENT_AZURE_TENANT_ID: + from_secret: flowagent_azure_tenant_id + FLOWAGENT_AZURE_CLIENT_SECRET: + from_secret: flowagent_azure_client_secret commands: - apk add --no-cache openssh-client - mkdir -p ~/.ssh @@ -305,6 +311,13 @@ steps: # unresolved at compose-render time (empty), silently breaking Bedrock auth. # All other migrated vars in ai.yaml use plain (unprefixed) names, so only # these two lines need the AI_ prefix. + # + # FLOWAGENT NOTE (added alongside the ai.yaml mcpo image/secrets cutover): + # the 3 flowagent_azure_* values are provisioned as native Docker secrets + # below (Pattern C, matches every other _FILE-convention stack), NOT written + # into ai/ai.env — mcpo's flowagent entry reads them via + # /run/secrets/flowagent_azure_* (see mcp-config/flowagent/entrypoint.sh), + # not via env var, so they don't belong in this stack's Pattern B .env block. ssh -o StrictHostKeyChecking=no root@$${SWARM_MANAGER_IP} "FILE=/volume1/docker/compose-files/ai/ai.env TMP=\$FILE.tmp.\$\$ grep -vE '^(AI_AWS_ACCESS_KEY_ID|AI_AWS_SECRET_ACCESS_KEY|LITELLM_MASTER_KEY|LITELLM_SALT_KEY|POSTGRES_PASSWORD|DATABASE_URL|WEBUI_SECRET_KEY|OPEN_WEBUI_DATABASE_URL|OAUTH_CLIENT_SECRET)=' \$FILE > \$TMP 2>/dev/null || touch \$TMP @@ -320,7 +333,11 @@ steps: printf 'OAUTH_CLIENT_SECRET=%s\n' '$${AI_OAUTH_CLIENT_SECRET}' } > \$FILE rm -f \$TMP - echo ' [OK] ai/ai.env secrets updated'";; + echo ' [OK] ai/ai.env secrets updated' + source /tmp/cs.sh + create_or_update_secret 'flowagent_azure_client_id' '$${FLOWAGENT_AZURE_CLIENT_ID}' + create_or_update_secret 'flowagent_azure_tenant_id' '$${FLOWAGENT_AZURE_TENANT_ID}' + create_or_update_secret 'flowagent_azure_client_secret' '$${FLOWAGENT_AZURE_CLIENT_SECRET}'";; entertainment) ssh -o StrictHostKeyChecking=no root@$${SWARM_MANAGER_IP} "source /tmp/cs.sh create_or_update_secret 'entertainment_discord_token' '$${ENTERTAINMENT_DISCORD_TOKEN}' diff --git a/ai/ai.yaml b/ai/ai.yaml index ed9fa52..705266c 100644 --- a/ai/ai.yaml +++ b/ai/ai.yaml @@ -127,7 +127,7 @@ services: labels: - traefik.enable=false mcpo: - image: ghcr.io/open-webui/mcpo:main + image: git.bryanmail.net/homelab/flowagent-mcpo:916164714429 command: - --config - /app/config/config.json @@ -141,6 +141,13 @@ services: - /volume1/docker/mcpo/data:/mcpo_data - /volume1/docker/cronicle/ssh_keys:/app/ssh_keys:ro - /volume1/docker/mcpo/uv-cache:/app/uv-cache + secrets: + - source: flowagent_azure_client_id + target: flowagent_azure_client_id + - source: flowagent_azure_tenant_id + target: flowagent_azure_tenant_id + - source: flowagent_azure_client_secret + target: flowagent_azure_client_secret networks: - traefik_backend deploy: @@ -173,6 +180,13 @@ services: - traefik.http.middlewares.n8n.headers.STSPreload=true - traefik.http.routers.n8n.middlewares=forwardAuth-authentik@file, crowdsec@file - traefik.swarm.network=traefik_backend +secrets: + flowagent_azure_client_id: + external: true + flowagent_azure_tenant_id: + external: true + flowagent_azure_client_secret: + external: true networks: traefik_backend: external: true