wip

app/Http/Livewire/Server/Proxy.php

@@ -14,9 +14,6 @@ class Proxy extends Component
     public Server $server;
 
     public ProxyTypes $selectedProxy = ProxyTypes::TRAEFIK_V2;
-    public $is_proxy_installed;
-
-    public $is_check_proxy_complete = false;
     public $proxy_settings = null;
 
     public function installProxy()
@@ -64,7 +61,6 @@ public function checkProxySettingsInSync()
     {
         try {
             $this->proxy_settings = resolve(CheckProxySettingsInSync::class)($this->server);
-            $this->is_check_proxy_complete = true;
         } catch (\Exception $e) {
             return generalErrorHandler($e);
         }

docker-compose.dev.yml

@@ -2,7 +2,6 @@ version: '3.8'
 
 x-testing-host:
   &testing-host-base
-  image: coolify-testing-host
   build:
     dockerfile: Dockerfile
     context: ./docker/testing-host

docker/testing-host/Dockerfile

@@ -1,14 +1,16 @@
 FROM ubuntu:22.04
 
 ARG TARGETPLATFORM
-
 # https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=20.10.18
+ARG DOCKER_VERSION=23.0.5
 # https://github.com/docker/compose/releases
-# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
+ARG DOCKER_COMPOSE_VERSION=2.17.3
-ARG DOCKER_COMPOSE_VERSION=2.6.1
+# https://github.com/docker/buildx/releases
+ARG DOCKER_BUILDX_VERSION=0.10.4
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
+ARG PACK_VERSION=0.29.0
+# https://github.com/railwayapp/nixpacks/releases
+ARG NIXPACKS_VERSION=1.6.1
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV TZ=UTC
@@ -26,13 +28,14 @@ RUN apt-get update \
 RUN ssh-keygen -A
 RUN mkdir -p /run/sshd
 
-# Install Docker CLI, Docker Compose, and Pack
+RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
-RUN mkdir -p ~/.docker/cli-plugins
+    curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-$DOCKER_VERSION -o /usr/bin/docker
+    curl -sSL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-$DOCKER_COMPOSE_VERSION -o ~/.docker/cli-plugins/docker-compose
+    (curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar -C /usr/bin/ --no-same-owner -xzv --strip-components=1 docker/docker) && \
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /usr/local/bin/pack
+    (curl -sSL https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz | tar -C /usr/local/bin/ --no-same-owner -xzv pack) && \
-RUN curl -sSL https://nixpacks.com/install.sh | bash
+    curl -sSL https://nixpacks.com/install.sh | bash && \
-RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack
+    chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack /root/.docker/cli-plugins/docker-buildx \
+    ;fi
 RUN groupadd docker
 
 # Setup coolify user

resources/css/app.css

@@ -42,6 +42,9 @@ h1 {
 h2 {
     @apply text-xl font-bold py-4;
 }
+h3 {
+    @apply text-lg font-bold py-4;
+}
 .box {
     @apply flex items-center justify-center text-sm rounded cursor-pointer h-14 bg-coolgray-200 hover:bg-coollabs p-2;
 }

resources/views/livewire/server/proxy.blade.php

@@ -1,8 +1,5 @@
 <div>
-    <div class="flex items-center gap-2">
+
-        <h2>Proxy</h2>
-        <div>{{ $this->server->extra_attributes->proxy_status }}</div>
-    </div>
     @if ($this->server->extra_attributes->proxy_status !== 'running')
         <select wire:model="selectedProxy">
             <option value="{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}">
@@ -32,8 +29,8 @@
                     <livewire:activity-monitor />
                 </div>
                 <template x-if="showConfiguration">
-                    <div x-init="$wire.checkProxySettingsInSync" class="pt-4">
+                    <div x-init="$wire.checkProxySettingsInSync">
-                        <h1>Proxy Configuration</h1>
+                        <h3>Configuration</h3>
                         <div wire:loading wire:target="checkProxySettingsInSync">
                             <x-proxy.loading />
                         </div>

resources/views/server/show.blade.php

@@ -20,6 +20,15 @@
     @else
         <p>No destinations found</p>
     @endif
-
+    <div class="flex items-center gap-2">
+        <h2>Proxy</h2>
+        @if ($server->settings->is_validated)
+            <div>{{ $server->extra_attributes->proxy_status }}</div>
+        @endif
+    </div>
+    @if ($server->settings->is_validated)
         <livewire:server.proxy :server="$server" />
+    @else
+        <p>Server is not validated. Validate first.</p>
+    @endif
 </x-layout>