diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh index 1a9cdc71..66586964 100644 --- a/manual-install/update-yaml.sh +++ b/manual-install/update-yaml.sh @@ -20,7 +20,6 @@ sed -i "s|'||g" containers.yml sed -i 's|production:|services:|' containers.yml sed -i 's|restartPolicy:|restart:|' containers.yml sed -i '/displayName:/d' containers.yml -sed -i 's|maxShutdownTime:|stop_grace_period:|' containers.yml sed -i '/stop_grace_period:/s/$/s/' containers.yml sed -i '/: \[\]/d' containers.yml sed -i 's|- name: |- |' containers.yml diff --git a/php/containers-schema.json b/php/containers-schema.json index 4d252186..43b5dd40 100644 --- a/php/containers-schema.json +++ b/php/containers-schema.json @@ -38,7 +38,7 @@ "type": "string" } }, - "maxShutdownTime": { + "stop_grace_period": { "type": "integer" }, "ports": { diff --git a/php/containers.json b/php/containers.json index aebac146..31b51adc 100644 --- a/php/containers.json +++ b/php/containers.json @@ -40,7 +40,7 @@ "writeable": true } ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -74,7 +74,7 @@ "TZ=%TIMEZONE%", "PGTZ=%TIMEZONE%" ], - "maxShutdownTime": 1800, + "stop_grace_period": 1800, "restartPolicy": "unless-stopped" }, { @@ -162,7 +162,7 @@ "ADDITIONAL_APKS=%NEXTCLOUD_ADDITIONAL_APKS%", "ADDITIONAL_PHP_EXTENSIONS=%NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS%" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -189,7 +189,7 @@ "REDIS_PASSWORD", "ONLYOFFICE_SECRET" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -215,7 +215,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -244,7 +244,7 @@ "SIGNALING_SECRET", "JANUS_API_KEY" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -317,7 +317,7 @@ "secrets": [ "BORGBACKUP_PASSWORD" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "" }, { @@ -338,7 +338,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "" }, { @@ -358,7 +358,7 @@ "secrets": [ "INSTANCE_ID" ], - "maxShutdownTime": 1, + "stop_grace_period": 1, "restartPolicy": "" }, { @@ -382,7 +382,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -410,7 +410,7 @@ "secrets": [ "ONLYOFFICE_SECRET" ], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -427,7 +427,7 @@ ], "volumes": [], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" }, { @@ -452,7 +452,7 @@ } ], "secrets": [], - "maxShutdownTime": 10, + "stop_grace_period": 10, "restartPolicy": "unless-stopped" } ] diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index d4244566..a144f641 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -181,7 +181,7 @@ class ContainerDefinitionFetcher $entry['displayName'], $entry['image'], $entry['restartPolicy'], - $entry['maxShutdownTime'], + $entry['stop_grace_period'], $ports, $internalPorts, $volumes,