diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 3c9c7f50a2..fd8bb2086b 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -5,6 +5,21 @@ x-logging: &x-logging
max-file: 5
max-size: 10m
+x-env-storage: &x-env-storage |-
+ _APP_STORAGE_DEVICE
+ _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_STORAGE_BACKBLAZE_ACCESS_KEY
+ _APP_STORAGE_BACKBLAZE_SECRET
+ _APP_STORAGE_BACKBLAZE_REGION
+ _APP_STORAGE_BACKBLAZE_BUCKET
+
getParam('httpPort', '');
@@ -110,19 +125,7 @@ services:
- _APP_STORAGE_ANTIVIRUS
- _APP_STORAGE_ANTIVIRUS_HOST
- _APP_STORAGE_ANTIVIRUS_PORT
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- _APP_FUNCTIONS_SIZE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_BUILD_TIMEOUT
@@ -261,19 +264,7 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_EXECUTOR_SECRET
@@ -429,19 +420,7 @@ services:
- OPEN_RUNTIMES_NETWORK
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- DOCKERHUB_PULL_USERNAME
- DOCKERHUB_PULL_PASSWORD
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b1aa0c00d..377adb8402 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,21 @@ x-logging: &x-logging
max-file: '5'
max-size: '10m'
+x-env-storage: &x-env-storage |-
+ _APP_STORAGE_DEVICE
+ _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_STORAGE_BACKBLAZE_ACCESS_KEY
+ _APP_STORAGE_BACKBLAZE_SECRET
+ _APP_STORAGE_BACKBLAZE_REGION
+ _APP_STORAGE_BACKBLAZE_BUCKET
+
version: '3'
services:
@@ -132,19 +147,7 @@ services:
- _APP_STORAGE_ANTIVIRUS
- _APP_STORAGE_ANTIVIRUS_HOST
- _APP_STORAGE_ANTIVIRUS_PORT
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- _APP_FUNCTIONS_SIZE_LIMIT
- _APP_FUNCTIONS_TIMEOUT
- _APP_FUNCTIONS_BUILD_TIMEOUT
@@ -299,19 +302,7 @@ services:
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_EXECUTOR_SECRET
@@ -487,19 +478,7 @@ services:
- OPEN_RUNTIMES_NETWORK
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- - _APP_STORAGE_DEVICE
- - _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_STORAGE_BACKBLAZE_ACCESS_KEY
- - _APP_STORAGE_BACKBLAZE_SECRET
- - _APP_STORAGE_BACKBLAZE_REGION
- - _APP_STORAGE_BACKBLAZE_BUCKET
+ - *x-env-storage
- DOCKERHUB_PULL_USERNAME
- DOCKERHUB_PULL_PASSWORD