Skip to content

Commit a10c846

Browse files
committed
feat: #30 enable pdo_pgsql ext
1 parent ca5065d commit a10c846

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

Diff for: Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM bitnami/php-fpm:latest
22

3+
RUN echo "extension=pdo_pgsql.so" >> /opt/bitnami/php/etc/php.ini
4+
35
RUN install_packages nodejs npm \
46
&& apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
57

Diff for: app/Http/Controllers/SwarmController.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ public function updateDockerRegistries(Swarm $swarm, Request $request)
8888
$tasks = [];
8989

9090
foreach ($swarmData->registries as $registry) {
91-
$previous = $swarm->data->findRegistry($registry->dockerName);
92-
if ($registry->sameAs($previous)) {
93-
$registry->dockerName = $previous->dockerName;
91+
$previous = $registry->dockerName ? $swarm->data->findRegistry($registry->dockerName) : null;
92+
if ($previous) {
93+
if ($registry->sameAs($previous)) {
94+
$registry->dockerName = $previous->dockerName;
9495

95-
continue;
96+
continue;
97+
}
9698
}
9799

98100
$registry->dockerName = dockerize_name('registry_r' . $swarmData->registriesRev . '_' . $registry->name);

Diff for: app/Models/Deployment.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function asNodeTasks(): array
133133
],
134134
],
135135
],
136-
'transport' => $this->getTransportOptions($caddy),
136+
'transport' => $this->getTransportOptions($caddy, $process),
137137
'upstreams' => [
138138
[
139139
'dial' => "{$process->name}.{$deployment->data->internalDomain}:{$caddy->targetPort}",
@@ -192,7 +192,7 @@ public function asNodeTasks(): array
192192
];
193193
}
194194

195-
protected function getTransportOptions(Caddy $caddy): array
195+
protected function getTransportOptions(Caddy $caddy, Process $process): array
196196
{
197197
if ($caddy->targetProtocol === 'http') {
198198
return [
@@ -203,8 +203,8 @@ protected function getTransportOptions(Caddy $caddy): array
203203
if ($caddy->targetProtocol === 'fastcgi') {
204204
return [
205205
'protocol' => 'fastcgi',
206-
'root' => $caddy->fastCgi->root,
207-
'env' => collect($caddy->fastcgiVars)->reduce(fn ($carry, EnvVar $var) => [...$carry, $var->name => $var->value], []),
206+
'root' => $process->fastCgi->root,
207+
'env' => (object) collect($process->fastCgi->env)->reduce(fn ($carry, EnvVar $var) => [...$carry, $var->name => $var->value], []),
208208
];
209209
}
210210

Diff for: resources/js/Pages/Services/Index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const props = defineProps({
5858
>
5959
<span v-if="service.latest_deployment.data.processes[0].caddy[0].publishedPort === 80">http://</span>
6060
<span v-else-if="service.latest_deployment.data.processes[0].caddy[0].publishedPort === 443">https://</span>
61-
<span class="text-black">{{ service.latest_deployment.processes[0].data.caddy[0].domain }}</span>
61+
<span class="text-black">{{ service.latest_deployment.data.processes[0].caddy[0].domain }}</span>
6262
<span>{{ service.latest_deployment.data.processes[0].caddy[0].path }}</span>
6363
</span>
6464
<span v-if="service.latest_deployment.data.processes[0].caddy.length > 1"

Diff for: resources/js/Pages/Services/Partials/DeploymentData.vue

+6-4
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,14 @@ const hasFastCgiHandlers = computed(() => {
130130
return model.value.processes[state.selectedProcessIndex['caddy']].caddy.some((caddy) => caddy.targetProtocol === 'fastcgi')
131131
})
132132
133+
const defaultFastCgi = {
134+
root: '',
135+
env: [],
136+
};
137+
133138
effect(() => {
134139
model.value.processes[state.selectedProcessIndex['caddy']].fastCgi = hasFastCgiHandlers.value
135-
? {
136-
root: '',
137-
env: [],
138-
}
140+
? (model.value.processes[state.selectedProcessIndex['caddy']].fastCgi || defaultFastCgi)
139141
: null;
140142
});
141143

0 commit comments

Comments
 (0)