From 568935399465c3f25f6abd09b8beeb6259cc8e22 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Mon, 21 Feb 2022 15:08:58 +0400 Subject: [PATCH] fix: review comments --- app/executor.php | 4 ++-- docker-compose.yml | 6 ------ src/Executor/Executor.php | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/executor.php b/app/executor.php index 67ecf60269..8c810a5d60 100644 --- a/app/executor.php +++ b/app/executor.php @@ -203,7 +203,7 @@ App::post('/v1/runtimes') '-f', '/dev/null' ]; - + $containerId = $orchestration->run( image: $baseImage, name: $runtimeId, @@ -548,7 +548,7 @@ App::error(function ($utopia, $error, $request, $response) { 'file' => $error->getFile(), 'line' => $error->getLine(), 'trace' => $error->getTrace(), - 'version' => App::getEnv('OPENRUNTIMES_VERSION', 'UNKNOWN'), + 'version' => App::getEnv('_APP_VERSION', 'UNKNOWN') ]; $response diff --git a/docker-compose.yml b/docker-compose.yml index 54a586264d..e7f6b85560 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -393,7 +393,6 @@ services: - VERSION=dev networks: appwrite: - runtimes: ports: - 9519:80 volumes: @@ -497,10 +496,6 @@ services: - _APP_INFLUXDB_HOST - _APP_INFLUXDB_PORT - _APP_USAGE_SYNC_INTERVAL - - _APP_REDIS_HOST - - _APP_REDIS_PORT - - _APP_REDIS_USER - - _APP_REDIS_PASS appwrite-schedule: entrypoint: schedule @@ -677,7 +672,6 @@ services: networks: gateway: appwrite: - runtimes: volumes: appwrite-mariadb: diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php index d8da13e902..7afce8df8d 100644 --- a/src/Executor/Executor.php +++ b/src/Executor/Executor.php @@ -59,7 +59,7 @@ class Executor 'baseImage' => $baseImage, 'entrypoint' => $entrypoint, 'workdir' => $workdir, - 'network' => empty($network) ? App::getEnv('_APP_EXECUTOR_RUNTIME_NETWORK', 'openruntimes') : $network, + 'network' => empty($network) ? App::getEnv('_APP_EXECUTOR_RUNTIME_NETWORK', 'appwrite_runtimes') : $network, 'vars' => $vars, 'remove' => $remove, 'commands' => $commands