From d5a5e6ae0089730a323f6c0b03965551e0fbb2c2 Mon Sep 17 00:00:00 2001 From: Bozhidar Date: Sat, 27 Apr 2024 01:55:13 +0300 Subject: [PATCH] update --- web/Modules/Docker/DockerContainerApi.php | 2 +- .../Clusters/Docker/Resources/DockerContainerResource.php | 3 +++ .../views/actions/samples/ubuntu/apache2-conf.blade.php | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/Modules/Docker/DockerContainerApi.php b/web/Modules/Docker/DockerContainerApi.php index eb3510b..badd01a 100644 --- a/web/Modules/Docker/DockerContainerApi.php +++ b/web/Modules/Docker/DockerContainerApi.php @@ -59,7 +59,7 @@ class DockerContainerApi { $commandId = rand(10000, 99999); - $shellFileContent = 'docker run --name ' . $this->name . ' '; + $shellFileContent = 'docker run -it --network=host --name ' . $this->name . ' '; if (!empty($this->port)) { $shellFileContent .= ' -p ' . $this->externalPort . ':' . $this->port . ' '; diff --git a/web/Modules/Docker/Filament/Clusters/Docker/Resources/DockerContainerResource.php b/web/Modules/Docker/Filament/Clusters/Docker/Resources/DockerContainerResource.php index 084b05d..259c70e 100644 --- a/web/Modules/Docker/Filament/Clusters/Docker/Resources/DockerContainerResource.php +++ b/web/Modules/Docker/Filament/Clusters/Docker/Resources/DockerContainerResource.php @@ -65,6 +65,9 @@ class DockerContainerResource extends Resource $defaultPort = $port; } } + if ($defaultPort == 80) { + $defaultPort = 83; + } return $form ->schema([ diff --git a/web/resources/views/actions/samples/ubuntu/apache2-conf.blade.php b/web/resources/views/actions/samples/ubuntu/apache2-conf.blade.php index dde3e0a..7d37cb6 100644 --- a/web/resources/views/actions/samples/ubuntu/apache2-conf.blade.php +++ b/web/resources/views/actions/samples/ubuntu/apache2-conf.blade.php @@ -39,6 +39,9 @@ @if (!empty($proxyPass)) + ProxyPreserveHost On + ProxyRequests Off + ProxyVia On ProxyPass / {{$proxyPass}} ProxyPassReverse / {{$proxyPass}}