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
chore: prepare for PR
Andras Bacsai236745ede1c2
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.phpindex 77e8b7b07e..7b74392cf1 100644--- a/bootstrap/helpers/docker.php+++ b/bootstrap/helpers/docker.php@@ -1006,6 +1006,7 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)'--ulimit' => 'ulimits','--privileged' => 'privileged','--ip' => 'ip',+ '--ip6' => 'ip6','--shm-size' => 'shm_size','--gpus' => 'gpus','--hostname' => 'hostname',diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.phpindex ac52c0af8c..27637cc6f2 100644--- a/bootstrap/helpers/proxy.php+++ b/bootstrap/helpers/proxy.php@@ -127,10 +127,44 @@ function connectProxyToNetworks(Server $server)return $commands->flatten();}+/**+ * Generate shell commands to fix a Docker network that has an IPv6 gateway with CIDR notation.+ *+ * Docker 25+ may store IPv6 gateways with CIDR (e.g. fd7d:f7d2:7e77::1/64), which causes+ * ParseAddr errors in Docker Compose. This detects the issue and recreates the network.+ *+ * @see https://github.com/coollabsio/coolify/issues/8649+ *+ * @param string $network Network name to check and fix+ * @return array Shell commands to execute on the remote server+ */+function fixNetworkIpv6CidrGateway(string $network): array+{+ return [+ "if docker network inspect {$network} >/dev/null 2>&1; then",+ " IPV6_GW=\$(docker network inspect {$network} --format '{{range .IPAM.Config}}{{.Gateway}} {{end}}' 2>/dev/null | tr ' ' '\n' | grep '/' || true)",+ ' if [ -n "$IPV6_GW" ]; then',+ " echo \"Fixing network {$network}: IPv6 gateway has CIDR notation (\$IPV6_GW)\"",+ " CONTAINERS=\$(docker network inspect {$network} --format '{{range .Containers}}{{.Name}} {{end}}' 2>/dev/null)",+ ' for c in $CONTAINERS; do',+ " [ -n \"\$c\" ] && docker network disconnect {$network} \"\$c\" 2>/dev/null || true",+ ' done',+ " docker network rm {$network} 2>/dev/null || true",+ " docker network create --attachable {$network} 2>/dev/null || true",+ ' for c in $CONTAINERS; do',+ " [ -n \"\$c\" ] && [ \"\$c\" != \"coolify-proxy\" ] && docker network connect {$network} \"\$c\" 2>/dev/null || true",+ ' done',+ ' fi',+ 'fi',+ ];+}+/*** Ensures all required networks exist before docker compose up.* This must be called BEFORE docker compose up since the compose file declares networks as external.*+ * Also detects and fixes networks with IPv6 CIDR gateway notation that causes ParseAddr errors.+ ** @param Server $server The server to ensure networks on* @return \Illuminate\Support\Collection Commands to create networks if they don't exist*/@@ -140,17 +174,23 @@ function ensureProxyNetworksExist(Server $server)if ($server->isSwarm()) {$commands = $networks->map(function ($network) {- return [- "echo 'Ensuring network $network exists...'",- "docker network ls --format '{{.Name}}' | grep -q '^{$network}$' || docker network create --driver overlay --attachable $network",- ];+ return array_merge(+ fixNetworkIpv6CidrGateway($network),+ [+ "echo 'Ensuring network $network exists...'",+ "docker network ls --format '{{.Name}}' | grep -q '^{$network}$' || docker network create --driver overlay --attachable $network",+ ]+ );});} else {$commands = $networks->map(function ($network) {- return [- "echo 'Ensuring network $network exists...'",- "docker network ls --format '{{.Name}}' | grep -q '^{$network}$' || docker network create --attachable $network",- ];+ return array_merge(+ fixNetworkIpv6CidrGateway($network),+ [+ "echo 'Ensuring network $network exists...'",+ "docker network ls --format '{{.Name}}' | grep -q '^{$network}$' || docker network create --attachable $network",+ ]+ );});}diff --git a/tests/Feature/DockerCustomCommandsTest.php b/tests/Feature/DockerCustomCommandsTest.phpindex 5d9dcd174a..74bff20438 100644--- a/tests/Feature/DockerCustomCommandsTest.php+++ b/tests/Feature/DockerCustomCommandsTest.php@@ -198,3 +198,20 @@ test('ConvertEntrypointSingleQuotedWithDoubleQuotesInside', function () {'entrypoint' => 'python -c "print(\"hi\")"',]);});++test('ConvertIp6', function () {+ $input = '--ip6 2001:db8::1';+ $output = convertDockerRunToCompose($input);+ expect($output)->toBe([+ 'ip6' => ['2001:db8::1'],+ ]);+});++test('ConvertIpAndIp6Together', function () {+ $input = '--ip 172.20.0.5 --ip6 2001:db8::1';+ $output = convertDockerRunToCompose($input);+ expect($output)->toBe([+ 'ip' => ['172.20.0.5'],+ 'ip6' => ['2001:db8::1'],+ ]);+});