starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-09-26 01:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(deployment): skip missing Compose Dockerfiles with portable realpath

Browse Source
This commit is contained in:
Andras Bacsai
2026-09-25 08:00:19 +02:00
parent 65365752d7
commit a86188f391
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Jobs/ApplicationDeploymentJob.php
+2 -1
View File
@@ -4911,8 +4911,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
$dockerfilePath = $this->resolveComposeDockerfilePath($service['build']);
$fullDockerfilePath = escapeshellarg("{$this->workdir}/{$dockerfilePath}");
// BusyBox realpath in the helper image accepts no options; a missing file prints nothing.
$this->execute_remote_command([
executeInDocker($this->deployment_uuid, "resolved_path=$(realpath -e -- {$fullDockerfilePath}) && test -f \"\$resolved_path\" && printf '%s' \"\$resolved_path\""),
executeInDocker($this->deployment_uuid, "resolved_path=$(realpath {$fullDockerfilePath} 2>/dev/null) && test -f \"\$resolved_path\" && printf '%s' \"\$resolved_path\" || true"),
'hidden' => true,
'save' => 'dockerfile_check_'.$serviceName,
]);
tests/Feature/ApplicationDeploymentControlVarFilteringTest.php
+38
View File
@@ -1067,6 +1067,44 @@ it('injects Dockerfile args for plain build-time variables without a secret mana
'preview' => [99, true],
]);
it('checks compose Dockerfiles with a portable command that skips missing files', function (bool $dockerfileExists) {
[$application, $server] = makeDeploymentControlVarFixture(['build_pack' => 'dockercompose']);
$workdir = sys_get_temp_dir().'/coolify-compose-dockerfile-'.str()->random(8);
expect(mkdir($workdir))->toBeTrue();
if ($dockerfileExists) {
file_put_contents($workdir.'/Dockerfile', "FROM alpine\n");
}
try {
[$job, $reflection] = makeControlVarFilteringJob($application, $server, [
'workdir' => $workdir,
'env_args' => collect(['APP_ENV' => 'production']),
]);
invokeDeploymentJobMethod($job, $reflection, 'modify_dockerfiles_for_compose', [
'services' => ['api' => ['build' => ['context' => '.', 'dockerfile' => 'Dockerfile']]],
]);
$checkCommand = collect($job->recordedCommands)->flatten(1)->firstWhere('save', 'dockerfile_check_api')[0];
// The helper image ships BusyBox realpath, which accepts no options.
expect($checkCommand)->not->toContain('realpath -');
$process = Process::fromShellCommandline(str($checkCommand)->after('docker exec deployment-uuid ')->toString());
$process->run();
expect($process->getExitCode())->toBe(0);
expect($process->getOutput())->toBe($dockerfileExists ? realpath($workdir.'/Dockerfile') : '');
} finally {
@unlink($workdir.'/Dockerfile');
@rmdir($workdir);
}
})->with([
'existing Dockerfile' => [true],
'missing Dockerfile' => [false],
]);
it('builds railpack variables from generic buildtime vars railpack vars and coolify vars only', function () {
[$application, $server] = makeDeploymentControlVarFixture([
'build_pack' => 'railpack',