fix: batch fixes for #60, #38, #59, #67, #68 (#70)

* fix: batch fixes for issues #60, #38, #59, #67, #68

- #68: Suppress /up health check from nginx access logs
- #60: Use schedule:work instead of schedule:run while loop
- #38: Fix ssh-keygen quoting with escapeshellarg()
- #59: Clear git_commit_sha after deploying specific commit
- #67: Add errorlog channel + PHP-FPM catch_workers_output for container logging

Closes #60, closes #38, closes #59, closes #67, closes #68

* fix: address PR review feedback

- Wrap deploy() in try/finally so git_commit_sha is cleared even on failure
- Use configured health_check_path for nginx log suppression instead of hardcoded /up
- Add tests: php-fpm.conf generation, schedule:work supervisor config,
  deploy SHA cleanup, write-to-disk includes php-fpm.conf

Author: StuMason

src/Console/InstallCommand.php

@@ -71,6 +71,13 @@ public function handle(): int
         info('Laravel Coolify installed successfully!');
         $this->newLine();
 
+        // Logging tip for containerised deployments
+        $this->components->info('Recommended .env for Coolify containers:');
+        $this->components->bulletList([
+            '<comment>LOG_STACK=daily,errorlog</comment> — file logs + visible in Coolify log viewer',
+        ]);
+        $this->newLine();
+
         // Check if .env is configured
         if ($this->isConfigured()) {
             $this->testConnection();

src/Console/ProvisionCommand.php

@@ -641,7 +641,12 @@ protected function generateSshKeyPair(string $keyName): ?array
         $keyPath = "{$tempDir}/{$keyName}_".time();
 
         // Generate ED25519 key (more secure, shorter than RSA)
-        $result = Process::run("ssh-keygen -t ed25519 -f {$keyPath} -N '' -C '{$keyName}' 2>&1");
+        $result = Process::run(sprintf(
+            'ssh-keygen -t ed25519 -f %s -N %s -C %s 2>&1',
+            escapeshellarg($keyPath),
+            escapeshellarg(''),
+            escapeshellarg($keyName)
+        ));
 
         if (! $result->successful()) {
             $this->components->error('Failed to generate SSH key: '.$result->output());
@@ -1123,7 +1128,9 @@ protected function setApplicationEnvVars(
         $envVars[] = ['key' => 'ASSET_URL', 'value' => "https://{$domain}"];
 
         // Log management best practices (prevents runaway log files)
-        $envVars[] = ['key' => 'LOG_STACK', 'value' => 'daily'];
+        // Uses errorlog channel (not stderr) because PHP-FPM redirects worker stderr.
+        // error_log() → FPM catch_workers_output → supervisord → container stderr → Coolify
+        $envVars[] = ['key' => 'LOG_STACK', 'value' => 'daily,errorlog'];
         $envVars[] = ['key' => 'LOG_DAILY_MAX_FILES', 'value' => '7'];
 
         // Set Coolify connection (so deployed app can use this package's dashboard/API)

src/Docker/DockerGenerator.php

@@ -87,6 +87,7 @@ public function write(?string $basePath = null): array
             'docker/supervisord.conf' => $this->generateSupervisordConf(),
             'docker/nginx.conf' => $this->generateNginxConf(),
             'docker/php.ini' => $this->generatePhpIni(),
+            'docker/php-fpm.conf' => $this->generatePhpFpmConf(),
             'docker/entrypoint.sh' => $this->generateEntrypoint(),
         ];
 
@@ -172,6 +173,9 @@ protected function generateDockerfileWithBaseImage(): string
 # Custom PHP config
 COPY docker/php.ini "\$PHP_INI_DIR/conf.d/99-custom.ini"
 
+# PHP-FPM config (enables container log forwarding)
+COPY docker/php-fpm.conf /usr/local/etc/php-fpm.d/zz-laravel.conf
+
 # Nginx config
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 
@@ -296,6 +300,9 @@ protected function generateDockerfileFromScratch(): string
 RUN mv "\$PHP_INI_DIR/php.ini-production" "\$PHP_INI_DIR/php.ini"
 COPY docker/php.ini "\$PHP_INI_DIR/conf.d/99-custom.ini"
 
+# PHP-FPM config (enables container log forwarding)
+COPY docker/php-fpm.conf /usr/local/etc/php-fpm.d/zz-laravel.conf
+
 # Nginx config
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 
@@ -436,6 +443,7 @@ public function generateNginxConf(): string
         $clientMaxBodySize = config('coolify.docker.nginx.client_max_body_size') ?? '35M';
         $uploadMaxFilesize = config('coolify.docker.nginx.upload_max_filesize') ?? '30M';
         $postMaxSize = config('coolify.docker.nginx.post_max_size') ?? '35M';
+        $healthCheckPath = config('coolify.docker.health_check_path') ?? '/up';
 
         // Collect nginx location blocks from detectors
         $extraLocations = [];
@@ -501,6 +509,7 @@ public function generateNginxConf(): string
 
         location = /favicon.ico { access_log off; log_not_found off; }
         location = /robots.txt  { access_log off; log_not_found off; }
+        location = {$healthCheckPath} { access_log off; log_not_found off; try_files \$uri \$uri/ /index.php?\$query_string; }
 
 {$extraLocationStr}
 
@@ -584,6 +593,19 @@ public function generatePhpIni(): string
 INI;
     }
 
+    /**
+     * Generate PHP-FPM pool config for container logging.
+     * Enables catch_workers_output so error_log() output reaches container stderr via supervisord.
+     */
+    public function generatePhpFpmConf(): string
+    {
+        return <<<'CONF'
+[www]
+catch_workers_output = yes
+decorate_workers_output = no
+CONF;
+    }
+
     /**
      * Generate entrypoint.sh content.
      * Runs migrations and optimizations before starting supervisor.
@@ -894,7 +916,7 @@ protected function getDockerSupervisorProgram(PackageDetector $detector): ?strin
 ; Laravel Scheduler
 ; ===================
 [program:scheduler]
-command=/bin/sh -c "while true; do /usr/local/bin/php /var/www/html/artisan schedule:run --verbose --no-interaction; sleep 60; done"
+command=/usr/local/bin/php /var/www/html/artisan schedule:work
 user=www-data
 autostart=true
 autorestart=true

src/Repositories/CoolifyApplicationRepository.php

@@ -101,7 +101,7 @@ public function delete(string $uuid): bool
      */
     public function deploy(string $uuid, bool $force = false, ?string $commit = null): array
     {
-        // If deploying a specific commit, update the app's git_commit_sha first
+        // If deploying a specific commit, temporarily set git_commit_sha
         if ($commit !== null) {
             $this->update($uuid, ['git_commit_sha' => $commit]);
         }
@@ -112,7 +112,14 @@ public function deploy(string $uuid, bool $force = false, ?string $commit = null
             $params['force'] = 'true';
         }
 
-        $response = $this->client->get('deploy', $params);
+        try {
+            $response = $this->client->get('deploy', $params);
+        } finally {
+            // Clear pinned commit so future deploys use HEAD
+            if ($commit !== null) {
+                $this->update($uuid, ['git_commit_sha' => '']);
+            }
+        }
 
         // API returns {deployments: [{message, resource_uuid, deployment_uuid}]}
         $deployment = $response['deployments'][0] ?? $response;

tests/Unit/Docker/DockerGeneratorTest.php

@@ -189,6 +189,22 @@
         expect($content)->toContain('[program:nginx]');
     });
 
