rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into feat-add-dockerfile-from-instruction-par

Browse source
This commit is contained in:
Andras Bacsai 2025-11-06 09:24:54 +01:00 committed by GitHub
commit d0ee7d0412
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Jobs/ApplicationDeploymentJob.php
View file

@ -3310,12 +3310,6 @@ private function add_build_env_variables_to_dockerfile()
} }
} }
// Add secrets hash if we have environment variables
if ($envs->isNotEmpty()) {
$secrets_hash = $this->generate_secrets_hash($envs);
$argsToInsert->push("ARG COOLIFY_BUILD_SECRETS_HASH={$secrets_hash}");
}
// Insert ARGs after each FROM instruction (in reverse order to maintain correct line numbers) // Insert ARGs after each FROM instruction (in reverse order to maintain correct line numbers)
if ($argsToInsert->isNotEmpty()) { if ($argsToInsert->isNotEmpty()) {
foreach (array_reverse($fromLines) as $fromLineIndex) { foreach (array_reverse($fromLines) as $fromLineIndex) {
@ -3324,6 +3318,11 @@ private function add_build_env_variables_to_dockerfile()
$dockerfile->splice($fromLineIndex + 1, 0, [$arg]); $dockerfile->splice($fromLineIndex + 1, 0, [$arg]);
} }
} }
$envs_mapped = $envs->mapWithKeys(function ($env) {
return [$env->key => $env->real_value];
});
$secrets_hash = $this->generate_secrets_hash($envs_mapped);
$argsToInsert->push("ARG COOLIFY_BUILD_SECRETS_HASH={$secrets_hash}");
} }
$dockerfile_base64 = base64_encode($dockerfile->implode("\n")); $dockerfile_base64 = base64_encode($dockerfile->implode("\n"));

2
gcool.json → jean.json
View file

@ -1,6 +1,6 @@
{ {
"scripts": { "scripts": {
"onWorktreeCreate": "cp $GCOOL_ROOT_PATH/.env .", "onWorktreeCreate": "cp $JEAN_ROOT_PATH/.env .",
"run": "docker rm -f coolify coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite && spin up" "run": "docker rm -f coolify coolify-realtime coolify-minio coolify-testing-host coolify-redis coolify-db coolify-mail coolify-vite && spin up"
} }
} }