nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-02-27 15:25:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

rename environmentVariables to environment

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2022-12-25 00:48:24 +01:00
parent 4a69d53a67
commit b13cb77ce2
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manual-install/update-yaml.sh
View file

@ -19,7 +19,6 @@ cd manual-install || exit
sed -i "s|'||g" containers.yml sed -i "s|'||g" containers.yml
sed -i 's|production:|services:|' containers.yml sed -i 's|production:|services:|' containers.yml
sed -i 's|restartPolicy:|restart:|' containers.yml sed -i 's|restartPolicy:|restart:|' containers.yml
sed -i 's|environmentVariables:|environment:|' containers.yml
sed -i '/displayName:/d' containers.yml sed -i '/displayName:/d' containers.yml
sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml
sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml

2
php/containers-schema.json
View file

@ -23,7 +23,7 @@
"displayName": { "displayName": {
"type": "string" "type": "string"
}, },
"environmentVariables": { "environment": {
"type": "array", "type": "array",
"items": { "items": {
"type": "string" "type": "string"

26
php/containers.json
View file

@ -17,7 +17,7 @@
"%APACHE_PORT%" "%APACHE_PORT%"
], ],
"secrets": [], "secrets": [],
"environmentVariables": [ "environment": [
"NC_DOMAIN=%NC_DOMAIN%", "NC_DOMAIN=%NC_DOMAIN%",
"NEXTCLOUD_HOST=nextcloud-aio-nextcloud", "NEXTCLOUD_HOST=nextcloud-aio-nextcloud",
"COLLABORA_HOST=nextcloud-aio-collabora", "COLLABORA_HOST=nextcloud-aio-collabora",
@ -67,7 +67,7 @@
"writeable": true "writeable": true
} }
], ],
"environmentVariables": [ "environment": [
"POSTGRES_PASSWORD=%DATABASE_PASSWORD%", "POSTGRES_PASSWORD=%DATABASE_PASSWORD%",
"POSTGRES_DB=nextcloud_database", "POSTGRES_DB=nextcloud_database",
"POSTGRES_USER=nextcloud", "POSTGRES_USER=nextcloud",
@ -121,7 +121,7 @@
"writeable": false "writeable": false
} }
], ],
"environmentVariables": [ "environment": [
"POSTGRES_HOST=nextcloud-aio-database", "POSTGRES_HOST=nextcloud-aio-database",
"POSTGRES_PASSWORD=%DATABASE_PASSWORD%", "POSTGRES_PASSWORD=%DATABASE_PASSWORD%",
"POSTGRES_DB=nextcloud_database", "POSTGRES_DB=nextcloud_database",
@ -174,7 +174,7 @@
"internalPorts": [ "internalPorts": [
"6379" "6379"
], ],
"environmentVariables": [ "environment": [
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%", "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
"TZ=%TIMEZONE%" "TZ=%TIMEZONE%"
], ],
@ -201,7 +201,7 @@
"internalPorts": [ "internalPorts": [
"9980" "9980"
], ],
"environmentVariables": [ "environment": [
"aliasgroup1=https://%NC_DOMAIN%:443", "aliasgroup1=https://%NC_DOMAIN%:443",
"extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY%", "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY%",
"dictionaries=%COLLABORA_DICTIONARIES%", "dictionaries=%COLLABORA_DICTIONARIES%",
@ -230,7 +230,7 @@
"internalPorts": [ "internalPorts": [
"%TALK_PORT%" "%TALK_PORT%"
], ],
"environmentVariables": [ "environment": [
"NC_DOMAIN=%NC_DOMAIN%", "NC_DOMAIN=%NC_DOMAIN%",
"TURN_SECRET=%TURN_SECRET%", "TURN_SECRET=%TURN_SECRET%",
"SIGNALING_SECRET=%SIGNALING_SECRET%", "SIGNALING_SECRET=%SIGNALING_SECRET%",
@ -254,7 +254,7 @@
"image": "nextcloud/aio-borgbackup", "image": "nextcloud/aio-borgbackup",
"ports": [], "ports": [],
"internalPorts": [], "internalPorts": [],
"environmentVariables": [ "environment": [
"BORG_PASSWORD=%BORGBACKUP_PASSWORD%", "BORG_PASSWORD=%BORGBACKUP_PASSWORD%",
"BORG_MODE=%BORGBACKUP_MODE%", "BORG_MODE=%BORGBACKUP_MODE%",
"SELECTED_RESTORE_TIME=%SELECTED_RESTORE_TIME%", "SELECTED_RESTORE_TIME=%SELECTED_RESTORE_TIME%",
@ -327,7 +327,7 @@
"image": "nextcloud/aio-watchtower", "image": "nextcloud/aio-watchtower",
"ports": [], "ports": [],
"internalPorts": [], "internalPorts": [],
"environmentVariables": [ "environment": [
"CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer" "CONTAINER_TO_UPDATE=nextcloud-aio-mastercontainer"
], ],
"volumes": [ "volumes": [
@ -350,7 +350,7 @@
"%APACHE_PORT%/tcp" "%APACHE_PORT%/tcp"
], ],
"internalPorts": [], "internalPorts": [],
"environmentVariables": [ "environment": [
"INSTANCE_ID=%INSTANCE_ID%", "INSTANCE_ID=%INSTANCE_ID%",
"APACHE_PORT=%APACHE_PORT%" "APACHE_PORT=%APACHE_PORT%"
], ],
@ -370,7 +370,7 @@
"internalPorts": [ "internalPorts": [
"3310" "3310"
], ],
"environmentVariables": [ "environment": [
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"CLAMD_STARTUP_TIMEOUT=90" "CLAMD_STARTUP_TIMEOUT=90"
], ],
@ -394,7 +394,7 @@
"internalPorts": [ "internalPorts": [
"80" "80"
], ],
"environmentVariables": [ "environment": [
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"JWT_ENABLED=true", "JWT_ENABLED=true",
"JWT_HEADER=AuthorizationJwt", "JWT_HEADER=AuthorizationJwt",
@ -422,7 +422,7 @@
"internalPorts": [ "internalPorts": [
"9000" "9000"
], ],
"environmentVariables": [ "environment": [
"TZ=%TIMEZONE%" "TZ=%TIMEZONE%"
], ],
"volumes": [], "volumes": [],
@ -439,7 +439,7 @@
"internalPorts": [ "internalPorts": [
"9200" "9200"
], ],
"environmentVariables": [ "environment": [
"TZ=%TIMEZONE%", "TZ=%TIMEZONE%",
"discovery.type=single-node", "discovery.type=single-node",
"ES_JAVA_OPTS=-Xms1024M -Xmx1024M" "ES_JAVA_OPTS=-Xms1024M -Xmx1024M"

2
php/src/ContainerDefinitionFetcher.php
View file

@ -172,7 +172,7 @@ class ContainerDefinitionFetcher
} }
$variables = new ContainerEnvironmentVariables(); $variables = new ContainerEnvironmentVariables();
foreach ($entry['environmentVariables'] as $value) { foreach ($entry['environment'] as $value) {
$variables->AddVariable($value); $variables->AddVariable($value);
} }