diff --git a/app/Actions/Proxy/InstallProxy.php b/app/Actions/Proxy/InstallProxy.php index 84429c7cf..42864b415 100644 --- a/app/Actions/Proxy/InstallProxy.php +++ b/app/Actions/Proxy/InstallProxy.php @@ -3,12 +3,14 @@ namespace App\Actions\Proxy; use App\Enums\ActivityTypes; +use App\Enums\ProxyTypes; use App\Models\Server; +use Spatie\Activitylog\Models\Activity; use Symfony\Component\Yaml\Yaml; class InstallProxy { - public function __invoke(Server $server) + public function __invoke(Server $server): Activity { $docker_compose_yml_base64 = base64_encode( $this->getDockerComposeContents() @@ -30,6 +32,10 @@ class InstallProxy 'docker ps', ], $server, ActivityTypes::INLINE->value); + // Persist to Database + $server->extra_attributes->proxy = ProxyTypes::TRAEFIK_V2->value; + $server->save(); + return $activity; } @@ -47,8 +53,6 @@ class InstallProxy ? config('proxy.project_path_on_host') . '/_testing_hosts/host_2_proxy' : '.'; - ray($cwd); - return [ "version" => "3.7", "networks" => [ diff --git a/app/Http/Livewire/Server/Proxy.php b/app/Http/Livewire/Server/Proxy.php index bc4298287..a44bb9e6d 100644 --- a/app/Http/Livewire/Server/Proxy.php +++ b/app/Http/Livewire/Server/Proxy.php @@ -13,6 +13,11 @@ class Proxy extends Component protected string $selectedProxy = ''; + public $is_proxy_installed; + + public $is_check_proxy_complete = false; + public $is_proxy_settings_in_sync = false; + public function mount(Server $server) { $this->server = $server; @@ -25,6 +30,14 @@ class Proxy extends Component $this->emit('newMonitorActivity', $activity->id); } + public function checkProxySettingsInSync() + { + + + $this->is_check_proxy_complete = true; + $this->is_proxy_settings_in_sync = true; + } + public function render() { return view('livewire.server.proxy'); diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile index c90e53d08..e8724828e 100644 --- a/docker/dev-ssu/Dockerfile +++ b/docker/dev-ssu/Dockerfile @@ -5,4 +5,9 @@ RUN apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* +RUN echo "alias ll='ls -al'" >> /etc/bash.bashrc +RUN echo "alias a='php artisan'" >> /etc/bash.bashrc +RUN echo "alias mfs='php artisan migrate:fresh --seed'" >> /etc/bash.bashrc +RUN echo "alias cda='composer dump-autoload'" >> /etc/bash.bashrc + # COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/ diff --git a/resources/views/livewire/server/_proxy/loading.blade.php b/resources/views/livewire/server/_proxy/loading.blade.php new file mode 100644 index 000000000..cfab2d8db --- /dev/null +++ b/resources/views/livewire/server/_proxy/loading.blade.php @@ -0,0 +1,12 @@ +