Merge 0164ad5c94 into ce6859648a

- change labels to quality
- add a failure label
- make sure service json files are not changed

.github/workflows/chore-remove-labels-and-assignees-on-close.yml

@@ -1,86 +0,0 @@
-name: Remove Labels and Assignees on Issue Close
-
-on:
-  issues:
-    types: [closed]
-  pull_request:
-    types: [closed]
-  pull_request_target:
-    types: [closed]
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  remove-labels-and-assignees:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remove labels and assignees
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const { owner, repo } = context.repo;
-
-            async function processIssue(issueNumber, isFromPR = false, prBaseBranch = null) {
-              try {
-                if (isFromPR && prBaseBranch !== 'v4.x') {
-                  return;
-                }
-
-                const { data: currentLabels } = await github.rest.issues.listLabelsOnIssue({
-                  owner,
-                  repo,
-                  issue_number: issueNumber
-                });
-
-                const labelsToKeep = currentLabels
-                  .filter(label => label.name === '⏱︎ Stale')
-                  .map(label => label.name);
-
-                await github.rest.issues.setLabels({
-                  owner,
-                  repo,
-                  issue_number: issueNumber,
-                  labels: labelsToKeep
-                });
-
-                const { data: issue } = await github.rest.issues.get({
-                  owner,
-                  repo,
-                  issue_number: issueNumber
-                });
-
-                if (issue.assignees && issue.assignees.length > 0) {
-                  await github.rest.issues.removeAssignees({
-                    owner,
-                    repo,
-                    issue_number: issueNumber,
-                    assignees: issue.assignees.map(assignee => assignee.login)
-                  });
-                }
-              } catch (error) {
-                if (error.status !== 404) {
-                  console.error(`Error processing issue ${issueNumber}:`, error);
-                }
-              }
-            }
-
-            if (context.eventName === 'issues') {
-              await processIssue(context.payload.issue.number);
-            }
-
-            if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') {
-              const pr = context.payload.pull_request;
-              await processIssue(pr.number);
-              if (pr.merged && pr.base.ref === 'v4.x' && pr.body) {
-                const issueReferences = pr.body.match(/#(\d+)/g);
-                if (issueReferences) {
-                  for (const reference of issueReferences) {
-                    const issueNumber = parseInt(reference.substring(1));
-                    await processIssue(issueNumber, true, pr.base.ref);
-                  }
-                }
-              }
-            }

.github/workflows/coolify-production-build.yml

@@ -8,6 +8,7 @@ on:
       - .github/workflows/coolify-helper-next.yml
       - .github/workflows/coolify-realtime.yml
       - .github/workflows/coolify-realtime-next.yml
+      - .github/workflows/pr-quality.yaml
       - docker/coolify-helper/Dockerfile
       - docker/coolify-realtime/Dockerfile
       - docker/testing-host/Dockerfile

.github/workflows/coolify-staging-build.yml

@@ -11,6 +11,7 @@ on:
         - .github/workflows/coolify-helper-next.yml
         - .github/workflows/coolify-realtime.yml
         - .github/workflows/coolify-realtime-next.yml
+        - .github/workflows/pr-quality.yaml
         - docker/coolify-helper/Dockerfile
         - docker/coolify-realtime/Dockerfile
         - docker/testing-host/Dockerfile

.github/workflows/generate-changelog.yml

@@ -3,6 +3,12 @@ name: Generate Changelog
 on:
   push:
     branches: [ v4.x ]
+    paths-ignore:
+      - .github/workflows/coolify-helper.yml
+      - .github/workflows/coolify-helper-next.yml
+      - .github/workflows/coolify-realtime.yml
+      - .github/workflows/coolify-realtime-next.yml
+      - .github/workflows/pr-quality.yaml
   workflow_dispatch:
 
 permissions:

.github/workflows/pr-quality.yaml

