diff --git a/app/Actions/Server/InstallDocker.php b/app/Actions/Server/InstallDocker.php index 28c9e1226..7c58445dc 100644 --- a/app/Actions/Server/InstallDocker.php +++ b/app/Actions/Server/InstallDocker.php @@ -3,10 +3,12 @@ namespace App\Actions\Server; use App\Models\Server; +use App\Models\StandaloneDocker; +use App\Models\Team; class InstallDocker { - public function __invoke(Server $server) + public function __invoke(Server $server, Team $team) { $dockerVersion = '23.0'; $config = base64_encode('{ "live-restore": true }'); @@ -23,8 +25,16 @@ class InstallDocker "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json", "echo ####### Restarting Docker Engine...", "systemctl restart docker", + "echo ####### Creating default network...", + "docker network create --attachable coolify", "echo ####### Done!" ], $server); + StandaloneDocker::create([ + 'name' => 'coolify', + 'network' => 'coolify', + 'server_id' => $server->id, + 'team_id' => $team->id + ]); return $activity; } diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index d5e5c613d..44a94e31e 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -38,7 +38,7 @@ class Form extends Component } public function installDocker() { - $activity = resolve(InstallDocker::class)($this->server); + $activity = resolve(InstallDocker::class)($this->server, session('currentTeam')); $this->emit('newMonitorActivity', $activity->id); } public function validateServer() diff --git a/config/version.php b/config/version.php index 6fbf00532..e91e6f65c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ {{ data_get($docker, 'network') }} @empty -
N\A
+
N/A
@endforelse
diff --git a/versions.json b/versions.json index a240096ab..bc2b80389 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.32" }, "v4": { - "version": "4.0.0-beta.6" + "version": "4.0.0-beta.7" } } } \ No newline at end of file