diff --git a/app/Http/Livewire/Destination/New/StandaloneDocker.php b/app/Http/Livewire/Destination/New/StandaloneDocker.php index 40bdbe937..498caa8c0 100644 --- a/app/Http/Livewire/Destination/New/StandaloneDocker.php +++ b/app/Http/Livewire/Destination/New/StandaloneDocker.php @@ -24,16 +24,18 @@ class StandaloneDocker extends Component ]; public function mount() { - if (!$this->server_id) { - if (request()->query('server_id')) { - $this->server_id = request()->query('server_id'); - } else { - if ($this->servers->count() > 0) { - $this->server_id = $this->servers->first()->id; - } + if (request()->query('server_id')) { + $this->server_id = request()->query('server_id'); + } else { + if ($this->servers->count() > 0) { + $this->server_id = $this->servers->first()->id; } } - $this->network = new Cuid2(7); + if (request()->query('network_name')) { + $this->network = request()->query('network_name'); + } else { + $this->network = new Cuid2(7); + } $this->name = generate_random_name(); } private function createNetworkAndAttachToProxy() diff --git a/app/Http/Livewire/Destination/Show.php b/app/Http/Livewire/Destination/Show.php new file mode 100644 index 000000000..4bef75862 --- /dev/null +++ b/app/Http/Livewire/Destination/Show.php @@ -0,0 +1,24 @@ +server->standaloneDockers; + ray($alreadyAddedNetworks); + $networks = instant_remote_process(['docker network ls --format "{{json .}}"'], $this->server, false); + $this->networks = format_docker_command_output_to_json($networks)->filter(function ($network) { + return $network['Name'] !== 'bridge' && $network['Name'] !== 'host' && $network['Name'] !== 'none'; + })->filter(function ($network) use ($alreadyAddedNetworks) { + return !$alreadyAddedNetworks->contains('network', $network['Name']); + }); + } +} diff --git a/resources/views/livewire/destination/show.blade.php b/resources/views/livewire/destination/show.blade.php new file mode 100644 index 000000000..e632ac707 --- /dev/null +++ b/resources/views/livewire/destination/show.blade.php @@ -0,0 +1,34 @@ +