dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update app/Jobs/ApplicationDeploymentJob.php

Browse Source 
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
Andras Bacsai
2025-09-16 18:25:07 +02:00
committed by GitHub
parent 8542d33a2d
commit 6314fef8df
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -2826,8 +2826,9 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
// Find all RUN commands and add secret mounts to them // Find all RUN commands and add secret mounts to them
$modified = false; $modified = false;
$dockerfile = $dockerfile->map(function ($line) use ($variables, &$modified) { $dockerfile = $dockerfile->map(function ($line) use ($variables, &$modified) {
// Check if this is a RUN command $trim = ltrim($line);
if (str_starts_with(trim($line), 'RUN')) { // Only handle shell-form RUN; skip JSON-form and already-mounted lines
if (str_starts_with($trim, 'RUN') && !preg_match('/^RUN\s*\[/i', $trim) && !str_contains($line, '--mount=type=secret')) {
// Build the mount flags for all secrets // Build the mount flags for all secrets
$mounts = []; $mounts = [];
@@ -2847,7 +2848,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
$envString = implode(' ', $envAssignments); $envString = implode(' ', $envAssignments);
// Extract the original command // Extract the original command
$originalCommand = trim(substr($line, 3)); // Remove 'RUN' $originalCommand = trim(substr($trim, 3)); // Remove 'RUN'
// Create the new RUN command with mounts and inline environment variables // Create the new RUN command with mounts and inline environment variables
// Format: RUN --mount=secret,id=X --mount=secret,id=Y KEY1=$(cat...) KEY2=$(cat...) original_command // Format: RUN --mount=secret,id=X --mount=secret,id=Y KEY1=$(cat...) KEY2=$(cat...) original_command