diff --git a/app/config/frameworks.php b/app/config/frameworks.php index cc9e913523..82fd70bf5b 100644 --- a/app/config/frameworks.php +++ b/app/config/frameworks.php @@ -22,7 +22,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/analog/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/analog/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/analog/env.sh', 'adapters' => [ 'ssr' => [ @@ -30,14 +30,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist/analog', - 'startCommand' => 'sh helpers/analog/server.sh', + 'startCommand' => 'bash helpers/analog/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist/analog/public', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', 'fallbackFile' => 'index.html' ] ] @@ -48,7 +48,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/angular/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/angular/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/angular/env.sh', 'adapters' => [ 'ssr' => [ @@ -56,14 +56,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist/angular', - 'startCommand' => 'sh helpers/angular/server.sh', + 'startCommand' => 'bash helpers/angular/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist/angular/browser', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', 'fallbackFile' => 'index.csr.html' ] ] @@ -74,7 +74,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/next-js/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/next-js/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh', 'adapters' => [ 'ssr' => [ @@ -82,14 +82,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './.next', - 'startCommand' => 'sh helpers/next-js/server.sh', + 'startCommand' => 'bash helpers/next-js/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './out', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ] ] ], @@ -105,7 +105,7 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', 'fallbackFile' => 'index.html' ] ] @@ -116,7 +116,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/nuxt/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/nuxt/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh', 'adapters' => [ 'ssr' => [ @@ -124,14 +124,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './.output', - 'startCommand' => 'sh helpers/nuxt/server.sh', + 'startCommand' => 'bash helpers/nuxt/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run generate', 'installCommand' => 'npm install', 'outputDirectory' => './output/public', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ] ] ], @@ -147,7 +147,7 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', 'fallbackFile' => 'index.html' ] ] @@ -158,7 +158,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/sveltekit/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/sveltekit/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh', 'adapters' => [ 'ssr' => [ @@ -166,14 +166,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './build', - 'startCommand' => 'sh helpers/sveltekit/server.sh', + 'startCommand' => 'bash helpers/sveltekit/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './build', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ] ] ], @@ -183,7 +183,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/astro/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/astro/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/astro/env.sh', 'adapters' => [ 'ssr' => [ @@ -191,14 +191,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist', - 'startCommand' => 'sh helpers/astro/server.sh', + 'startCommand' => 'bash helpers/astro/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ] ] ], @@ -208,7 +208,7 @@ return [ 'screenshotSleep' => 3000, 'buildRuntime' => 'node-22', 'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'), - 'bundleCommand' => 'sh /usr/local/server/helpers/remix/bundle.sh', + 'bundleCommand' => 'bash /usr/local/server/helpers/remix/bundle.sh', 'envCommand' => 'source /usr/local/server/helpers/remix/env.sh', 'adapters' => [ 'ssr' => [ @@ -216,14 +216,14 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './build', - 'startCommand' => 'sh helpers/remix/server.sh', + 'startCommand' => 'bash helpers/remix/server.sh', ], 'static' => [ 'key' => 'static', 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './build/client', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ] ] ], @@ -239,7 +239,7 @@ return [ 'buildCommand' => 'flutter build web', 'installCommand' => '', 'outputDirectory' => './build/web', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ], ], ], @@ -255,7 +255,7 @@ return [ 'buildCommand' => 'npm run build', 'installCommand' => 'npm install', 'outputDirectory' => './dist', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ], ] ], @@ -271,7 +271,7 @@ return [ 'buildCommand' => '', 'installCommand' => '', 'outputDirectory' => './', - 'startCommand' => 'sh helpers/server.sh', + 'startCommand' => 'bash helpers/server.sh', ], ] ], diff --git a/app/config/templates/site.php b/app/config/templates/site.php index 1130d55fcf..736138bdd9 100644 --- a/app/config/templates/site.php +++ b/app/config/templates/site.php @@ -322,7 +322,7 @@ return [ 'frameworks' => [ getFramework('FLUTTER', [ 'providerRootDirectory' => './', - 'buildCommand' => 'sh build.sh', + 'buildCommand' => 'bash build.sh', ]), ], 'vcsProvider' => 'github', @@ -408,7 +408,7 @@ return [ getFramework('ANGULAR', [ 'providerRootDirectory' => './', 'outputDirectory' => './dist/angular-starter-kit-for-appwrite/browser', - 'buildCommand' => 'sh prepare-env.sh && npm run build' + 'buildCommand' => 'bash prepare-env.sh && npm run build' ]), ], 'vcsProvider' => 'github', diff --git a/composer.json b/composer.json index 66b18c7a7b..8650a8b387 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "ext-openssl": "*", "ext-zlib": "*", "ext-sockets": "*", - "appwrite/php-runtimes": "0.18.*", + "appwrite/php-runtimes": "0.19.*", "appwrite/php-clamav": "2.0.*", "utopia-php/abuse": "0.52.*", "utopia-php/analytics": "0.10.*", diff --git a/composer.lock b/composer.lock index aa9598eb05..ee5f16f7c9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eeb306ee6d2576e466ceea5e927664d0", + "content-hash": "e4281c45c1b60dade2ec8df58e6926d5", "packages": [ { "name": "adhocore/jwt", @@ -157,16 +157,16 @@ }, { "name": "appwrite/php-runtimes", - "version": "0.18.1", + "version": "0.19.0", "source": { "type": "git", "url": "https://github.com/appwrite/runtimes.git", - "reference": "97b5d97ae2c0fc9a2a374769eadff024f95783aa" + "reference": "8d21483efc19b9d977e323188989ee67a188464b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/runtimes/zipball/97b5d97ae2c0fc9a2a374769eadff024f95783aa", - "reference": "97b5d97ae2c0fc9a2a374769eadff024f95783aa", + "url": "https://api.github.com/repos/appwrite/runtimes/zipball/8d21483efc19b9d977e323188989ee67a188464b", + "reference": "8d21483efc19b9d977e323188989ee67a188464b", "shasum": "" }, "require": { @@ -206,9 +206,9 @@ ], "support": { "issues": "https://github.com/appwrite/runtimes/issues", - "source": "https://github.com/appwrite/runtimes/tree/0.18.1" + "source": "https://github.com/appwrite/runtimes/tree/0.19.0" }, - "time": "2025-03-11T14:05:46+00:00" + "time": "2025-03-25T22:37:51+00:00" }, { "name": "beberlei/assert", @@ -2372,16 +2372,16 @@ }, { "name": "ramsey/collection", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109" + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109", - "reference": "3c5990b8a5e0b79cd1cf11c2dc1229e58e93f109", + "url": "https://api.github.com/repos/ramsey/collection/zipball/344572933ad0181accbf4ba763e85a0306a8c5e2", + "reference": "344572933ad0181accbf4ba763e85a0306a8c5e2", "shasum": "" }, "require": { @@ -2442,9 +2442,9 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/2.1.0" + "source": "https://github.com/ramsey/collection/tree/2.1.1" }, - "time": "2025-03-02T04:48:29+00:00" + "time": "2025-03-22T05:38:12+00:00" }, { "name": "ramsey/uuid", @@ -5089,16 +5089,16 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "0.40.9", + "version": "0.40.10", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "dbb45a5db22cdc3368fe2573c07ba6088f188fa4" + "reference": "054ac96285caf4f77879087b2416a5ddb8263051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/dbb45a5db22cdc3368fe2573c07ba6088f188fa4", - "reference": "dbb45a5db22cdc3368fe2573c07ba6088f188fa4", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/054ac96285caf4f77879087b2416a5ddb8263051", + "reference": "054ac96285caf4f77879087b2416a5ddb8263051", "shasum": "" }, "require": { @@ -5134,9 +5134,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/0.40.9" + "source": "https://github.com/appwrite/sdk-generator/tree/0.40.10" }, - "time": "2025-03-17T18:39:14+00:00" + "time": "2025-03-25T13:44:16+00:00" }, { "name": "doctrine/annotations", diff --git a/docker-compose.yml b/docker-compose.yml index 2fbd844d01..f501c7fb69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -205,7 +205,7 @@ services: appwrite-console: <<: *x-logging container_name: appwrite-console - image: appwrite/console:5.3.0-sites-rc.28 + image: appwrite/console:5.3.0-sites-rc.30 restart: unless-stopped networks: - appwrite @@ -961,7 +961,7 @@ services: hostname: exc1 <<: *x-logging stop_signal: SIGINT - image: openruntimes/executor:0.7.12 + image: openruntimes/executor:0.7.13 restart: unless-stopped networks: - appwrite diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 40d9ea5dba..c9a94987c9 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -1590,7 +1590,7 @@ class FunctionsCustomServerTest extends Scope $functionId = $this->setupFunction([ 'functionId' => ID::unique(), 'name' => 'Test PHP Scopes executions', - 'commands' => 'sh setup.sh && composer install', + 'commands' => 'bash setup.sh && composer install', 'runtime' => 'php-8.0', 'entrypoint' => 'index.php', 'scopes' => ['users.read'],