Dokploy
diff --git a/‎…EQUEST_TEMPLATE/pull_request_template.md‎ ‎.github/pull_request_template.md‎.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/pull_request_template.md
Lines changed: 4 additions & 3 deletions b/‎…EQUEST_TEMPLATE/pull_request_template.md‎ ‎.github/pull_request_template.md‎.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/pull_request_template.md
Lines changed: 4 additions & 3 deletions
diff --git a/‎.github/workflows/deploy-preview.yml‎
Lines changed: 3 additions & 1 deletion b/‎.github/workflows/deploy-preview.yml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎…orkflows/cloudflare-pages-production.yml‎ ‎.github/workflows/deploy-production.yml‎.github/workflows/cloudflare-pages-production.yml renamed to .github/workflows/deploy-production.yml b/‎…orkflows/cloudflare-pages-production.yml‎ ‎.github/workflows/deploy-production.yml‎.github/workflows/cloudflare-pages-production.yml renamed to .github/workflows/deploy-production.yml
diff --git a/‎.github/workflows/validate-docker-compose.yml‎
Lines changed: 317 additions & 0 deletions b/‎.github/workflows/validate-docker-compose.yml‎
Lines changed: 317 additions & 0 deletions
diff --git a/‎.github/workflows/validate-meta.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/validate-meta.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/validate.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/validate.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
@@ -6,12 +6,13 @@ New PR of [Template Name]
 
 Before submitting this PR, please make sure that:
 
-- [ ] I have read the suggestions in the README.md file https://github.com/Dokploy/templates?tab=readme-ov-file#general-suggestions-when-creating-a-template
+- [ ] I have read the suggestions in the README.md file https://github.com/Dokploy/templates?tab=readme-ov-file#general-requirements-when-creating-a-template
 - [ ] I have tested the template in my instance, so the maintainers don't spend time trying to figure out what's wrong.
 - [ ] I have added tests that demonstrate that my correction works or that my new feature works.
 
 ## Issues related (if applicable)
 
-Close automatically the related issues using the keywords: `closes #ISSUE_NUMBER`, `fixes #ISSUE_NUMBER`, `resolves #ISSUE_NUMBER`
+Close automatically the related issues using the keywords: `closes #ISSUE_NUMBER`
 
-Example: `closes #123`
+
+## Screenshots or Videos
@@ -5,7 +5,9 @@ on:
     workflows: [Build Preview Deployment]
     types:
       - completed
-
+  pull_request:
+    branches:
+      - canary
 permissions:
   actions: read
   deployments: write
 
