Compare commits

17 Commits

Author SHA1 Message Date
86fe7a8bf1 feat: Add multilingual deployment progress messages
Some checks failed
Build and Push Docker Image (Production) / build-and-push-main (push) Successful in 2m32s
Build and Push Docker Image (Dev) / build-and-push-dev (push) Has been cancelled
Build and Push Docker Image (Staging) / build-and-push-staging (push) Successful in 4m17s
- Created backend i18n system with EN/NL/AR translations
- Frontend now sends language preference with deployment request
- Backend deployment messages follow user's selected language
- Translated key messages: initializing, creating app, SSL waiting, etc.
- Added top margin (100px) on mobile to prevent language button overlap

Fixes real-time deployment status showing English regardless of language selection.
2026-01-13 16:40:05 +01:00
dd41bb5a6a Margin top mobile
All checks were successful
Build and Push Docker Image (Production) / build-and-push-main (push) Successful in 2m39s
2026-01-13 16:33:04 +01:00
8c8536f668 fix: Use standard Docker Compose variable syntax
All checks were successful
Build and Push Docker Image (Production) / build-and-push-main (push) Successful in 2m57s
Changed from ${{project.VAR}} to ${VAR} syntax.

The ${{project.VAR}} syntax is for Dokploy's Environment editor UI,
not for docker-compose.yml files. Docker Compose requires standard
${VAR} syntax to read from .env file.

The .env file (managed by Dokploy) already contains the actual values.
2026-01-13 16:19:44 +01:00
db3a86404a fix: Use single dollar for Dokploy variable substitution
All checks were successful
Build and Push Docker Image (Production) / build-and-push-main (push) Successful in 2m13s
Official Dokploy docs specify ${{project.VAR}} (single $), not $${{project.VAR}}.
Double $$ is Docker Compose escape syntax preventing Dokploy substitution.

Caused missing SHARED_PROJECT_ID/SHARED_ENVIRONMENT_ID in portal container.

Ref: https://docs.dokploy.com/docs/core/variables
2026-01-13 16:17:13 +01:00
d900d905de docs: add critical Docker Compose custom command configuration
- Document requirement for custom compose command with -f flag
- Add troubleshooting section for 'no configuration file provided' error
- Include examples for dev/staging/prod environments
- Explain why Dokploy needs explicit -f flag for non-default filenames

Resolves issue where Dokploy couldn't find docker-compose.prod.yml
2026-01-13 15:52:17 +01:00
3d07301992 trigger redeploy 2026-01-13 15:20:38 +01:00
f5be8d856d Merge staging into main - resolve conflicts
All checks were successful
Build and Push Docker Image (Production) / build-and-push-main (push) Successful in 3m34s
2026-01-13 15:03:06 +01:00
3bda68282e Merge dev into staging - resolve docker-compose.local.yml conflict
All checks were successful
Build and Push Docker Image (Staging) / build-and-push-staging (push) Successful in 2m16s
2026-01-13 15:01:43 +01:00
968dc74555 docs: add testing session 2026-01-13 findings
- Verified workflow separation and dollar sign escaping
- Retrieved shared project and environment IDs
- Tested local dev server health endpoint
- Documented Dokploy API token blocker (returns Forbidden)
- Added commands for resolving token issue
- Updated environment configuration requirements
2026-01-13 14:07:20 +01:00
eb2745dd5a workflows changes
All checks were successful
Build and Push Docker Image (Dev) / build-and-push-dev (push) Successful in 2m8s
2026-01-13 13:48:42 +01:00
1ff69f9328 fix: re-apply dollar sign escape in docker-compose.dev.yml
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 2m12s
Problem: Commit c2c188f (docker ports removed) accidentally reverted the
dollar sign escape fix from commit dd063d5.

Evidence:
- git show dd063d5:docker-compose.dev.yml shows: $${{project.SHARED_PROJECT_ID}} 
- Current docker-compose.dev.yml has: ${{project.SHARED_PROJECT_ID}} 
- Dokploy error log shows: 'You may need to escape any $ with another $'
- staging.yml and prod.yml still have correct $$ (lines 16-17)

