From 2edd4b592616f487749ce53d0575e9c61c18e24a Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 22 Feb 2022 12:33:35 +0000 Subject: [PATCH] fix storage environment vars --- Dockerfile | 16 ++++++++-------- app/executor.php | 16 ++++++++-------- app/init.php | 16 ++++++++-------- docker-compose.yml | 32 ++++++++++++++++---------------- src/Appwrite/Resque/Worker.php | 16 ++++++++-------- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a29dc27b8..012c252188 100755 --- a/Dockerfile +++ b/Dockerfile @@ -153,14 +153,14 @@ ENV _APP_SERVER=swoole \ _APP_STORAGE_ANTIVIRUS_HOST=clamav \ _APP_STORAGE_ANTIVIRUS_PORT=3310 \ _APP_STORAGE_DEVICE=Local \ - _APP_STORAGE_DEVICE_S3_ACCESS_KEY= \ - _APP_STORAGE_DEVICE_S3_SECRET= \ - _APP_STORAGE_DEVICE_S3_REGION= \ - _APP_STORAGE_DEVICE_S3_BUCKET= \ - _APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY= \ - _APP_STORAGE_DEVICE_DO_SPACES_SECRET= \ - _APP_STORAGE_DEVICE_DO_SPACES_REGION= \ - _APP_STORAGE_DEVICE_DO_SPACES_BUCKET= \ + _APP_STORAGE_S3_ACCESS_KEY= \ + _APP_STORAGE_S3_SECRET= \ + _APP_STORAGE_S3_REGION= \ + _APP_STORAGE_S3_BUCKET= \ + _APP_STORAGE_DO_SPACES_ACCESS_KEY= \ + _APP_STORAGE_DO_SPACES_SECRET= \ + _APP_STORAGE_DO_SPACES_REGION= \ + _APP_STORAGE_DO_SPACES_BUCKET= \ _APP_REDIS_HOST=redis \ _APP_REDIS_PORT=6379 \ _APP_DB_HOST=mariadb \ diff --git a/app/executor.php b/app/executor.php index bc58783ce5..d92d60a7d1 100644 --- a/app/executor.php +++ b/app/executor.php @@ -116,17 +116,17 @@ function getStorageDevice($root): Device { case Storage::DEVICE_LOCAL:default: return new Local($root); case Storage::DEVICE_S3: - $s3AccessKey = App::getEnv('_APP_STORAGE_DEVICE_S3_ACCESS_KEY', ''); - $s3SecretKey = App::getEnv('_APP_STORAGE_DEVICE_S3_SECRET', ''); - $s3Region = App::getEnv('_APP_STORAGE_DEVICE_S3_REGION', ''); - $s3Bucket = App::getEnv('_APP_STORAGE_DEVICE_S3_BUCKET', ''); + $s3AccessKey = App::getEnv('_APP_STORAGE_S3_ACCESS_KEY', ''); + $s3SecretKey = App::getEnv('_APP_STORAGE_S3_SECRET', ''); + $s3Region = App::getEnv('_APP_STORAGE_S3_REGION', ''); + $s3Bucket = App::getEnv('_APP_STORAGE_S3_BUCKET', ''); $s3Acl = 'private'; return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl); case Storage::DEVICE_DO_SPACES: - $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY', ''); - $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_SECRET', ''); - $doSpacesRegion = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_REGION', ''); - $doSpacesBucket = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_BUCKET', ''); + $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', ''); + $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DO_SPACES_SECRET', ''); + $doSpacesRegion = App::getEnv('_APP_STORAGE_DO_SPACES_REGION', ''); + $doSpacesBucket = App::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', ''); $doSpacesAcl = 'private'; return new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl); } diff --git a/app/init.php b/app/init.php index 99a78e6496..885f7c4834 100644 --- a/app/init.php +++ b/app/init.php @@ -823,17 +823,17 @@ function getDevice($root): Device { case Storage::DEVICE_LOCAL:default: return new Local($root); case Storage::DEVICE_S3: - $s3AccessKey = App::getEnv('_APP_STORAGE_DEVICE_S3_ACCESS_KEY', ''); - $s3SecretKey = App::getEnv('_APP_STORAGE_DEVICE_S3_SECRET', ''); - $s3Region = App::getEnv('_APP_STORAGE_DEVICE_S3_REGION', ''); - $s3Bucket = App::getEnv('_APP_STORAGE_DEVICE_S3_BUCKET', ''); + $s3AccessKey = App::getEnv('_APP_STORAGE_S3_ACCESS_KEY', ''); + $s3SecretKey = App::getEnv('_APP_STORAGE_S3_SECRET', ''); + $s3Region = App::getEnv('_APP_STORAGE_S3_REGION', ''); + $s3Bucket = App::getEnv('_APP_STORAGE_S3_BUCKET', ''); $s3Acl = 'private'; return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl); case Storage::DEVICE_DO_SPACES: - $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY', ''); - $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_SECRET', ''); - $doSpacesRegion = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_REGION', ''); - $doSpacesBucket = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_BUCKET', ''); + $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', ''); + $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DO_SPACES_SECRET', ''); + $doSpacesRegion = App::getEnv('_APP_STORAGE_DO_SPACES_REGION', ''); + $doSpacesBucket = App::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', ''); $doSpacesAcl = 'private'; return new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl); } diff --git a/docker-compose.yml b/docker-compose.yml index 569112e921..4da0fc1f5b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,14 +112,14 @@ services: - _APP_STORAGE_ANTIVIRUS_HOST - _APP_STORAGE_ANTIVIRUS_PORT - _APP_STORAGE_DEVICE - - _APP_STORAGE_DEVICE_S3_ACCESS_KEY - - _APP_STORAGE_DEVICE_S3_SECRET - - _APP_STORAGE_DEVICE_S3_REGION - - _APP_STORAGE_DEVICE_S3_BUCKET - - _APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY - - _APP_STORAGE_DEVICE_DO_SPACES_SECRET - - _APP_STORAGE_DEVICE_DO_SPACES_REGION - - _APP_STORAGE_DEVICE_DO_SPACES_BUCKET + - _APP_STORAGE_S3_ACCESS_KEY + - _APP_STORAGE_S3_SECRET + - _APP_STORAGE_S3_REGION + - _APP_STORAGE_S3_BUCKET + - _APP_STORAGE_DO_SPACES_ACCESS_KEY + - _APP_STORAGE_DO_SPACES_SECRET + - _APP_STORAGE_DO_SPACES_REGION + - _APP_STORAGE_DO_SPACES_BUCKET - _APP_SMTP_HOST - _APP_SMTP_PORT - _APP_SMTP_SECURE @@ -267,14 +267,14 @@ services: - _APP_DB_USER - _APP_DB_PASS - _APP_STORAGE_DEVICE - - _APP_STORAGE_DEVICE_S3_ACCESS_KEY - - _APP_STORAGE_DEVICE_S3_SECRET - - _APP_STORAGE_DEVICE_S3_REGION - - _APP_STORAGE_DEVICE_S3_BUCKET - - _APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY - - _APP_STORAGE_DEVICE_DO_SPACES_SECRET - - _APP_STORAGE_DEVICE_DO_SPACES_REGION - - _APP_STORAGE_DEVICE_DO_SPACES_BUCKET + - _APP_STORAGE_S3_ACCESS_KEY + - _APP_STORAGE_S3_SECRET + - _APP_STORAGE_S3_REGION + - _APP_STORAGE_S3_BUCKET + - _APP_STORAGE_DO_SPACES_ACCESS_KEY + - _APP_STORAGE_DO_SPACES_SECRET + - _APP_STORAGE_DO_SPACES_REGION + - _APP_STORAGE_DO_SPACES_BUCKET - _APP_LOGGING_PROVIDER - _APP_LOGGING_CONFIG diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php index e48d6cfb2f..506d241f05 100644 --- a/src/Appwrite/Resque/Worker.php +++ b/src/Appwrite/Resque/Worker.php @@ -265,17 +265,17 @@ abstract class Worker case Storage::DEVICE_LOCAL:default: return new Local($root); case Storage::DEVICE_S3: - $s3AccessKey = App::getEnv('_APP_STORAGE_DEVICE_S3_ACCESS_KEY', ''); - $s3SecretKey = App::getEnv('_APP_STORAGE_DEVICE_S3_SECRET', ''); - $s3Region = App::getEnv('_APP_STORAGE_DEVICE_S3_REGION', ''); - $s3Bucket = App::getEnv('_APP_STORAGE_DEVICE_S3_BUCKET', ''); + $s3AccessKey = App::getEnv('_APP_STORAGE_S3_ACCESS_KEY', ''); + $s3SecretKey = App::getEnv('_APP_STORAGE_S3_SECRET', ''); + $s3Region = App::getEnv('_APP_STORAGE_S3_REGION', ''); + $s3Bucket = App::getEnv('_APP_STORAGE_S3_BUCKET', ''); $s3Acl = 'private'; return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl); case Storage::DEVICE_DO_SPACES: - $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_ACCESS_KEY', ''); - $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_SECRET', ''); - $doSpacesRegion = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_REGION', ''); - $doSpacesBucket = App::getEnv('_APP_STORAGE_DEVICE_DO_SPACES_BUCKET', ''); + $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', ''); + $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DO_SPACES_SECRET', ''); + $doSpacesRegion = App::getEnv('_APP_STORAGE_DO_SPACES_REGION', ''); + $doSpacesBucket = App::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', ''); $doSpacesAcl = 'private'; return new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl); }