Skip to content

Commit 393df11

Browse files
andrasbacsaiandrasbacsai
authored
Merge pull request #7106 from coollabsio/next
v4.0.0-beta.441
2 parents 9cbc246 + 2db122c commit 393df11

File tree

18 files changed

+89
-99
lines changed

18 files changed

+89
-99
lines changed

‎app/Actions/Database/StartClickhouse.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function handle(StandaloneClickhouse $database)
105105
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
106106
$this->commands[] = "echo 'Pulling {$database->image} image.'";
107107
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
108-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
108+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
109109
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
110110
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
111111
$this->commands[] = "echo 'Database started.'";

‎app/Actions/Database/StartDragonfly.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function handle(StandaloneDragonfly $database)
192192
if ($this->database->enable_ssl) {
193193
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
194194
}
195-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
195+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
196196
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
197197
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
198198
$this->commands[] = "echo 'Database started.'";

‎app/Actions/Database/StartKeydb.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function handle(StandaloneKeydb $database)
208208
if ($this->database->enable_ssl) {
209209
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
210210
}
211-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
211+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
212212
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
213213
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
214214
$this->commands[] = "echo 'Database started.'";

‎app/Actions/Database/StartMariadb.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function handle(StandaloneMariadb $database)
209209
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
210210
$this->commands[] = "echo 'Pulling {$database->image} image.'";
211211
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
212-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
212+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
213213
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
214214
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
215215
$this->commands[] = "echo 'Database started.'";

‎app/Actions/Database/StartMongodb.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function handle(StandaloneMongodb $database)
260260
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
261261
$this->commands[] = "echo 'Pulling {$database->image} image.'";
262262
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
263-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
263+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
264264
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
265265
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
266266
if ($this->database->enable_ssl) {

‎app/Actions/Database/StartMysql.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function handle(StandaloneMysql $database)
210210
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
211211
$this->commands[] = "echo 'Pulling {$database->image} image.'";
212212
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
213-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
213+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
214214
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
215215
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
216216

‎app/Actions/Database/StartPostgresql.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,14 @@ public function handle(StandalonePostgresql $database)
223223
$this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
224224
$this->commands[] = "echo 'Pulling {$database->image} image.'";
225225
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml pull";
226-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
226+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
227227
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
228228
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
229229
if ($this->database->enable_ssl) {
230230
$this->commands[] = executeInDocker($this->database->uuid, "chown {$this->database->postgres_user}:{$this->database->postgres_user} /var/lib/postgresql/certs/server.key /var/lib/postgresql/certs/server.crt");
231231
}
232232
$this->commands[] = "echo 'Database started.'";
233233

234-
ray($this->commands);
235-
236234
return remote_process($this->commands, $database->destination->server, callEventOnFinish: 'DatabaseStatusChanged');
237235
}
238236

‎app/Actions/Database/StartRedis.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public function handle(StandaloneRedis $database)
205205
if ($this->database->enable_ssl) {
206206
$this->commands[] = "chown -R 999:999 $this->configuration_dir/ssl/server.key $this->configuration_dir/ssl/server.crt";
207207
}
208-
$this->commands[] = "docker stop --timeout=10 $container_name 2>/dev/null || true";
208+
$this->commands[] = "docker stop --time=10 $container_name 2>/dev/null || true";
209209
$this->commands[] = "docker rm -f $container_name 2>/dev/null || true";
210210
$this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
211211
$this->commands[] = "echo 'Database started.'";

‎app/Actions/Database/StopDatabase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private function stopContainer($database, string $containerName, int $timeout =
4949
{
5050
$server = $database->destination->server;
5151
instant_remote_process(command: [
52-
"docker stop --timeout=$timeout $containerName",
52+
"docker stop --time=$timeout $containerName",
5353
"docker rm -f $containerName",
5454
], server: $server, throwError: false);
5555
}

‎app/Livewire/Project/Service/ServiceApplicationView.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ public function syncData(bool $toModel = false): void
157157
$this->description = $this->application->description;
158158
$this->fqdn = $this->application->fqdn;
159159
$this->image = $this->application->image;
160-
$this->excludeFromStatus = $this->application->exclude_from_status;
161-
$this->isLogDrainEnabled = $this->application->is_log_drain_enabled;
162-
$this->isGzipEnabled = $this->application->is_gzip_enabled;
163-
$this->isStripprefixEnabled = $this->application->is_stripprefix_enabled;
160+
$this->excludeFromStatus = data_get($this->application, 'exclude_from_status', false);
161+
$this->isLogDrainEnabled = data_get($this->application, 'is_log_drain_enabled', false);
162+
$this->isGzipEnabled = data_get($this->application, 'is_gzip_enabled', true);
163+
$this->isStripprefixEnabled = data_get($this->application, 'is_stripprefix_enabled', true);
164164
}
165165
}
166166

0 commit comments

Comments
 (0)