Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Matej Bačo
2024-12-02 13:45:03 +01:00
parent 4a117adb28
commit 2ef1cf5da0
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/general.php
+8 -8
View File
@@ -162,8 +162,8 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
default => null
};
if($resource->getAttribute('adapter', '') === 'static') {
$runtime = $runtimes['static'] ?? null;
if ($resource->getAttribute('adapter', '') === 'static') {
$runtime = $runtimes['static-1'] ?? null;
}
if (\is_null($runtime)) {
@@ -341,24 +341,24 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
'deployment' => ''
};
if($type === 'function') {
if ($type === 'function') {
$runtimeEntrypoint = match ($version) {
'v2' => '',
default => 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $runtime['startCommand'] . '"'
};
} else if($type === 'site' || $type === 'deployment') {
} elseif ($type === 'site' || $type === 'deployment') {
$frameworks = Config::getParam('frameworks', []);
$framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
$startCommand = $runtime['startCommand'];
if(!is_null($framework)) {
if (!is_null($framework)) {
$adapter = ($framework['adapters'] ?? [])[$resource->getAttribute('adapter', '')] ?? null;
if(!is_null($adapter) && isset($adapter['startCommand'])) {
if (!is_null($adapter) && isset($adapter['startCommand'])) {
$startCommand = $adapter['startCommand'];
}
}
$runtimeEntrypoint = 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $startCommand . '"';
}
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+5 -5
View File
@@ -871,21 +871,21 @@ class Builds extends Action
return $deployment->getAttribute('commands', '');
} elseif ($resource->getCollection() === 'sites') {
$commands = [];
$commands[] = $deployment->getAttribute('installCommand', '');
$commands[] = $deployment->getAttribute('buildCommand', '');
$frameworks = Config::getParam('frameworks', []);
$framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
if(!is_null($framework)) {
if (!is_null($framework)) {
$adapter = ($framework['adapters'] ?? [])[$resource->getAttribute('adapter', '')] ?? null;
if(!is_null($adapter) && isset($adapter['bundleCommand'])) {
if (!is_null($adapter) && isset($adapter['bundleCommand'])) {
$commands[] = $adapter['bundleCommand'];
}
}
$commands = array_filter($commands, fn($command) => !empty($command));
$commands = array_filter($commands, fn ($command) => !empty($command));
return implode(' && ', $commands);
}