@@ -0,0 +1,317 @@
+name: Validate Docker Compose Files
+
+on:
+  pull_request:
+    branches:
+      - canary
+    paths:
+      - 'blueprints/**/docker-compose.yml'
+      - 'blueprints/**/template.toml'
+  workflow_dispatch:
+
+jobs:
+  validate-docker-compose:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Necesitamos el historial completo para comparar con base
+
+      - name: Set up Docker Compose
+        run: |
+          echo "🐳 Setting up Docker Compose..."
+          # Docker Compose V2 viene preinstalado en ubuntu-latest
+          docker compose version
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.16.0
+
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 8
+
+      - name: Install dependencies
+        run: |
+          echo "📦 Installing Node.js dependencies..."
+          cd build-scripts && pnpm install
+
+      - name: Get changed files
+        id: changed-files
+        run: |
+          echo "🔍 Detecting changed files..."
+          
+          # Obtener la rama base
+          BASE_SHA=$(git merge-base HEAD origin/${{ github.base_ref }})
+          
+          # Encontrar todos los archivos docker-compose.yml y template.toml modificados/agregados
+          CHANGED_COMPOSE=$(git diff --name-only --diff-filter=ACMRT $BASE_SHA HEAD | grep -E 'blueprints/.*/docker-compose\.yml$' || true)
+          CHANGED_TOML=$(git diff --name-only --diff-filter=ACMRT $BASE_SHA HEAD | grep -E 'blueprints/.*/template\.toml$' || true)
+          
+          # Crear lista de directorios únicos que tienen cambios
+          CHANGED_DIRS=$(echo -e "$CHANGED_COMPOSE\n$CHANGED_TOML" | sed 's|blueprints/\([^/]*\)/.*|\1|' | sort -u)
+          
+          echo "Changed compose files:"
+          echo "$CHANGED_COMPOSE" | while read file; do [ -n "$file" ] && echo "  - $file"; done
+          
+          echo "Changed TOML files:"
+          echo "$CHANGED_TOML" | while read file; do [ -n "$file" ] && echo "  - $file"; done
+          
+          echo "Changed directories:"
+          echo "$CHANGED_DIRS" | while read dir; do [ -n "$dir" ] && echo "  - $dir"; done
+          
+          # Guardar para usar en siguientes pasos
+          echo "compose_files<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGED_COMPOSE" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          
+          echo "toml_files<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGED_TOML" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          
+          echo "directories<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGED_DIRS" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Validate Docker Compose files syntax
+        id: validate-compose-syntax
+        run: |
+          echo "🔍 Validating Docker Compose files syntax..."
+          
+          ERROR=0
+          COMPOSE_FILES="${{ steps.changed-files.outputs.compose_files }}"
+          
+          if [ -z "$COMPOSE_FILES" ]; then
+            echo "ℹ️ No docker-compose.yml files changed, skipping validation"
+            exit 0
+          fi
+          
+          echo "$COMPOSE_FILES" | while read -r compose_file; do
+            if [ -z "$compose_file" ]; then
+              continue
+            fi
+            
+            TEMPLATE_DIR=$(dirname "$compose_file")
+            TEMPLATE_NAME=$(basename "$TEMPLATE_DIR")
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "📦 Validating syntax: $TEMPLATE_NAME"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            
+            # Validar sintaxis de docker-compose.yml usando docker compose
+            echo "🔍 Validating docker-compose.yml syntax..."
+            if ! docker compose -f "$compose_file" config > /dev/null 2>&1; then
+              echo "❌ ERROR: docker-compose.yml syntax is invalid in $TEMPLATE_NAME"
+              echo "Running docker compose config to show errors:"
+              docker compose -f "$compose_file" config 2>&1 || true
+              ERROR=1
+            else
+              echo "✅ docker-compose.yml syntax is valid"
+            fi
+            
+            # Obtener lista de servicios del compose
+            SERVICES=$(docker compose -f "$compose_file" config --services 2>/dev/null || echo "")
+            echo "📋 Services found in docker-compose.yml:"
+            echo "$SERVICES" | while read service; do
+              [ -n "$service" ] && echo "   - $service"
+            done
+            
+            # Guardar servicios para validación posterior
+            echo "$SERVICES" > "/tmp/${TEMPLATE_NAME}_services.txt"
+          done
+          
+          if [ $ERROR -eq 1 ]; then
+            echo ""
+            echo "❌ Docker Compose syntax validation failed"
+            exit 1
+          else
+            echo ""
+            echo "✅ All Docker Compose files have valid syntax"
+          fi
+
+      - name: Validate Docker Compose best practices
+        id: validate-compose-practices
+        run: |
+          echo "🔍 Validating Docker Compose best practices..."
+          
+          ERROR=0
+          COMPOSE_FILES="${{ steps.changed-files.outputs.compose_files }}"
+          
+          if [ -z "$COMPOSE_FILES" ]; then
+            echo "ℹ️ No docker-compose.yml files changed, skipping validation"
+            exit 0
+          fi
+          
+          # Convert to array to avoid subshell issues with pipe
+          # This ensures ERROR=1 inside the loop propagates to the parent shell
+          mapfile -t COMPOSE_ARRAY <<< "$COMPOSE_FILES"
+          
+          for compose_file in "${COMPOSE_ARRAY[@]}"; do
+            if [ -z "$compose_file" ]; then
+              continue
+            fi
+            
+            TEMPLATE_DIR=$(dirname "$compose_file")
+            TEMPLATE_NAME=$(basename "$TEMPLATE_DIR")
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "📦 Validating best practices: $TEMPLATE_NAME"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            
+            # Validar usando el script de TypeScript
+            if ! (cd build-scripts && pnpm exec tsx validate-docker-compose.ts --file "../$compose_file" --verbose); then
+              ERROR=1
+            fi
+          done
+          
+          if [ $ERROR -eq 1 ]; then
+            echo ""
+            echo "❌ Docker Compose best practices validation failed"
+            exit 1
+          else
+            echo ""
+            echo "✅ All Docker Compose files follow best practices"
+          fi
+
+      - name: Validate template.toml files
+        id: validate-toml
+        run: |
+          echo "🔍 Validating template.toml files..."
+          
+          ERROR=0
+          DIRECTORIES="${{ steps.changed-files.outputs.directories }}"
+          
+          if [ -z "$DIRECTORIES" ]; then
+            echo "ℹ️ No template directories changed, skipping TOML validation"
+            exit 0
+          fi
+          
+          # Convert to array to avoid subshell issues with pipe
+          # This ensures ERROR=1 inside the loop propagates to the parent shell
+          mapfile -t DIRS_ARRAY <<< "$DIRECTORIES"
+          
+          for template_dir in "${DIRS_ARRAY[@]}"; do
+            if [ -z "$template_dir" ]; then
+              continue
+            fi
+            
+            TEMPLATE_PATH="blueprints/$template_dir"
+            TOML_FILE="$TEMPLATE_PATH/template.toml"
+            
+            if [ ! -f "$TOML_FILE" ]; then
+              echo "⚠️  WARNING: template.toml not found in $template_dir (might be deleted)"
+              continue
+            fi
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "📝 Validating: $template_dir/template.toml"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            
+            # Validar usando el script de TypeScript con tsx
+            # Ejecutar desde build-scripts para tener acceso a node_modules
+            if ! (cd build-scripts && pnpm exec tsx validate-template.ts --dir "../$TEMPLATE_PATH" --verbose); then
+              ERROR=1
+            fi
+          done
+          
+          if [ $ERROR -eq 1 ]; then
+            echo ""
+            echo "❌ template.toml validation failed"
+            exit 1
+          else
+            echo ""
+            echo "✅ All template.toml files are valid"
+          fi
+
+      - name: Test Docker Compose (dry-run)
+        id: test-compose
+        run: |
+          echo "🧪 Testing Docker Compose files (dry-run)..."
+          
+          ERROR=0
+          DIRECTORIES="${{ steps.changed-files.outputs.directories }}"
+          
+          if [ -z "$DIRECTORIES" ]; then
+            echo "ℹ️ No template directories changed, skipping dry-run test"
+            exit 0
+          fi
+          
+          echo "$DIRECTORIES" | while read -r template_dir; do
+            if [ -z "$template_dir" ]; then
+              continue
+            fi
+            
+            COMPOSE_FILE="blueprints/$template_dir/docker-compose.yml"
+            
+            if [ ! -f "$COMPOSE_FILE" ]; then
+              continue
+            fi
+            
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "🧪 Testing: $template_dir"
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            
+            # Cambiar al directorio del template para resolver rutas relativas
+            cd "blueprints/$template_dir"
+            
+            # Validar que docker-compose puede parsear el archivo completamente
+            echo "🔍 Running docker compose config (full validation)..."
+            if docker compose config > /dev/null 2>&1; then
+              echo "✅ Docker Compose file is fully valid and can be processed"
+              
+              # Mostrar información útil
+              echo "📋 Configuration summary:"
+              docker compose config --services | while read service; do
+                [ -n "$service" ] && echo "   Service: $service"
+              done
+            else
+              echo "❌ ERROR: Docker Compose file failed full validation"
+              docker compose config 2>&1 || true
+              ERROR=1
+            fi
+            
+            cd - > /dev/null
+          done
+          
+          if [ $ERROR -eq 1 ]; then
+            echo ""
+            echo "❌ Docker Compose dry-run test failed"
+            exit 1
+          else
+            echo ""
+            echo "✅ All Docker Compose files passed dry-run test"
+          fi
+
+      - name: Summary
+        if: always()
+        run: |
+          echo ""
+          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+          echo "📊 Validation Summary"
+          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+          
+          if [ "${{ steps.validate-compose-syntax.outcome }}" == "success" ] && \
+             [ "${{ steps.validate-compose-practices.outcome }}" == "success" ] && \
+             [ "${{ steps.validate-toml.outcome }}" == "success" ] && \
+             [ "${{ steps.test-compose.outcome }}" == "success" ]; then
+            echo "✅ All validations passed!"
+            echo ""
+            echo "Your Docker Compose and template.toml files are valid and ready to merge."
+          else
+            echo "❌ Some validations failed. Please review the errors above."
+            echo ""
+            echo "Common issues to check:"
+            echo "  - docker-compose.yml syntax errors"
+            echo "  - template.toml syntax errors"
+            echo "  - serviceName in template.toml must match service names in docker-compose.yml"
+            echo "  - Avoid using container_name, explicit networks, or port mappings"
+          fi
+
@@ -2,10 +2,10 @@ name: Validate and Process Meta.json
 
 on:
   push:
-    branches: [main, master, develop]
+    branches: [canary]
     paths: ["meta.json"]
   pull_request:
-    branches: [main, master]
+    branches: [canary]
     paths: ["meta.json"]
   workflow_dispatch:
 
 
@@ -3,10 +3,10 @@ name: Validate Blueprints Structure and Meta
 on:
   pull_request:
     branches:
-      - main
+      - canary
   push:
     branches:
-      - main
+      - canary
 
 jobs:
   validate:
 
@@ -0,0 +1 @@
+node_modules
@@ -170,7 +170,7 @@ We have a few helpers that are very common when creating a template, these are:
 
 
 
-## General Suggestions when creating a template
+## General Requirements when creating a template
 
 - Don't use this way in your docker compose file:
 
@@ -225,4 +225,4 @@ services:
 6. Now you can click on the Deploy Button and wait for the deployment to finish, and try to access to the service, if everything is correct you should access to the service and see the template working.
 
 
-use the command `node dedupe-and-sort-meta.js` to deduplicate and sort the meta.json file.
+use the command `node dedupe-and-sort-meta.js` to deduplicate and sort the meta.json file.