feat: #30 enable pdo_pgsql ext

ptah-sh · Jul 3, 2024 · a10c846 · a10c846
1 parent ca5065d
commit a10c846
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
 FROM bitnami/php-fpm:latest
 
+RUN echo "extension=pdo_pgsql.so" >> /opt/bitnami/php/etc/php.ini
+
 RUN install_packages nodejs npm \
     && apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 

diff --git a/app/Http/Controllers/SwarmController.php b/app/Http/Controllers/SwarmController.php
@@ -88,11 +88,13 @@ public function updateDockerRegistries(Swarm $swarm, Request $request)
             $tasks = [];
 
             foreach ($swarmData->registries as $registry) {
-                $previous = $swarm->data->findRegistry($registry->dockerName);
-                if ($registry->sameAs($previous)) {
-                    $registry->dockerName = $previous->dockerName;
+                $previous = $registry->dockerName ? $swarm->data->findRegistry($registry->dockerName) : null;
+                if ($previous) {
+                    if ($registry->sameAs($previous)) {
+                        $registry->dockerName = $previous->dockerName;
 
-                    continue;
+                        continue;
+                    }
                 }
 
                 $registry->dockerName = dockerize_name('registry_r' . $swarmData->registriesRev . '_' . $registry->name);

diff --git a/app/Models/Deployment.php b/app/Models/Deployment.php
@@ -133,7 +133,7 @@ public function asNodeTasks(): array
                                                             ],
                                                         ],
                                                     ],
-                                                    'transport' => $this->getTransportOptions($caddy),
+                                                    'transport' => $this->getTransportOptions($caddy, $process),
                                                     'upstreams' => [
                                                         [
                                                             'dial' => "{$process->name}.{$deployment->data->internalDomain}:{$caddy->targetPort}",
@@ -192,7 +192,7 @@ public function asNodeTasks(): array
         ];
     }
 
-    protected function getTransportOptions(Caddy $caddy): array
+    protected function getTransportOptions(Caddy $caddy, Process $process): array
     {
         if ($caddy->targetProtocol === 'http') {
             return [
@@ -203,8 +203,8 @@ protected function getTransportOptions(Caddy $caddy): array
         if ($caddy->targetProtocol === 'fastcgi') {
             return [
                 'protocol' => 'fastcgi',
-                'root' => $caddy->fastCgi->root,
-                'env' => collect($caddy->fastcgiVars)->reduce(fn ($carry, EnvVar $var) => [...$carry, $var->name => $var->value], []),
+                'root' => $process->fastCgi->root,
+                'env' => (object) collect($process->fastCgi->env)->reduce(fn ($carry, EnvVar $var) => [...$carry, $var->name => $var->value], []),
             ];
         }
 

diff --git a/resources/js/Pages/Services/Index.vue b/resources/js/Pages/Services/Index.vue
@@ -58,7 +58,7 @@ const props = defineProps({
               >
                 <span v-if="service.latest_deployment.data.processes[0].caddy[0].publishedPort === 80">http://</span>
                 <span v-else-if="service.latest_deployment.data.processes[0].caddy[0].publishedPort === 443">https://</span>
-                <span class="text-black">{{ service.latest_deployment.processes[0].data.caddy[0].domain }}</span>
+                <span class="text-black">{{ service.latest_deployment.data.processes[0].caddy[0].domain }}</span>
                 <span>{{ service.latest_deployment.data.processes[0].caddy[0].path }}</span>
               </span>
               <span v-if="service.latest_deployment.data.processes[0].caddy.length > 1"

diff --git a/resources/js/Pages/Services/Partials/DeploymentData.vue b/resources/js/Pages/Services/Partials/DeploymentData.vue
@@ -130,12 +130,14 @@ const hasFastCgiHandlers = computed(() => {
   return model.value.processes[state.selectedProcessIndex['caddy']].caddy.some((caddy) => caddy.targetProtocol === 'fastcgi')
 })
 
+const defaultFastCgi = {
+  root: '',
+  env: [],
+};
+
 effect(() => {
   model.value.processes[state.selectedProcessIndex['caddy']].fastCgi = hasFastCgiHandlers.value
-      ? {
-        root: '',
-        env: [],
-      }
+      ? (model.value.processes[state.selectedProcessIndex['caddy']].fastCgi || defaultFastCgi)
       : null;
 });