diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 1dfcaaafc..ea8cdff95 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -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) if ($argsToInsert->isNotEmpty()) { foreach (array_reverse($fromLines) as $fromLineIndex) { @@ -3324,6 +3318,11 @@ private function add_build_env_variables_to_dockerfile() $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")); diff --git a/gcool.json b/jean.json similarity index 76% rename from gcool.json rename to jean.json index 629d8569a..0be55f89b 100644 --- a/gcool.json +++ b/jean.json @@ -1,6 +1,6 @@ { "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" } }