@@ -0,0 +1,96 @@
+name: PR Quality
+
+permissions:
+  contents: read
+  issues: read
+  pull-requests: write
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  pr-quality:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peakoss/anti-slop@v0
+        with:
+          # General Settings
+          max-failures: 3
+
+          # PR Branch Checks
+          allowed-target-branches: "next"
+          blocked-target-branches: ""
+          allowed-source-branches: ""
+          blocked-source-branches: |
+            main
+            master
+            v4.x
+            next
+
+          # PR Quality Checks
+          max-negative-reactions: 0
+          require-maintainer-can-modify: true
+
+          # PR Title Checks
+          require-conventional-title: true
+
+          # PR Description Checks
+          require-description: true
+          max-description-length: 0
+          max-emoji-count: 2
+          require-pr-template: true
+          require-linked-issue: false
+          blocked-terms: "STRAWBERRY"
+          blocked-issue-numbers: 8154
+
+          # Commit Message Checks
+          require-conventional-commits: false
+          blocked-commit-authors: "claude,copilot"
+
+          # File Checks
+          allowed-file-extensions: ""
+          allowed-paths: ""
+          blocked-paths: |
+            README.md
+            SECURITY.md
+            LICENSE
+            CODE_OF_CONDUCT.md
+            templates/service-templates-latest.json
+            templates/service-templates.json
+          require-final-newline: true
+
+          # User Health Checks
+          min-repo-merged-prs: 0
+          min-repo-merge-ratio: 0
+          min-global-merge-ratio: 30
+          global-merge-ratio-exclude-own: false
+          min-account-age: 10
+
+          # Exemptions
+          exempt-author-association: "OWNER,MEMBER,COLLABORATOR"
+          exempt-users: ""
+          exempt-bots: |
+            actions-user
+            dependabot[bot]
+            renovate[bot]
+            github-actions[bot]
+          exempt-draft-prs: false
+          exempt-label: "quality/exempt"
+          exempt-pr-label: ""
+          exempt-milestones: ""
+          exempt-pr-milestones: ""
+          exempt-all-milestones: false
+          exempt-all-pr-milestones: false
+
+          # PR Success Actions
+          success-add-pr-labels: "quality/verified"
+
+          # PR Failure Actions
+          close-pr: true
+          lock-pr: false
+          delete-branch: false
+          failure-pr-message: "This PR did not pass quality checks so it will be closed. If you believe this is a mistake please let us know."
+          failure-remove-pr-labels: ""
+          failure-remove-all-pr-labels: true
+          failure-add-pr-labels: "quality/rejected"

app/Models/PrivateKey.php

@@ -237,7 +237,7 @@ class PrivateKey extends BaseModel
         $testSuccess = $disk->put($testFilename, 'test');
 
         if (! $testSuccess) {
-            throw new \Exception('SSH keys storage directory is not writable');
+            throw new \Exception('SSH keys storage directory is not writable. Run on the host: sudo chown -R 9999 /data/coolify/ssh && sudo chmod -R 700 /data/coolify/ssh && docker restart coolify');
         }
 
         // Clean up test file

scripts/upgrade.sh

@@ -141,6 +141,15 @@ else
     log "Network 'coolify' already exists"
 fi
 
+# Fix SSH directory ownership if not owned by container user UID 9999 (fixes #6621)
+# Only changes owner — preserves existing group to respect custom setups
+SSH_OWNER=$(stat -c '%u' /data/coolify/ssh 2>/dev/null || echo "unknown")
+if [ "$SSH_OWNER" != "9999" ]; then
+    log "Fixing SSH directory ownership (was owned by UID $SSH_OWNER)"
+    chown -R 9999 /data/coolify/ssh
+    chmod -R 700 /data/coolify/ssh
+fi
+
 # Check if Docker config file exists
 DOCKER_CONFIG_MOUNT=""
 if [ -f /root/.docker/config.json ]; then

templates/compose/retroassembly.yaml

@@ -0,0 +1,23 @@
+# documentation: https://github.com/arianrhodsandlot/retroassembly
+# slogan: The personal retro game collection cabinet in your browser.
+# category: games
+# tags: retroassembly, retro-games, arcade, self-hosted, gaming
+# logo: svgs/retroassembly.png
+# ports: 8000
+
+services:
+  retroassembly:
+    image: 'arianrhodsandlot/retroassembly:v5.260124.0752'
+    environment:
+      - SERVICE_URL_RETROASSEMBLY_8000
+    volumes:
+      - 'retroassembly-data:/app/data'
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'nc -z 127.0.0.1 8000'
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+

tests/Unit/PrivateKeyStorageTest.php

@@ -112,7 +112,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             );
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('SSH keys storage directory is not writable');
+        $this->expectExceptionMessage('SSH keys storage directory is not writable. Run on the host: sudo chown -R 9999 /data/coolify/ssh && sudo chmod -R 700 /data/coolify/ssh && docker restart coolify');
 
         PrivateKey::createAndStore([
             'name' => 'Test Key',