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.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
feat(registry): add configurable docker registry url (#9017)
Andras Bacsaicf6f5a267834
diff --git a/.env.production b/.env.productionindex fe3c8370e2..cda3214d2d 100644--- a/.env.production+++ b/.env.production@@ -15,4 +15,4 @@ ROOT_USERNAME=ROOT_USER_EMAIL=ROOT_USER_PASSWORD=-REGISTRY_URL=ghcr.io+REGISTRY_URL=docker.iodiff --git a/app/Actions/Server/CleanupDocker.php b/app/Actions/Server/CleanupDocker.phpindex 06abeb3a65..2f9d58797e 100644--- a/app/Actions/Server/CleanupDocker.php+++ b/app/Actions/Server/CleanupDocker.php@@ -20,7 +20,7 @@ class CleanupDocker$realtimeImageWithoutPrefixVersion = "coollabsio/coolify-realtime:$realtimeImageVersion";$helperImageVersion = getHelperVersion();- $helperImage = config('constants.coolify.helper_image');+ $helperImage = coolifyHelperImage();$helperImageWithVersion = "$helperImage:$helperImageVersion";$helperImageWithoutPrefix = 'coollabsio/coolify-helper';$helperImageWithoutPrefixVersion = "coollabsio/coolify-helper:$helperImageVersion";diff --git a/app/Actions/Server/StartSentinel.php b/app/Actions/Server/StartSentinel.phpindex 289ab9ebe0..6350a5f374 100644--- a/app/Actions/Server/StartSentinel.php+++ b/app/Actions/Server/StartSentinel.php@@ -26,7 +26,7 @@ class StartSentinel$endpoint = data_get($server, 'settings.sentinel_custom_url');$debug = data_get($server, 'settings.is_sentinel_debug_enabled');$mountDir = '/data/coolify/sentinel';- $image = config('constants.coolify.registry_url').'/coollabsio/sentinel:'.$version;+ $image = coolifyRegistryUrl().'/coollabsio/sentinel:'.$version;if (! $endpoint) {throw new \RuntimeException('You should set FQDN in Instance Settings.');}diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.phpindex b5ebd92b2f..a8c9d21e8f 100644--- a/app/Actions/Server/UpdateCoolify.php+++ b/app/Actions/Server/UpdateCoolify.php@@ -118,10 +118,14 @@ class UpdateCoolify{$latestHelperImageVersion = getHelperVersion();$upgradeScriptUrl = config('constants.coolify.upgrade_script_url');+ $registryUrl = coolifyRegistryUrl();remote_process(["curl -fsSL {$upgradeScriptUrl} -o /data/coolify/source/upgrade.sh",- "bash /data/coolify/source/upgrade.sh $this->latestVersion $latestHelperImageVersion",+ 'bash /data/coolify/source/upgrade.sh '.+ escapeshellarg($this->latestVersion).' '.+ escapeshellarg($latestHelperImageVersion).' '.+ escapeshellarg($registryUrl),], $this->server);}}diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.phpindex 92a9f74990..19cd8ef679 100644--- a/app/Jobs/ApplicationDeploymentJob.php+++ b/app/Jobs/ApplicationDeploymentJob.php@@ -2124,7 +2124,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueueprivate function prepare_builder_image(bool $firstTry = true){$this->checkForCancellation();- $helperImage = config('constants.coolify.helper_image');+ $helperImage = coolifyHelperImage();$helperImage = "{$helperImage}:".getHelperVersion();// Get user home directory$this->serverUserHomeDir = instant_remote_process(['echo $HOME'], $this->server);diff --git a/app/Jobs/CleanupHelperContainersJob.php b/app/Jobs/CleanupHelperContainersJob.phpindex f6f5e8b5b8..f1635d6d4d 100644--- a/app/Jobs/CleanupHelperContainersJob.php+++ b/app/Jobs/CleanupHelperContainersJob.php@@ -36,7 +36,7 @@ class CleanupHelperContainersJob implements ShouldBeEncrypted, ShouldBeUnique, S'active_deployment_uuids' => $activeDeployments,]);- $containers = instant_remote_process_with_timeout(['docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image | contains("'.config('constants.coolify.registry_url').'/coollabsio/coolify-helper")))\''], $this->server, false);+ $containers = instant_remote_process_with_timeout(['docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image | contains("'.coolifyRegistryUrl().'/coollabsio/coolify-helper")))\''], $this->server, false);$helperContainers = collect(json_decode($containers));if ($helperContainers->count() > 0) {diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.phpindex 6bc6e48dba..e9e1f91050 100644--- a/app/Jobs/DatabaseBackupJob.php+++ b/app/Jobs/DatabaseBackupJob.php@@ -739,7 +739,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueueprivate function getFullImageName(): string{- $helperImage = config('constants.coolify.helper_image');+ $helperImage = coolifyHelperImage();$latestVersion = getHelperVersion();return "{$helperImage}:{$latestVersion}";diff --git a/app/Livewire/Project/Database/ImportForm.php b/app/Livewire/Project/Database/ImportForm.phpindex f97e78fa74..62d4e1a59d 100644--- a/app/Livewire/Project/Database/ImportForm.php+++ b/app/Livewire/Project/Database/ImportForm.php@@ -680,7 +680,7 @@ EOD;}// Get helper image- $helperImage = config('constants.coolify.helper_image');+ $helperImage = coolifyHelperImage();$latestVersion = getHelperVersion();$fullImageName = "{$helperImage}:{$latestVersion}";diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.phpindex 9cfc4f6c84..6ed8c7ae81 100644--- a/app/Livewire/Settings/Index.php+++ b/app/Livewire/Settings/Index.php@@ -47,8 +47,6 @@ class Index extends Componentpublic bool $forceSaveDomains = false;- public $buildActivityId = null;-protected array $messages = ['fqdn.url' => 'Invalid instance URL.','fqdn.max' => 'URL must not exceed 255 characters.',diff --git a/app/Livewire/Settings/Updates.php b/app/Livewire/Settings/Updates.phpindex 88a8945d0a..856b7e2a45 100644--- a/app/Livewire/Settings/Updates.php+++ b/app/Livewire/Settings/Updates.php@@ -6,6 +6,8 @@ use App\Jobs\CheckForUpdatesJob;use App\Models\InstanceSettings;use App\Models\Server;use Illuminate\Foundation\Auth\Access\AuthorizesRequests;+use Illuminate\Support\Facades\Log;+use Illuminate\Validation\ValidationException;use Livewire\Attributes\Validate;use Livewire\Component;@@ -26,6 +28,9 @@ class Updates extends Component#[Validate('boolean')]public bool $is_auto_update_enabled;+ #[Validate('required|string|in:docker.io,ghcr.io')]+ public string $docker_registry_url;+public function mount(){if (! isInstanceAdmin()) {@@ -39,6 +44,7 @@ class Updates extends Component$this->auto_update_frequency = $this->settings->auto_update_frequency;$this->update_check_frequency = $this->settings->update_check_frequency;$this->is_auto_update_enabled = $this->settings->is_auto_update_enabled;+ $this->docker_registry_url = $this->settings->docker_registry_url ?: 'docker.io';}public function instantSave()@@ -50,16 +56,51 @@ class Updates extends Component'auto_update_frequency' => ['required', 'string'],]);}+ $validated = $this->validate([+ 'docker_registry_url' => ['required', 'string', 'in:docker.io,ghcr.io'],+ ]);$this->settings->auto_update_frequency = $this->auto_update_frequency;$this->settings->update_check_frequency = $this->update_check_frequency;$this->settings->is_auto_update_enabled = $this->is_auto_update_enabled;+ $this->settings->docker_registry_url = $validated['docker_registry_url'];+ $this->syncRegistryUrlToEnv($validated['docker_registry_url']);$this->settings->save();$this->dispatch('success', 'Settings updated!');+ } catch (ValidationException $e) {+ throw $e;} catch (\Exception $e) {return handleError($e, $this);}}+ protected function syncRegistryUrlToEnv(string $registryUrl): void+ {+ if (! $this->server) {+ return;+ }++ try {+ instant_remote_process([+ $this->registryEnvSyncCommand($registryUrl),+ ], $this->server);+ } catch (\Exception $e) {+ Log::warning('Failed to sync REGISTRY_URL to .env', [+ 'error' => $e->getMessage(),+ ]);++ throw new \RuntimeException('Failed to sync REGISTRY_URL to .env. Settings were not saved.', previous: $e);+ }+ }++ private function registryEnvSyncCommand(string $registryUrl): string+ {+ $envFile = '/data/coolify/source/.env';+ $sedExpression = escapeshellarg("s|^REGISTRY_URL=.*|REGISTRY_URL={$registryUrl}|");+ $registryLine = escapeshellarg("REGISTRY_URL={$registryUrl}");++ return "if grep -q '^REGISTRY_URL=' {$envFile}; then sed -i {$sedExpression} {$envFile}; else printf '%s\\n' {$registryLine} >> {$envFile}; fi";+ }+public function submit(){try {@@ -89,6 +130,8 @@ class Updates extends Componentif ($this->server) {$this->server->setupDynamicProxyConfiguration();}+ } catch (ValidationException $e) {+ throw $e;} catch (\Exception $e) {return handleError($e, $this);}diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.phpindex ab47c067a2..39c23d2bb5 100644--- a/bootstrap/helpers/shared.php+++ b/bootstrap/helpers/shared.php@@ -3749,6 +3749,27 @@ function redirectRoute(Component $component, string $name, array $parameters = [return $component->redirectRoute($name, $parameters, navigate: $navigate);}+function coolifyRegistryUrl(): string+{+ try {+ return instanceSettings()->docker_registry_url ?: 'docker.io';+ } catch (Throwable) {+ return config('constants.coolify.registry_url', 'docker.io');+ }+}++function coolifyHelperImage(): string+{+ $configuredHelperImage = config('constants.coolify.helper_image');+ $configuredDefaultHelperImage = config('constants.coolify.registry_url', 'docker.io').'/coollabsio/coolify-helper';++ if ($configuredHelperImage !== $configuredDefaultHelperImage) {+ return $configuredHelperImage;+ }++ return coolifyRegistryUrl().'/coollabsio/coolify-helper';+}+function getHelperVersion(): string{$settings = instanceSettings();diff --git a/config/constants.php b/config/constants.phpindex 4a956b31e4..15a6cc8f8d 100644--- a/config/constants.php+++ b/config/constants.php@@ -9,9 +9,9 @@ return ['self_hosted' => env('SELF_HOSTED', true),'autoupdate' => env('AUTOUPDATE'),'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),- 'registry_url' => env('REGISTRY_URL', 'ghcr.io'),- 'helper_image' => env('HELPER_IMAGE', env('REGISTRY_URL', 'ghcr.io').'/coollabsio/coolify-helper'),- 'realtime_image' => env('REALTIME_IMAGE', env('REGISTRY_URL', 'ghcr.io').'/coollabsio/coolify-realtime'),+ 'registry_url' => env('REGISTRY_URL', 'docker.io'),+ 'helper_image' => env('HELPER_IMAGE', env('REGISTRY_URL', 'docker.io').'/coollabsio/coolify-helper'),+ 'realtime_image' => env('REALTIME_IMAGE', env('REGISTRY_URL', 'docker.io').'/coollabsio/coolify-realtime'),'is_windows_docker_desktop' => env('IS_WINDOWS_DOCKER_DESKTOP', false),'cdn_url' => env('CDN_URL', 'https://cdn.coollabs.io'),'versions_url' => env('VERSIONS_URL', env('CDN_URL', 'https://cdn.coollabs.io').'/coolify/versions.json'),diff --git a/database/migrations/2026_03_17_073223_add_docker_registry_url_to_instance_settings.php b/database/migrations/2026_03_17_073223_add_docker_registry_url_to_instance_settings.phpnew file mode 100644index 0000000000..267956f476--- /dev/null+++ b/database/migrations/2026_03_17_073223_add_docker_registry_url_to_instance_settings.php@@ -0,0 +1,25 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class extends Migration+{+ /**+ * Run the migrations.+ */+ public function up(): void+ {+ Schema::table('instance_settings', function (Blueprint $table) {+ $table->string('docker_registry_url')->default('docker.io')->after('is_auto_update_enabled');+ });+ }++ public function down(): void+ {+ Schema::table('instance_settings', function (Blueprint $table) {+ $table->dropColumn('docker_registry_url');+ });+ }+};diff --git a/docker-compose.prod.yml b/docker-compose.prod.ymlindex 8907a30b91..9618e18ec6 100644--- a/docker-compose.prod.yml+++ b/docker-compose.prod.yml@@ -1,6 +1,6 @@services:coolify:- image: "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"+ image: "${REGISTRY_URL:-docker.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"volumes:- type: bindsource: /data/coolify/source/.env@@ -60,7 +60,7 @@ services:retries: 10timeout: 2ssoketi:- image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.16'+ image: '${REGISTRY_URL:-docker.io}/coollabsio/coolify-realtime:1.0.16'ports:- "${SOKETI_PORT:-6001}:6001"- "6002:6002"diff --git a/docker-compose.windows.yml b/docker-compose.windows.ymlindex da045fe032..3a6c3f11c3 100644--- a/docker-compose.windows.yml+++ b/docker-compose.windows.yml@@ -1,14 +1,14 @@services:coolify-testing-host:init: true- image: "ghcr.io/coollabsio/coolify-testing-host:latest"+ image: "docker.io/coollabsio/coolify-testing-host:latest"pull_policy: alwayscontainer_name: coolify-testing-hostvolumes:- //var/run/docker.sock://var/run/docker.sock- ./:/data/coolifycoolify:- image: "ghcr.io/coollabsio/coolify:latest"+ image: "docker.io/coollabsio/coolify:latest"pull_policy: alwayscontainer_name: coolifyrestart: alwaysdiff --git a/other/nightly/.env.production b/other/nightly/.env.productionindex fe3c8370e2..cda3214d2d 100644--- a/other/nightly/.env.production+++ b/other/nightly/.env.production@@ -15,4 +15,4 @@ ROOT_USERNAME=ROOT_USER_EMAIL=ROOT_USER_PASSWORD=-REGISTRY_URL=ghcr.io+REGISTRY_URL=docker.iodiff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.ymlindex 8907a30b91..9618e18ec6 100644--- a/other/nightly/docker-compose.prod.yml+++ b/other/nightly/docker-compose.prod.yml@@ -1,6 +1,6 @@services:coolify:- image: "${REGISTRY_URL:-ghcr.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"+ image: "${REGISTRY_URL:-docker.io}/coollabsio/coolify:${LATEST_IMAGE:-latest}"volumes:- type: bindsource: /data/coolify/source/.env@@ -60,7 +60,7 @@ services:retries: 10timeout: 2ssoketi:- image: '${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-realtime:1.0.16'+ image: '${REGISTRY_URL:-docker.io}/coollabsio/coolify-realtime:1.0.16'ports:- "${SOKETI_PORT:-6001}:6001"- "6002:6002"diff --git a/other/nightly/docker-compose.windows.yml b/other/nightly/docker-compose.windows.ymlindex da045fe032..3a6c3f11c3 100644--- a/other/nightly/docker-compose.windows.yml+++ b/other/nightly/docker-compose.windows.yml@@ -1,14 +1,14 @@services:coolify-testing-host:init: true- image: "ghcr.io/coollabsio/coolify-testing-host:latest"+ image: "docker.io/coollabsio/coolify-testing-host:latest"pull_policy: alwayscontainer_name: coolify-testing-hostvolumes:- //var/run/docker.sock://var/run/docker.sock- ./:/data/coolifycoolify:- image: "ghcr.io/coollabsio/coolify:latest"+ image: "docker.io/coollabsio/coolify:latest"pull_policy: alwayscontainer_name: coolifyrestart: alwaysdiff --git a/other/nightly/install.sh b/other/nightly/install.shindex 028652d802..365e4c3300 100755--- a/other/nightly/install.sh+++ b/other/nightly/install.sh@@ -9,7 +9,7 @@## DOCKER_ADDRESS_POOL_SIZE - Custom Docker address pool size (default: 24)## DOCKER_POOL_FORCE_OVERRIDE - Force override Docker address pool configuration (default: false)## AUTOUPDATE - Set to "false" to disable auto-updates-## REGISTRY_URL - Custom registry URL for Docker images (default: ghcr.io)+## REGISTRY_URL - Custom registry URL for Docker images (default: docker.io)set -e # Exit immediately if a command exits with a non-zero status## $1 could be empty, so we need to disable this check@@ -50,7 +50,7 @@ elseREGISTRY_URL=$(grep "^REGISTRY_URL=" "$ENV_FILE" | cut -d '=' -f2)echo "Using registry URL from .env: $REGISTRY_URL"else- REGISTRY_URL="ghcr.io"+ REGISTRY_URL="docker.io"echo "Using default registry URL: $REGISTRY_URL"fifi@@ -920,9 +920,9 @@ echo -e " - Please wait."getAJokeif [[ $- == *x* ]]; then- bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}" "true"+ bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-docker.io}" "true"else- bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}" "true"+ bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-docker.io}" "true"fiecho " - Coolify installed successfully."echo " - Waiting for Coolify to be ready..."diff --git a/other/nightly/upgrade.sh b/other/nightly/upgrade.shindex 8ccacb8a07..94fb77607f 100644--- a/other/nightly/upgrade.sh+++ b/other/nightly/upgrade.sh@@ -4,9 +4,15 @@CDN="https://cdn.coollabs.io/coolify-nightly"LATEST_IMAGE=${1:-latest}LATEST_HELPER_VERSION=${2:-latest}-REGISTRY_URL=${3:-ghcr.io}-SKIP_BACKUP=${4:-false}ENV_FILE="/data/coolify/source/.env"+if [ -n "${3+x}" ]; then+ REGISTRY_URL="$3"+elif [ -f "$ENV_FILE" ] && grep -q "^REGISTRY_URL=" "$ENV_FILE"; then+ REGISTRY_URL=$(grep "^REGISTRY_URL=" "$ENV_FILE" | cut -d '=' -f2- | head -n1)+else+ REGISTRY_URL="docker.io"+fi+SKIP_BACKUP=${4:-false}STATUS_FILE="/data/coolify/source/.upgrade-status"DATE=$(date +%Y-%m-%d-%H-%M-%S)@@ -80,7 +86,7 @@ fi# Get all unique images from docker compose config# LATEST_IMAGE env var is needed for image substitution in compose files-IMAGES=$(LATEST_IMAGE=${LATEST_IMAGE} docker compose --env-file "$ENV_FILE" $COMPOSE_FILES config --images 2>/dev/null | sort -u)+IMAGES=$(REGISTRY_URL=${REGISTRY_URL} LATEST_IMAGE=${LATEST_IMAGE} docker compose --env-file "$ENV_FILE" $COMPOSE_FILES config --images 2>/dev/null | sort -u)if [ -z "$IMAGES" ]; thenlog "ERROR: Failed to extract images from docker-compose files"@@ -127,7 +133,21 @@ 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..."+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)"@@ -164,7 +184,7 @@ echo "3/6 Pulling Docker images..."echo " This may take a few minutes depending on your connection."# Also pull the helper image (not in compose files but needed for upgrade)-HELPER_IMAGE="${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}"+HELPER_IMAGE="${REGISTRY_URL:-docker.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}"echo " - Pulling $HELPER_IMAGE..."log "Pulling image: $HELPER_IMAGE"if docker pull "$HELPER_IMAGE" >>"$LOGFILE" 2>&1; then@@ -256,7 +276,7 @@ nohup bash -c "filog 'Running docker compose up...'- docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock \${DOCKER_CONFIG_MOUNT} --rm \${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:\${LATEST_HELPER_VERSION} bash -c \"LATEST_IMAGE=\${LATEST_IMAGE} docker compose --env-file /data/coolify/source/.env \${COMPOSE_FILES} up -d --remove-orphans --wait --wait-timeout 60\" >>\"\$LOGFILE\" 2>&1+ docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock \${DOCKER_CONFIG_MOUNT} --rm \${REGISTRY_URL:-docker.io}/coollabsio/coolify-helper:\${LATEST_HELPER_VERSION} bash -c \"LATEST_IMAGE=\${LATEST_IMAGE} docker compose --env-file /data/coolify/source/.env \${COMPOSE_FILES} up -d --remove-orphans --wait --wait-timeout 60\" >>\"\$LOGFILE\" 2>&1log 'Docker compose up completed'# Final log entrydiff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.phpindex 5a6319bc82..8ffa266eec 100644--- a/resources/views/livewire/settings/index.blade.php+++ b/resources/views/livewire/settings/index.blade.php@@ -81,12 +81,6 @@placeholder="2001:db8::1" autocomplete="new-password" /></div>- @if($buildActivityId)- <div class="w-full mt-4">- <livewire:activity-monitor header="Building Helper Image" :activityId="$buildActivityId"- :fullHeight="false" />- </div>- @endif@if(isDev())<x-forms.input canGate="update" :canResource="$settings" id="dev_helper_version" label="Dev Helper Version (Development Only)"helper="Override the default coolify-helper image version. Leave empty to use the default version from config ({{ config('constants.coolify.helper_version') }}). Examples: 1.0.11, latest, dev"diff --git a/resources/views/livewire/settings/updates.blade.php b/resources/views/livewire/settings/updates.blade.phpindex ddb01539bc..ec247ecf7b 100644--- a/resources/views/livewire/settings/updates.blade.php+++ b/resources/views/livewire/settings/updates.blade.php@@ -44,6 +44,15 @@<x-forms.input required label="Frequency (cron expression)" disabled placeholder="disabled"helper="Frequency (cron expression) (automatically update coolify).<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every day at 00:00" />@endif++ <h4 class="pt-4">Docker Registry</h4>+ <div class="md:w-96">+ <x-forms.select id="docker_registry_url" label="Docker Registry"+ helper="The Docker registry used to pull Coolify images during updates.<br>Switch to Docker Hub if you experience rate limiting with GitHub Container Registry.">+ <option value="docker.io">Docker Hub (docker.io)</option>+ <option value="ghcr.io">GitHub Container Registry (ghcr.io)</option>+ </x-forms.select>+ </div></div></form>diff --git a/scripts/install.sh b/scripts/install.shindex 430dd9d832..7569efcc81 100755--- a/scripts/install.sh+++ b/scripts/install.sh@@ -9,7 +9,7 @@## DOCKER_ADDRESS_POOL_SIZE - Custom Docker address pool size (default: 24)## DOCKER_POOL_FORCE_OVERRIDE - Force override Docker address pool configuration (default: false)## AUTOUPDATE - Set to "false" to disable auto-updates-## REGISTRY_URL - Custom registry URL for Docker images (default: ghcr.io)+## REGISTRY_URL - Custom registry URL for Docker images (default: docker.io)set -e # Exit immediately if a command exits with a non-zero status## $1 could be empty, so we need to disable this check@@ -50,7 +50,7 @@ elseREGISTRY_URL=$(grep "^REGISTRY_URL=" "$ENV_FILE" | cut -d '=' -f2)echo "Using registry URL from .env: $REGISTRY_URL"else- REGISTRY_URL="ghcr.io"+ REGISTRY_URL="docker.io"echo "Using default registry URL: $REGISTRY_URL"fifi@@ -920,9 +920,9 @@ echo -e " - Please wait."getAJokeif [[ $- == *x* ]]; then- bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}" "true"+ bash -x /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-docker.io}" "true"else- bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-ghcr.io}" "true"+ bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" "${REGISTRY_URL:-docker.io}" "true"fiecho " - Coolify installed successfully."echo " - Waiting for Coolify to be ready..."diff --git a/scripts/upgrade.sh b/scripts/upgrade.shindex fb27694b0e..a909d2e49a 100644--- a/scripts/upgrade.sh+++ b/scripts/upgrade.sh@@ -4,9 +4,15 @@CDN="https://cdn.coollabs.io/coolify"LATEST_IMAGE=${1:-latest}LATEST_HELPER_VERSION=${2:-latest}-REGISTRY_URL=${3:-ghcr.io}-SKIP_BACKUP=${4:-false}ENV_FILE="/data/coolify/source/.env"+if [ -n "${3+x}" ]; then+ REGISTRY_URL="$3"+elif [ -f "$ENV_FILE" ] && grep -q "^REGISTRY_URL=" "$ENV_FILE"; then+ REGISTRY_URL=$(grep "^REGISTRY_URL=" "$ENV_FILE" | cut -d '=' -f2- | head -n1)+else+ REGISTRY_URL="docker.io"+fi+SKIP_BACKUP=${4:-false}STATUS_FILE="/data/coolify/source/.upgrade-status"DATE=$(date +%Y-%m-%d-%H-%M-%S)@@ -80,7 +86,7 @@ fi# Get all unique images from docker compose config# LATEST_IMAGE env var is needed for image substitution in compose files-IMAGES=$(LATEST_IMAGE=${LATEST_IMAGE} docker compose --env-file "$ENV_FILE" $COMPOSE_FILES config --images 2>/dev/null | sort -u)+IMAGES=$(REGISTRY_URL=${REGISTRY_URL} LATEST_IMAGE=${LATEST_IMAGE} docker compose --env-file "$ENV_FILE" $COMPOSE_FILES config --images 2>/dev/null | sort -u)if [ -z "$IMAGES" ]; thenlog "ERROR: Failed to extract images from docker-compose files"@@ -127,7 +133,21 @@ 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..."+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)"@@ -173,7 +193,7 @@ echo "3/6 Pulling Docker images..."echo " This may take a few minutes depending on your connection."# Also pull the helper image (not in compose files but needed for upgrade)-HELPER_IMAGE="${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}"+HELPER_IMAGE="${REGISTRY_URL:-docker.io}/coollabsio/coolify-helper:${LATEST_HELPER_VERSION}"echo " - Pulling $HELPER_IMAGE..."log "Pulling image: $HELPER_IMAGE"if docker pull "$HELPER_IMAGE" >>"$LOGFILE" 2>&1; then@@ -265,7 +285,7 @@ nohup bash -c "filog 'Running docker compose up...'- docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock \${DOCKER_CONFIG_MOUNT} --rm \${REGISTRY_URL:-ghcr.io}/coollabsio/coolify-helper:\${LATEST_HELPER_VERSION} bash -c \"LATEST_IMAGE=\${LATEST_IMAGE} docker compose --env-file /data/coolify/source/.env \${COMPOSE_FILES} up -d --remove-orphans --wait --wait-timeout 60\" >>\"\$LOGFILE\" 2>&1+ docker run -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock \${DOCKER_CONFIG_MOUNT} --rm \${REGISTRY_URL:-docker.io}/coollabsio/coolify-helper:\${LATEST_HELPER_VERSION} bash -c \"LATEST_IMAGE=\${LATEST_IMAGE} docker compose --env-file /data/coolify/source/.env \${COMPOSE_FILES} up -d --remove-orphans --wait --wait-timeout 60\" >>\"\$LOGFILE\" 2>&1log 'Docker compose up completed'# Final log entrydiff --git a/tests/Feature/SettingsUpdatesAuthorizationTest.php b/tests/Feature/SettingsUpdatesAuthorizationTest.phpindex 5a062101a8..353606c601 100644--- a/tests/Feature/SettingsUpdatesAuthorizationTest.php+++ b/tests/Feature/SettingsUpdatesAuthorizationTest.php@@ -26,7 +26,7 @@ test('non-admin user is redirected from settings updates page', function () {test('instance admin can access settings updates page', function () {$rootTeam = Team::find(0) ?? Team::factory()->create(['id' => 0]);Server::factory()->create(['id' => 0, 'team_id' => $rootTeam->id]);- InstanceSettings::create(['id' => 0]);+ InstanceSettings::forceCreate(['id' => 0]);Once::flush();$user = User::factory()->create();@@ -39,3 +39,24 @@ test('instance admin can access settings updates page', function () {->assertOk()->assertNoRedirect();});++test('instance admin cannot save an invalid docker registry url', function () {+ config()->set('constants.coolify.self_hosted', false);++ $rootTeam = Team::find(0) ?? Team::factory()->create(['id' => 0]);+ $settings = InstanceSettings::forceCreate(['id' => 0]);+ Once::flush();++ $user = User::factory()->create();+ $rootTeam->members()->attach($user->id, ['role' => 'admin']);++ $this->actingAs($user);+ session(['currentTeam' => ['id' => $rootTeam->id]]);++ Livewire::test(Updates::class)+ ->set('docker_registry_url', 'docker.io; touch /tmp/pwned')+ ->call('instantSave')+ ->assertHasErrors(['docker_registry_url' => 'in']);++ expect($settings->fresh()->docker_registry_url)->toBe('docker.io');+});diff --git a/tests/Unit/UpdateCoolifyTest.php b/tests/Unit/UpdateCoolifyTest.phpindex b3f496d687..833fe36033 100644--- a/tests/Unit/UpdateCoolifyTest.php+++ b/tests/Unit/UpdateCoolifyTest.php@@ -1,21 +1,43 @@<?phpuse App\Actions\Server\UpdateCoolify;+use App\Livewire\Settings\Updates;use App\Models\InstanceSettings;use App\Models\Server;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;use Illuminate\Support\Facades\Cache;use Illuminate\Support\Facades\Http;+use Illuminate\Support\Facades\Log;+use Illuminate\Support\Facades\Process;+use Illuminate\Support\Facades\Queue;+use Illuminate\Support\Once;+use Livewire\Livewire;+use Spatie\Activitylog\Models\Activity;+use Tests\TestCase;-beforeEach(function () {- // Mock Server- $this->mockServer = Mockery::mock(Server::class)->makePartial();- $this->mockServer->id = 0;+uses(TestCase::class, RefreshDatabase::class);- // Mock InstanceSettings- $this->settings = Mockery::mock(InstanceSettings::class);- $this->settings->is_auto_update_enabled = true;- $this->settings->shouldReceive('save')->andReturn(true);-});+function updateCoolifyTestCreateRootServerAndSettings(array $settings = []): void+{+ Team::factory()->create(['id' => 0]);+ Server::forceCreate([+ 'id' => 0,+ 'name' => 'localhost',+ 'ip' => '127.0.0.1',+ 'user' => 'root',+ 'team_id' => 0,+ 'private_key_id' => 1,+ ]);+ InstanceSettings::forceCreate(array_merge([+ 'id' => 0,+ 'is_auto_update_enabled' => true,+ 'auto_update_frequency' => '0 0 * * *',+ 'update_check_frequency' => '0 * * * *',+ ], $settings));+ Once::flush();+}afterEach(function () {Mockery::close();@@ -26,15 +48,7 @@ it('has UpdateCoolify action class', function () {});it('validates cache against running version before fallback', function () {- // Mock Server::find to return our mock server- Server::shouldReceive('find')- ->with(0)- ->andReturn($this->mockServer);-- // Mock instanceSettings- $this->app->instance('App\Models\InstanceSettings', function () {- return $this->settings;- });+ updateCoolifyTestCreateRootServerAndSettings();// CDN failsHttp::fake(['*' => Http::response(null, 500)]);@@ -51,7 +65,7 @@ it('validates cache against running version before fallback', function () {try {$action->handle(manual_update: false);expect(false)->toBeTrue('Expected exception was not thrown');- } catch (\Exception $e) {+ } catch (Exception $e) {expect($e->getMessage())->toContain('cache version');expect($e->getMessage())->toContain('4.0.5');expect($e->getMessage())->toContain('4.0.10');@@ -59,15 +73,9 @@ it('validates cache against running version before fallback', function () {});it('uses validated cache when CDN fails and cache is newer', function () {- // Mock Server::find- Server::shouldReceive('find')- ->with(0)- ->andReturn($this->mockServer);-- // Mock instanceSettings- $this->app->instance('App\Models\InstanceSettings', function () {- return $this->settings;- });+ updateCoolifyTestCreateRootServerAndSettings();+ Queue::fake();+ config(['constants.ssh.mux_enabled' => false]);// CDN failsHttp::fake(['*' => Http::response(null, 500)]);@@ -78,12 +86,9 @@ it('uses validated cache when CDN fails and cache is newer', function () {config(['constants.coolify.version' => '4.0.5']);- // Mock the update method to prevent actual update- $action = Mockery::mock(UpdateCoolify::class)->makePartial();- $action->shouldReceive('update')->once();- $action->server = $this->mockServer;+ $action = new UpdateCoolify;- \Illuminate\Support\Facades\Log::shouldReceive('warning')+ Log::shouldReceive('warning')->once()->with('Failed to fetch fresh version from CDN, using validated cache', Mockery::type('array'));@@ -93,16 +98,198 @@ it('uses validated cache when CDN fails and cache is newer', function () {expect($action->latestVersion)->toBe('4.0.10');});-it('prevents downgrade even with manual update', function () {- // Mock Server::find- Server::shouldReceive('find')- ->with(0)- ->andReturn($this->mockServer);+it('passes the saved registry URL to the upgrade script command', function () {+ Queue::fake();+ config([+ 'app.env' => 'testing',+ 'constants.coolify.version' => '4.0.9',+ 'constants.coolify.helper_version' => '1.0.14',+ 'constants.coolify.upgrade_script_url' => 'https://cdn.example.com/upgrade.sh',+ 'constants.ssh.mux_enabled' => false,+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'is_auto_update_enabled' => true,+ 'docker_registry_url' => 'ghcr.io',+ ]);++ Http::fake([+ '*' => Http::response([+ 'coolify' => ['v4' => ['version' => '4.0.10']],+ ], 200),+ ]);++ (new UpdateCoolify)->handle();++ expect(Activity::query()->latest('id')->first()?->getExtraProperty('command'))->toBe(+ "curl -fsSL https://cdn.example.com/upgrade.sh -o /data/coolify/source/upgrade.sh\n".+ "bash /data/coolify/source/upgrade.sh '4.0.10' '1.0.14' 'ghcr.io'"+ );+});++it('falls back to docker io for the upgrade script command when no registry is saved', function () {+ Queue::fake();+ config([+ 'app.env' => 'testing',+ 'constants.coolify.version' => '4.0.9',+ 'constants.coolify.helper_version' => '1.0.14',+ 'constants.coolify.registry_url' => 'ghcr.io',+ 'constants.coolify.upgrade_script_url' => 'https://cdn.example.com/upgrade.sh',+ 'constants.ssh.mux_enabled' => false,+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'is_auto_update_enabled' => true,+ ]);++ Http::fake([+ '*' => Http::response([+ 'coolify' => ['v4' => ['version' => '4.0.10']],+ ], 200),+ ]);++ (new UpdateCoolify)->handle();++ expect(Activity::query()->latest('id')->first()?->getExtraProperty('command'))->toBe(+ "curl -fsSL https://cdn.example.com/upgrade.sh -o /data/coolify/source/upgrade.sh\n".+ "bash /data/coolify/source/upgrade.sh '4.0.10' '1.0.14' 'docker.io'"+ );+});++it('defaults the registry setting to docker io when no registry is saved', function () {+ config([+ 'app.env' => 'testing',+ 'constants.coolify.registry_url' => 'ghcr.io',+ 'constants.coolify.self_hosted' => true,+ ]);++ updateCoolifyTestCreateRootServerAndSettings();++ $rootTeam = Team::findOrFail(0);+ $user = User::factory()->create();+ $rootTeam->members()->attach($user->id, ['role' => 'admin']);++ $this->actingAs($user);+ session(['currentTeam' => ['id' => $rootTeam->id]]);++ Livewire::test(Updates::class)+ ->assertSet('docker_registry_url', 'docker.io');+});++it('uses the database registry for helper images when the configured helper image is default', function () {+ config([+ 'constants.coolify.registry_url' => 'ghcr.io',+ 'constants.coolify.helper_image' => 'ghcr.io/coollabsio/coolify-helper',+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'docker_registry_url' => 'docker.io',+ ]);++ expect(coolifyRegistryUrl())->toBe('docker.io')+ ->and(coolifyHelperImage())->toBe('docker.io/coollabsio/coolify-helper');+});++it('preserves an explicit custom helper image override', function () {+ config([+ 'constants.coolify.registry_url' => 'docker.io',+ 'constants.coolify.helper_image' => 'registry.example.com/custom/helper',+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'docker_registry_url' => 'ghcr.io',+ ]);++ expect(coolifyHelperImage())->toBe('registry.example.com/custom/helper');+});++it('uses the database registry for sentinel images', function () {+ $action = file_get_contents(app_path('Actions/Server/StartSentinel.php'));++ expect($action)->toContain("\$image = coolifyRegistryUrl().'/coollabsio/sentinel:'.\$version;");+});++it('rejects invalid registry values and does not sync them', function () {+ Process::fake();+ config([+ 'app.env' => 'testing',+ 'constants.coolify.registry_url' => 'docker.io',+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'is_auto_update_enabled' => true,+ 'auto_update_frequency' => '0 0 * * *',+ 'update_check_frequency' => '0 * * * *',+ 'docker_registry_url' => 'docker.io',+ ]);++ $rootTeam = Team::findOrFail(0);+ $user = User::factory()->create();+ $rootTeam->members()->attach($user->id, ['role' => 'admin']);- // Mock instanceSettings- $this->app->instance('App\Models\InstanceSettings', function () {- return $this->settings;- });+ $this->actingAs($user);+ session(['currentTeam' => ['id' => $rootTeam->id]]);++ Livewire::test(Updates::class)+ ->set('docker_registry_url', 'ghcr.io; touch /tmp/pwned')+ ->call('submit')+ ->assertHasErrors(['docker_registry_url' => ['in']]);++ expect(InstanceSettings::findOrFail(0)->docker_registry_url)->toBe('docker.io');+ Process::assertDidntRun(fn () => true);+});++it('does not save registry changes when syncing the env file fails', function () {+ config([+ 'app.env' => 'testing',+ 'constants.coolify.registry_url' => 'docker.io',+ 'constants.coolify.self_hosted' => true,+ ]);++ updateCoolifyTestCreateRootServerAndSettings([+ 'is_auto_update_enabled' => true,+ 'auto_update_frequency' => '0 0 * * *',+ 'update_check_frequency' => '0 * * * *',+ 'docker_registry_url' => 'docker.io',+ ]);++ $rootTeam = Team::findOrFail(0);+ $user = User::factory()->create();+ $rootTeam->members()->attach($user->id, ['role' => 'admin']);++ $this->actingAs($user);+ session(['currentTeam' => ['id' => $rootTeam->id]]);++ $component = new class extends Updates+ {+ protected function syncRegistryUrlToEnv(string $registryUrl): void+ {+ throw new RuntimeException('sync failed');+ }+ };+ $component->settings = InstanceSettings::findOrFail(0);+ $component->auto_update_frequency = '0 0 * * *';+ $component->update_check_frequency = '0 * * * *';+ $component->is_auto_update_enabled = true;+ $component->docker_registry_url = 'ghcr.io';++ $component->instantSave();++ expect(InstanceSettings::findOrFail(0)->docker_registry_url)->toBe('docker.io');+});++it('appends registry url to env file when the key is missing', function () {+ $component = new Updates;+ $method = new ReflectionMethod(Updates::class, 'registryEnvSyncCommand');++ expect($method->invoke($component, 'ghcr.io'))+ ->toContain("grep -q '^REGISTRY_URL=' /data/coolify/source/.env")+ ->toContain("sed -i 's|^REGISTRY_URL=.*|REGISTRY_URL=ghcr.io|' /data/coolify/source/.env")+ ->toContain("printf '%s\\n' 'REGISTRY_URL=ghcr.io' >> /data/coolify/source/.env");+});++it('prevents downgrade even with manual update', function () {+ updateCoolifyTestCreateRootServerAndSettings();// CDN returns older versionHttp::fake([@@ -116,7 +303,7 @@ it('prevents downgrade even with manual update', function () {$action = new UpdateCoolify;- \Illuminate\Support\Facades\Log::shouldReceive('error')+ Log::shouldReceive('error')->once()->with('Downgrade prevented', Mockery::type('array'));@@ -124,7 +311,7 @@ it('prevents downgrade even with manual update', function () {try {$action->handle(manual_update: true);expect(false)->toBeTrue('Expected exception was not thrown');- } catch (\Exception $e) {+ } catch (Exception $e) {expect($e->getMessage())->toContain('Cannot downgrade');expect($e->getMessage())->toContain('4.0.10');expect($e->getMessage())->toContain('4.0.0');diff --git a/tests/Unit/UpgradePostgresScriptTest.php b/tests/Unit/UpgradePostgresScriptTest.phpindex 49a6b881f8..a888bc3a41 100644--- a/tests/Unit/UpgradePostgresScriptTest.php+++ b/tests/Unit/UpgradePostgresScriptTest.php@@ -44,6 +44,38 @@ it('downloads postgres upgrade script during install and upgrade without auto-ru'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) {$script = file_get_contents(getcwd().'/'.$path);