Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into v5-parallel-inertia-react

Andras Bacsaic9416abec647
diff --cc other/nightly/upgrade.sh
index 88c634490e,94fb77607f..635ddd77c5
--- a/other/nightly/upgrade.sh
+++ b/other/nightly/upgrade.sh
@@@ -127,8 -133,21 +133,22 @@@ update_env_var()
fi
}
+ set_env_var() {
+ local key="$1"
+ local value="$2"
+
+ if grep -q "^${key}=" "$ENV_FILE"; then
+ sed -i "s|^${key}=.*|${key}=${value}|" "$ENV_FILE"
+ log "Updated ${key}"
+ else
+ printf '%s=%s\n' "$key" "$value" >>"$ENV_FILE"
+ log "Added ${key}"
+ fi
+ }
+
log "Checking environment variables..."
+update_env_var "COOLIFY_FLUX_LARAVEL_API_TOKEN" "$(openssl rand -hex 32)"
+ set_env_var "REGISTRY_URL" "$REGISTRY_URL"
update_env_var "PUSHER_APP_ID" "$(openssl rand -hex 32)"
update_env_var "PUSHER_APP_KEY" "$(openssl rand -hex 32)"
update_env_var "PUSHER_APP_SECRET" "$(openssl rand -hex 32)"
diff --cc routes/api.php
index 6129da7e76,e44070d25f..659bc1f7e1
--- a/routes/api.php
+++ b/routes/api.php
@@@ -4,9 -4,9 +4,10 @@@ use App\Http\Controllers\Api\Applicatio
use App\Http\Controllers\Api\CloudProviderTokensController;
use App\Http\Controllers\Api\DatabasesController;
use App\Http\Controllers\Api\DeployController;
+ use App\Http\Controllers\Api\DestinationsController;
use App\Http\Controllers\Api\GithubController;
use App\Http\Controllers\Api\HetznerController;
+use App\Http\Controllers\Api\Internal\FluxResourceStatusController;
use App\Http\Controllers\Api\OtherController;
use App\Http\Controllers\Api\ProjectController;
use App\Http\Controllers\Api\ResourcesController;
diff --cc scripts/upgrade.sh
index 3acea77814,a909d2e49a..206327f65f
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@@ -127,8 -133,21 +133,22 @@@ update_env_var()
fi
}
+ set_env_var() {
+ local key="$1"
+ local value="$2"
+
+ if grep -q "^${key}=" "$ENV_FILE"; then
+ sed -i "s|^${key}=.*|${key}=${value}|" "$ENV_FILE"
+ log "Updated ${key}"
+ else
+ printf '%s=%s\n' "$key" "$value" >>"$ENV_FILE"
+ log "Added ${key}"
+ fi
+ }
+
log "Checking environment variables..."
+update_env_var "COOLIFY_FLUX_LARAVEL_API_TOKEN" "$(openssl rand -hex 32)"
+ set_env_var "REGISTRY_URL" "$REGISTRY_URL"
update_env_var "PUSHER_APP_ID" "$(openssl rand -hex 32)"
update_env_var "PUSHER_APP_KEY" "$(openssl rand -hex 32)"
update_env_var "PUSHER_APP_SECRET" "$(openssl rand -hex 32)"
diff --cc templates/service-templates-latest.json
index 8d1a3369bc,0a2dfda9d7..811aee97e7
--- a/templates/service-templates-latest.json
+++ b/templates/service-templates-latest.json
@@@ -2361,7 -2361,7 +2361,7 @@@
"category": "automation",
"logo": "svgs/inngest.png",
"minversion": "0.0.0",
- "template_last_updated_at": null,
- "template_last_updated_at": "2026-07-02T13:25:47+02:00",
++ "template_last_updated_at": "2026-06-10T13:46:21+05:30",
"port": "8288"
},
"invoice-ninja": {
diff --cc templates/service-templates.json
index 2ad3008f51,4d97d8d5e2..9721a52dea
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@@ -2361,7 -2361,7 +2361,7 @@@
"category": "automation",
"logo": "svgs/inngest.png",
"minversion": "0.0.0",
- "template_last_updated_at": null,
- "template_last_updated_at": "2026-07-02T13:25:47+02:00",
++ "template_last_updated_at": "2026-06-10T13:46:21+05:30",
"port": "8288"
},
"invoice-ninja": {
diff --cc tests/Unit/UpgradePostgresScriptTest.php
index e0b2bf8b72,a888bc3a41..6fe028ddbf
--- a/tests/Unit/UpgradePostgresScriptTest.php
+++ b/tests/Unit/UpgradePostgresScriptTest.php
@@@ -44,16 -44,36 +44,48 @@@ it('downloads postgres upgrade script d
'nightly upgrade' => 'other/nightly/upgrade.sh',
]);
+it('generates a dedicated flux laravel api token during install and upgrade', function (string $path) {
+ $script = file_get_contents(getcwd().'/'.$path);
+
+ expect($script)
+ ->toContain('update_env_var "COOLIFY_FLUX_LARAVEL_API_TOKEN" "$(openssl rand -hex 32)"');
+})->with([
+ 'stable install' => 'scripts/install.sh',
+ 'nightly install' => 'other/nightly/install.sh',
+ 'stable upgrade' => 'scripts/upgrade.sh',
+ 'nightly upgrade' => 'other/nightly/upgrade.sh',
++]);
++
+ it('uses the selected registry url when extracting upgrade images', function (string $path) {
+ $script = file_get_contents(getcwd().'/'.$path);
+
+ expect($script)->toContain('IMAGES=$(REGISTRY_URL=${REGISTRY_URL} LATEST_IMAGE=${LATEST_IMAGE} docker compose --env-file "$ENV_FILE" $COMPOSE_FILES config --images');
+ })->with([
+ 'stable upgrade' => 'scripts/upgrade.sh',
+ 'nightly upgrade' => 'other/nightly/upgrade.sh',
+ ]);
+
+ it('persists the selected registry url during upgrades', function (string $path) {
+ $script = file_get_contents(getcwd().'/'.$path);
+
+ expect($script)->toContain('set_env_var "REGISTRY_URL" "$REGISTRY_URL"');
+ })->with([
+ 'stable upgrade' => 'scripts/upgrade.sh',
+ 'nightly upgrade' => 'other/nightly/upgrade.sh',
+ ]);
+
+ it('uses the existing env registry url when old callers do not pass a registry argument', function (string $path) {
+ $script = file_get_contents(getcwd().'/'.$path);
+
+ expect($script)
+ ->toContain('if [ -n "${3+x}" ]; then')
+ ->toContain('REGISTRY_URL="$3"')
+ ->toContain('elif [ -f "$ENV_FILE" ] && grep -q "^REGISTRY_URL=" "$ENV_FILE"; then')
+ ->toContain("REGISTRY_URL=$(grep \"^REGISTRY_URL=\" \"\$ENV_FILE\" | cut -d '=' -f2- | head -n1)")
+ ->toContain('REGISTRY_URL="docker.io"');
+ })->with([
+ 'stable upgrade' => 'scripts/upgrade.sh',
+ 'nightly upgrade' => 'other/nightly/upgrade.sh',
]);
it('keeps postgres upgrade compose override in future upgrade compose commands', function (string $path) {