Root Cause:
Manual edit in c2c188f modified docker-compose files and accidentally
removed one dollar sign during the 'docker ports removed' change.

Solution:
Re-applied dollar sign escape: $ → $$ on lines 14-15

Verification:
- grep "SHARED_PROJECT_ID" docker-compose.*.yml shows all have $${{
- docker-compose.dev.yml now matches staging.yml and prod.yml

This will fix the Dokploy deployment error.
2026-01-13 13:40:54 +01:00
ef24af3302 Docker ports removed 2026-01-13 13:34:13 +01:00
7dff5454a0 Docker ports removed 2026-01-13 13:33:35 +01:00
c2c188f09f docker ports removed
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 2m14s
2026-01-13 13:32:46 +01:00
254b7710d7 fix: add docker-compose files to workflow trigger paths
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 2m23s
Problem: Commit dd063d5 modified docker-compose*.yml files but did NOT
trigger Gitea Actions build because docker-compose files were not in the
workflow's paths trigger list.

Evidence:
- git show --stat dd063d5 shows only docker-compose*.yml and docs/ changed
- .gitea/workflows/docker-publish.yaml paths did not include docker-compose*.yml
- Gitea Actions did not run after push (verified by user)

Solution:
Added 'docker-compose*.yml' to workflow paths trigger list.

Justification:
Docker-compose files are deployment configuration that should trigger
image rebuilds when changed. This ensures Dokploy applications always
pull images with the latest docker-compose configurations.

Testing:
This commit will trigger a build because it modifies .gitea/workflows/**
(which is in the paths list). Future docker-compose changes will also trigger.
2026-01-13 13:24:36 +01:00
dd063d5ac5 fix: escape dollar signs in Dokploy project-level variables
Docker Compose interprets $ as variable substitution, so we need to escape
Dokploy's project-level variable syntax by doubling the dollar sign.

Changes:
- docker-compose.*.yml: ${{project.VAR}} → $${{project.VAR}}
- Updated DOKPLOY_DEPLOYMENT.md with correct syntax and explanation
- Updated SHARED_PROJECT_DEPLOYMENT.md with correct syntax and explanation

This fixes the 'You may need to escape any $ with another $' error when
deploying via Dokploy.

Evidence: Tested in Dokploy deployment - error resolved with $$ escaping.
2026-01-13 13:12:06 +01:00
2885990ac6 fixed bun AVX
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 5m22s
2026-01-13 11:33:27 +01:00
15 changed files with 420 additions and 59 deletions

View File

@@ -0,0 +1,57 @@
name: Build and Push Docker Image (Dev)
on:
push:
branches:
- dev
paths:
- 'src/**'
- 'client/**'
- 'Dockerfile'
- 'docker-compose.dev.yml'
- 'package.json'
- '.gitea/workflows/docker-publish-dev.yaml'
workflow_dispatch:
env:
REGISTRY: git.app.flexinit.nl
IMAGE_NAME: oussamadouhou/ai-stack-deployer
jobs:
build-and-push-dev:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: oussamadouhou
password: ${{ secrets.REGISTRY_TOKEN }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=dev
type=sha,prefix=dev-
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

View File

@@ -0,0 +1,57 @@
name: Build and Push Docker Image (Production)
on:
push:
branches:
- main
paths:
- 'src/**'
- 'client/**'
- 'Dockerfile'
- 'docker-compose.prod.yml'
- 'package.json'
- '.gitea/workflows/docker-publish-main.yaml'
workflow_dispatch:
env:
REGISTRY: git.app.flexinit.nl
IMAGE_NAME: oussamadouhou/ai-stack-deployer
jobs:
build-and-push-main:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: oussamadouhou
password: ${{ secrets.REGISTRY_TOKEN }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest
type=sha,prefix=main-
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

View File

@@ -1,17 +1,16 @@
name: Build and Push Docker Image
name: Build and Push Docker Image (Staging)
on:
push:
branches:
- dev
- staging
- main
paths:
- 'src/**'
- 'client/**'
- 'Dockerfile'
- 'docker-compose.staging.yml'
- 'package.json'
- '.gitea/workflows/**'
- '.gitea/workflows/docker-publish-staging.yaml'
workflow_dispatch:
env:
@@ -19,7 +18,7 @@ env:
IMAGE_NAME: oussamadouhou/ai-stack-deployer
jobs:
build-and-push:
build-and-push-staging:
runs-on: ubuntu-latest
permissions:
contents: read
@@ -45,10 +44,8 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }}
type=raw,value=staging,enable=${{ github.ref == 'refs/heads/staging' }}
type=sha,prefix={{branch}}-
type=raw,value=staging
type=sha,prefix=staging-
- name: Build and push Docker image
uses: docker/build-push-action@v5

View File

@@ -36,7 +36,7 @@ export const translations = {
title: 'AI Stack Deployer',
subtitle: 'Implementeer je persoonlijke AI in seconden',
chooseStackName: 'Kies Je Stack Naam',
availableAt: 'Je zal AI-assistenten beschikbaar zijn op',
availableAt: 'Je AI-assistenten zal beschikbaar zijn op',
stackName: 'Stack Naam',
placeholder: 'bijv., Oussama',
inputHint: '3-20 tekens, kleine letters, cijfers en koppeltekens',

View File

@@ -34,7 +34,7 @@ export default function DeployPage() {
const response = await fetch('/api/deploy', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ name }),
body: JSON.stringify({ name, lang }),
});
const data = await response.json();
@@ -118,15 +118,15 @@ export default function DeployPage() {
dotSize={2}
/>
</div>
<div className="absolute inset-0 bg-[radial-gradient(circle_at_center,_rgba(0,0,0,1)_0%,_transparent_100%)]" />
<div className="absolute top-0 left-0 right-0 h-1/3 bg-gradient-to-b from-black to-transparent" />
<div className="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(0,0,0,1)_0%,transparent_100%)]" />
<div className="absolute top-0 left-0 right-0 h-1/3 bg-linear-to-b from-black to-transparent" />
</div>
<LanguageSelector currentLang={lang} onLangChange={setLang} />
<div className="relative z-10 w-full max-w-[640px] p-4 md:p-8">
<header className="text-center mb-12">
<motion.h1
<div className="relative z-10 w-full max-w-w160 p-4 md:p-8">
<header className="text-center mb-12 mt-25 md:mt-0">
<motion.h1
initial={{ opacity: 0, y: -20 }}
animate={{ opacity: 1, y: 0 }}
transition={{ duration: 0.5, delay: 0.1 }}
@@ -134,7 +134,7 @@ export default function DeployPage() {
>
{t('title')}
</motion.h1>
<motion.p
<motion.p
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.5, delay: 0.2 }}
@@ -207,7 +207,7 @@ export default function DeployPage() {
</AnimatePresence>
</main>
<motion.footer
<motion.footer
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ duration: 0.5, delay: 0.5 }}

View File

@@ -1,11 +1,7 @@
version: "3.8"
services:
ai-stack-deployer:
image: git.app.flexinit.nl/oussamadouhou/ai-stack-deployer:dev
container_name: ai-stack-deployer-dev
ports:
- "3000:3000"
environment:
- NODE_ENV=development
- PORT=3000
@@ -15,8 +11,8 @@ services:
- STACK_DOMAIN_SUFFIX=${STACK_DOMAIN_SUFFIX:-ai.flexinit.nl}
- STACK_IMAGE=${STACK_IMAGE:-git.app.flexinit.nl/flexinit/agent-stack:latest}
- RESERVED_NAMES=${RESERVED_NAMES:-admin,api,www,root,system,test,demo,portal}
- SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
- SHARED_PROJECT_ID=${SHARED_PROJECT_ID}
- SHARED_ENVIRONMENT_ID=${SHARED_ENVIRONMENT_ID}
env_file:
- .env
restart: unless-stopped

View File

@@ -6,8 +6,6 @@ services:
context: .
dockerfile: Dockerfile
container_name: ai-stack-deployer-local
ports:
- "3000:3000"
environment:
- NODE_ENV=development
- PORT=3000

View File

@@ -4,8 +4,6 @@ services:
ai-stack-deployer:
image: git.app.flexinit.nl/oussamadouhou/ai-stack-deployer:latest
container_name: ai-stack-deployer
ports:
- "3000:3000"
environment:
- NODE_ENV=production
- PORT=3000
@@ -15,8 +13,8 @@ services:
- STACK_DOMAIN_SUFFIX=${STACK_DOMAIN_SUFFIX:-ai.flexinit.nl}
- STACK_IMAGE=${STACK_IMAGE:-git.app.flexinit.nl/flexinit/agent-stack:latest}
- RESERVED_NAMES=${RESERVED_NAMES:-admin,api,www,root,system,test,demo,portal}
- SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
- SHARED_PROJECT_ID=${SHARED_PROJECT_ID}
- SHARED_ENVIRONMENT_ID=${SHARED_ENVIRONMENT_ID}
env_file:
- .env
restart: unless-stopped

View File

@@ -4,8 +4,6 @@ services:
ai-stack-deployer:
image: git.app.flexinit.nl/oussamadouhou/ai-stack-deployer:staging
container_name: ai-stack-deployer-staging
ports:
- "3000:3000"
environment:
- NODE_ENV=staging
- PORT=3000
@@ -15,8 +13,8 @@ services:
- STACK_DOMAIN_SUFFIX=${STACK_DOMAIN_SUFFIX:-ai.flexinit.nl}
- STACK_IMAGE=${STACK_IMAGE:-git.app.flexinit.nl/flexinit/agent-stack:latest}
- RESERVED_NAMES=${RESERVED_NAMES:-admin,api,www,root,system,test,demo,portal}
- SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
- SHARED_PROJECT_ID=${SHARED_PROJECT_ID}
- SHARED_ENVIRONMENT_ID=${SHARED_ENVIRONMENT_ID}
env_file:
- .env
restart: unless-stopped

View File

@@ -143,13 +143,15 @@ In the shared project (`ai-stack-portal`), add these **project-level environment
The portal's docker-compose files use Dokploy's variable syntax to reference these:
```yaml
environment:
- SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
```
```yaml
environment:
- SHARED_PROJECT_ID=$${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=$${{project.SHARED_ENVIRONMENT_ID}}
```
**This syntax `${{project.VARIABLE}}` tells Dokploy**: "Get this value from the project-level environment variables"
**This syntax `$${{project.VARIABLE}}` tells Dokploy**: "Get this value from the project-level environment variables"
**Note**: The double `$$` is required to escape the dollar sign in Docker Compose files.
### Important Notes
@@ -199,12 +201,48 @@ environment:
SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
```
4. **Configure Webhook**:
4. **⚠️ CRITICAL: Configure Custom Docker Compose Command**:
Because we use non-default compose file names (`docker-compose.dev.yml`, `docker-compose.prod.yml`, etc.), you **MUST** configure a custom command in Dokploy.
**In Dokploy UI:**
- Go to the application **Settings** or **Advanced** tab
- Find **"Custom Command"** or **"Docker Compose Command"** field
- Set it to:
```bash
compose -p <app-name> -f ./docker-compose.dev.yml up -d --remove-orphans --pull always
```
**Replace `<app-name>`** with your actual application name from Dokploy (e.g., `aistackportal-portal-0rohwx`)
**Replace `docker-compose.dev.yml`** with the appropriate file for each environment:
- Dev: `docker-compose.dev.yml`
- Staging: `docker-compose.staging.yml`
- Production: `docker-compose.prod.yml`
**Why this is required:**
- Dokploy's default command is `docker compose up -d` without the `-f` flag
- Without `-f`, docker looks for `docker-compose.yml` (which doesn't exist)
- This causes the error: `no configuration file provided: not found`
**Full examples:**
```bash
# Dev
compose -p aistackportal-deployer-dev-xyz123 -f ./docker-compose.dev.yml up -d --remove-orphans --pull always
# Staging
compose -p aistackportal-deployer-staging-abc456 -f ./docker-compose.staging.yml up -d --remove-orphans --pull always
# Production
compose -p aistackportal-portal-0rohwx -f ./docker-compose.prod.yml up -d --remove-orphans --pull always
```
5. **Configure Webhook**:
- Event: **Push**
- Branch: `dev`
- This will auto-deploy when you push to dev branch
5. **Deploy**
6. **Deploy**
### Step 2: Create Staging Application
@@ -412,6 +450,42 @@ Common issues:
```
3. **Check environment variables**: Make sure all required vars are set
### Error: "no configuration file provided: not found"
**Symptom:**
```
╔══════════════════════════════════════════════════════════════════════════════╗
║ Command: docker compose up -d --force-recreate --pull always ║
╚══════════════════════════════════════════════════════════════════════════════╝
no configuration file provided: not found
Error: ❌ Docker command failed
```
**Cause:** Dokploy is looking for the default `docker-compose.yml` file, which doesn't exist. We use environment-specific files (`docker-compose.dev.yml`, `docker-compose.prod.yml`, etc.).
**Solution:** Configure a **custom Docker Compose command** in Dokploy:
1. Go to your application in Dokploy UI
2. Navigate to **Settings** → **Advanced** (or similar section)
3. Find **"Custom Command"** field
4. Set it to:
```bash
compose -p <app-name> -f ./docker-compose.{env}.yml up -d --remove-orphans --pull always
```
Replace:
- `<app-name>` with your actual Dokploy app name (e.g., `aistackportal-portal-0rohwx`)
- `{env}` with `dev`, `staging`, or `prod`
**Example for production:**
```bash
compose -p aistackportal-portal-0rohwx -f ./docker-compose.prod.yml up -d --remove-orphans --pull always
```
5. Save and redeploy
**Why the `-f` flag is needed:** Docker Compose defaults to looking for `docker-compose.yml`. The `-f` flag explicitly specifies which file to use.
### Health Check Failing
```bash

View File

@@ -17,7 +17,7 @@ The AI Stack Deployer portal deploys **all user AI stacks to a single shared Dok
│ 📦 Portal Application: ai-stack-deployer-prod │
│ ├─ Domain: portal.ai.flexinit.nl │
│ ├─ Image: git.app.flexinit.nl/.../ai-stack-deployer:latest│
│ └─ Env: SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}} │
│ └─ Env: SHARED_PROJECT_ID=$${{project.SHARED_PROJECT_ID}} │
│ │
│ ───────────────────────────────────────────────────────────── │
│ │
@@ -56,9 +56,11 @@ When a user submits a stack name (e.g., "john-dev"), the portal:
2. **These are set via Dokploy's project-level variables**:
```yaml
environment:
- SHARED_PROJECT_ID=${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=${{project.SHARED_ENVIRONMENT_ID}}
- SHARED_PROJECT_ID=$${{project.SHARED_PROJECT_ID}}
- SHARED_ENVIRONMENT_ID=$${{project.SHARED_ENVIRONMENT_ID}}
```
**Note**: The double `$$` is required to escape the dollar sign in Docker Compose.
### Step 2: Portal Deploys to Shared Project

View File

@@ -261,3 +261,113 @@ Authorization: token <your-api-token>
|-----|---------|
| `GITEA_API_TOKEN` | Gitea API access for workflow status |
| `DOKPLOY_API_TOKEN` | Dokploy deployment API (BWS ID: `6b3618fc-ba02-49bc-bdc8-b3c9004087bc`) |
---
## Testing Session: 2026-01-13
### Session Summary
**Goal:** Verify multi-environment deployment setup and shared project configuration.
### Completed Tasks
| Task | Status | Evidence |
|------|--------|----------|
| Workflow separation (dev/staging/main) | ✅ | Committed as `eb2745d` |
| Dollar sign escaping (`$${{project.VAR}}`) | ✅ | Verified in all docker-compose.*.yml |
| Shared project exists | ✅ | `ai-stack-portal` (ID: `2y2Glhz5Wy0dBNf6BOR_-`) |
| Environment IDs retrieved | ✅ | See below |
| Local dev server health | ✅ | `/health` returns healthy |
### Environment IDs
```
Project: ai-stack-portal
ID: 2y2Glhz5Wy0dBNf6BOR_-
Environments:
- production: _dKAmxVcadqi-z73wKpEB (default)
- deployments: RqE9OFMdLwkzN7pif1xN8 (for user stacks)
- test: KVKn5fXGz10g7KVxPWOQj
```
### Blockers Identified
#### BLOCKER: Dokploy API Token Permissions
**Symptom:** All Dokploy API calls return `Forbidden`
```bash
# Previously working
curl -s "https://app.flexinit.nl/api/project.all" -H "x-api-key: $DOKPLOY_API_TOKEN"
# Now returns: Forbidden
# Environment endpoint
curl -s "https://app.flexinit.nl/api/environment.one?environmentId=RqE9OFMdLwkzN7pif1xN8" -H "x-api-key: $DOKPLOY_API_TOKEN"
# Returns: Forbidden
```
**Root Cause:** The API token `app_deployment...` has been revoked or has limited scope.
**Impact:**
- Cannot verify Docker image exists in registry
- Cannot test name availability (requires `environment.one`)
- Cannot create applications or compose stacks
- Cannot deploy portal to Dokploy
**Resolution Required:**
1. Log into Dokploy UI at https://app.flexinit.nl
2. Navigate to Settings → API Keys
3. Generate new API key with full permissions:
- Read/Write access to projects
- Read/Write access to applications
- Read/Write access to compose stacks
- Read/Write access to domains
4. Update `.env` with new token
5. Update BWS secret (ID: `6b3618fc-ba02-49bc-bdc8-b3c9004087bc`)
### Local Testing Results
```bash
# Health check - WORKS
curl -s "http://localhost:3000/health"
# {"status":"healthy","timestamp":"2026-01-13T13:01:46.100Z","version":"0.2.0",...}
# Name check - FAILS (API token issue)
curl -s "http://localhost:3000/api/check/test-stack"
# {"available":false,"valid":false,"error":"Failed to check availability"}
```
### Required .env Configuration
```bash
# Added for shared project deployment
SHARED_PROJECT_ID=2y2Glhz5Wy0dBNf6BOR_-
SHARED_ENVIRONMENT_ID=RqE9OFMdLwkzN7pif1xN8
```
### Next Steps After Token Fix
1. Verify `project.all` API works with new token
2. Deploy portal to Dokploy (docker-compose.dev.yml)
3. Test end-to-end stack deployment
4. Verify stacks deploy to shared project
5. Clean up test deployments
### Commands Reference
```bash
# Test API token
source .env && curl -s "https://app.flexinit.nl/api/project.all" \
-H "x-api-key: $DOKPLOY_API_TOKEN" | jq '.[].name'
# Get environment applications
source .env && curl -s "https://app.flexinit.nl/api/environment.one?environmentId=RqE9OFMdLwkzN7pif1xN8" \
-H "x-api-key: $DOKPLOY_API_TOKEN" | jq '.applications'
# Deploy test stack
curl -X POST http://localhost:3000/api/deploy \
-H "Content-Type: application/json" \
-d '{"name":"test-'$(date +%s | tail -c 4)'"}'
```

View File

@@ -10,9 +10,10 @@ import type { DeploymentState as OrchestratorDeploymentState } from './orchestra
const PORT = parseInt(process.env.PORT || '3000', 10);
const HOST = process.env.HOST || '0.0.0.0';
// Extended deployment state for HTTP server (adds logs)
// Extended deployment state for HTTP server (adds logs and language)
interface HttpDeploymentState extends OrchestratorDeploymentState {
logs: string[];
lang: string;
}
const deployments = new Map<string, HttpDeploymentState>();
@@ -90,6 +91,7 @@ async function deployStack(deploymentId: string): Promise<void> {
registryId: process.env.STACK_REGISTRY_ID,
sharedProjectId: process.env.SHARED_PROJECT_ID,
sharedEnvironmentId: process.env.SHARED_ENVIRONMENT_ID,
lang: deployment.lang,
});
// Final update with logs
@@ -144,7 +146,7 @@ app.get('/health', (c) => {
app.post('/api/deploy', async (c) => {
try {
const body = await c.req.json();
const { name } = body;
const { name, lang = 'en' } = body;
// Validate name
const validation = validateStackName(name);
@@ -197,6 +199,7 @@ app.post('/api/deploy', async (c) => {
started: new Date().toISOString(),
},
logs: [],
lang,
};
deployments.set(deploymentId, deployment);

65
src/lib/i18n-backend.ts Normal file
View File

@@ -0,0 +1,65 @@
export const backendTranslations = {
en: {
'initializing': 'Initializing deployment',
'creatingProject': 'Creating project',
'gettingEnvironment': 'Getting environment ID',
'environmentAvailable': 'Environment ID already available',
'environmentRetrieved': 'Environment ID retrieved',
'creatingApplication': 'Creating application',
'configuringApplication': 'Configuring application',
'creatingDomain': 'Creating domain',
'deployingApplication': 'Deploying application',
'waitingForSSL': 'Waiting for SSL certificate provisioning...',
'waitingForStart': 'Waiting for application to start',
'deploymentSuccess': 'Application deployed successfully',
'verifyingHealth': 'Verifying application health',
},
nl: {
'initializing': 'Implementatie initialiseren',
'creatingProject': 'Project aanmaken',
'gettingEnvironment': 'Omgeving ID ophalen',
'environmentAvailable': 'Omgeving ID al beschikbaar',
'environmentRetrieved': 'Omgeving ID opgehaald',
'creatingApplication': 'Applicatie aanmaken',
'configuringApplication': 'Applicatie configureren',
'creatingDomain': 'Domein aanmaken',
'deployingApplication': 'Applicatie implementeren',
'waitingForSSL': 'Wachten op SSL-certificaat...',
'waitingForStart': 'Wachten tot applicatie start',
'deploymentSuccess': 'Applicatie succesvol geïmplementeerd',
'verifyingHealth': 'Applicatie gezondheid verifiëren',
},
ar: {
'initializing': 'جاري التهيئة',
'creatingProject': 'إنشاء المشروع',
'gettingEnvironment': 'الحصول على معرف البيئة',
'environmentAvailable': 'معرف البيئة متاح بالفعل',
'environmentRetrieved': 'تم استرداد معرف البيئة',
'creatingApplication': 'إنشاء التطبيق',
'configuringApplication': 'تكوين التطبيق',
'creatingDomain': 'إنشاء النطاق',
'deployingApplication': 'نشر التطبيق',
'waitingForSSL': 'انتظار شهادة SSL...',
'waitingForStart': 'انتظار بدء التطبيق',
'deploymentSuccess': 'تم نشر التطبيق بنجاح',
'verifyingHealth': 'التحقق من صحة التطبيق',
},
} as const;
export type BackendLanguage = keyof typeof backendTranslations;
export type BackendTranslationKey = keyof typeof backendTranslations.en;
export function createTranslator(lang: BackendLanguage = 'en') {
return (key: BackendTranslationKey, params?: Record<string, string | number>): string => {
const translations = backendTranslations[lang] || backendTranslations.en;
let text: string = translations[key];
if (params) {
Object.entries(params).forEach(([paramKey, value]) => {
text = text.replace(`{${paramKey}}`, String(value));
});
}
return text;
};
}

View File

@@ -11,6 +11,7 @@
*/
import { DokployProductionClient } from '../api/dokploy-production.js';
import { createTranslator, type BackendLanguage } from '../lib/i18n-backend.js';
export interface DeploymentConfig {
stackName: string;
@@ -22,6 +23,7 @@ export interface DeploymentConfig {
registryId?: string;
sharedProjectId?: string;
sharedEnvironmentId?: string;
lang?: string;
}
export interface DeploymentState {
@@ -71,10 +73,12 @@ export type ProgressCallback = (state: DeploymentState) => void;
export class ProductionDeployer {
private client: DokployProductionClient;
private progressCallback?: ProgressCallback;
private t: ReturnType<typeof createTranslator>;
constructor(client: DokployProductionClient, progressCallback?: ProgressCallback) {
this.client = client;
this.progressCallback = progressCallback;
this.t = createTranslator('en');
}
private notifyProgress(state: DeploymentState): void {
@@ -87,13 +91,15 @@ export class ProductionDeployer {
* Deploy a complete AI stack with full production safeguards
*/
async deploy(config: DeploymentConfig): Promise<DeploymentResult> {
this.t = createTranslator((config.lang || 'en') as BackendLanguage);
const state: DeploymentState = {
id: `dep_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
stackName: config.stackName,
phase: 'initializing',
status: 'in_progress',
progress: 0,
message: 'Initializing deployment',
message: this.t('initializing'),
resources: {},
timestamps: {
started: new Date().toISOString(),
@@ -228,12 +234,12 @@ export class ProductionDeployer {
private async getEnvironment(state: DeploymentState): Promise<void> {
state.phase = 'getting_environment';
state.progress = 25;
state.message = 'Getting environment ID';
state.message = this.t('gettingEnvironment');
// Skip if we already have environment ID from project creation
if (state.resources.environmentId) {
console.log('Environment ID already available from project creation');
state.message = 'Environment ID already available';
state.message = this.t('environmentAvailable');
return;
}
@@ -243,7 +249,7 @@ export class ProductionDeployer {
const environment = await this.client.getDefaultEnvironment(state.resources.projectId);
state.resources.environmentId = environment.environmentId;
state.message = 'Environment ID retrieved';
state.message = this.t('environmentRetrieved');
}
private async createOrFindApplication(
@@ -252,7 +258,7 @@ export class ProductionDeployer {
): Promise<void> {
state.phase = 'creating_application';
state.progress = 40;
state.message = 'Creating application';
state.message = this.t('creatingApplication');
if (!state.resources.environmentId) {
throw new Error('Environment ID not available');
@@ -279,7 +285,7 @@ export class ProductionDeployer {
): Promise<void> {
state.phase = 'configuring_application';
state.progress = 50;
state.message = 'Configuring application with Docker image';
state.message = this.t('configuringApplication');
if (!state.resources.applicationId) {
throw new Error('Application ID not available');
@@ -332,7 +338,7 @@ export class ProductionDeployer {
): Promise<void> {
state.phase = 'creating_domain';
state.progress = 70;
state.message = 'Creating domain';
state.message = this.t('creatingDomain');
if (!state.resources.applicationId) {
throw new Error('Application ID not available');
@@ -359,7 +365,7 @@ export class ProductionDeployer {
private async deployApplication(state: DeploymentState): Promise<void> {
state.phase = 'deploying';
state.progress = 85;
state.message = 'Triggering deployment';
state.message = this.t('deployingApplication');
if (!state.resources.applicationId) {
throw new Error('Application ID not available');
@@ -375,7 +381,7 @@ export class ProductionDeployer {
): Promise<void> {
state.phase = 'verifying_health';
state.progress = 95;
state.message = 'Verifying application status via Dokploy';
state.message = this.t('verifyingHealth');
if (!state.resources.applicationId) {
throw new Error('Application ID not available');
@@ -392,13 +398,13 @@ export class ProductionDeployer {
console.log(`Application status: ${appStatus}`);
if (appStatus === 'done') {
state.message = 'Waiting for SSL certificate provisioning...';
state.message = this.t('waitingForSSL');
state.progress = 98;
this.notifyProgress(state);
await this.sleep(15000);
state.message = 'Application deployed successfully';
state.message = this.t('deploymentSuccess');
return;
}
@@ -410,7 +416,7 @@ export class ProductionDeployer {
}
const elapsed = Math.round((Date.now() - startTime) / 1000);
state.message = `Waiting for application to start (${elapsed}s)...`;
state.message = `${this.t('waitingForStart')} (${elapsed}s)...`;
this.notifyProgress(state);
await this.sleep(interval);