+    it('generates scheduler supervisor using schedule:work', function () {
+        // Create routes/console.php with a scheduled task to trigger detection
+        File::ensureDirectoryExists(base_path('routes'));
+        File::put(base_path('routes/console.php'), '<?php Schedule::command("test")->daily();');
+
+        $generator = new DockerGenerator;
+        $generator->detect();
+        $content = $generator->generateSupervisordConf();
+
+        expect($content)->toContain('[program:scheduler]')
+            ->and($content)->toContain('schedule:work')
+            ->and($content)->not->toContain('schedule:run');
+
+        File::delete(base_path('routes/console.php'));
+    });
+
     it('generates nginx.conf with correct settings', function () {
         config(['coolify.docker.nginx.client_max_body_size' => '50M']);
 
@@ -214,6 +230,15 @@
         expect($content)->toContain('opcache.enable = 1');
     });
 
+    it('generates php-fpm.conf with catch_workers_output enabled', function () {
+        $generator = new DockerGenerator;
+        $content = $generator->generatePhpFpmConf();
+
+        expect($content)->toContain('[www]')
+            ->and($content)->toContain('catch_workers_output = yes')
+            ->and($content)->toContain('decorate_workers_output = no');
+    });
+
     it('writes all Docker files to disk', function () {
         $generator = new DockerGenerator;
         $generator->detect();
@@ -223,12 +248,14 @@
         expect(File::exists(base_path('docker/supervisord.conf')))->toBeTrue();
         expect(File::exists(base_path('docker/nginx.conf')))->toBeTrue();
         expect(File::exists(base_path('docker/php.ini')))->toBeTrue();
+        expect(File::exists(base_path('docker/php-fpm.conf')))->toBeTrue();
         expect(File::exists(base_path('docker/entrypoint.sh')))->toBeTrue();
 
         expect($files)->toHaveKey('Dockerfile');
         expect($files)->toHaveKey('docker/supervisord.conf');
         expect($files)->toHaveKey('docker/nginx.conf');
         expect($files)->toHaveKey('docker/php.ini');
+        expect($files)->toHaveKey('docker/php-fpm.conf');
         expect($files)->toHaveKey('docker/entrypoint.sh');
     });
 

tests/Unit/Repositories/ApplicationRepositoryTest.php

@@ -99,11 +99,19 @@
         expect($result['deployment_uuid'])->toBe('deploy-commit')
             ->and($result['commit'])->toBe('abc123');
 
-        // Verify it first updates the app with the commit SHA
-        Http::assertSent(function ($request) {
+        // Verify it sets then clears the commit SHA
+        $patchRequests = Http::recorded(function ($request) {
             return str_contains($request->url(), 'applications/app-123')
                 && $request->method() === 'PATCH';
-        });
+        })->values();
+
+        expect($patchRequests)->toHaveCount(2);
+
+        // First PATCH sets the commit SHA
+        expect($patchRequests[0][0]->data()['git_commit_sha'])->toBe('abc123');
+
+        // Second PATCH clears it so future deploys use HEAD
+        expect($patchRequests[1][0]->data()['git_commit_sha'])->toBe('');
     });
 
     it('restarts an application', function () {