From 1e78d729c4487d428bf553e0cd9c77b59db3c3d6 Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Sun, 25 Dec 2022 00:52:01 +0100
Subject: [PATCH] rename restartPolicy to restart

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 manual-install/update-yaml.sh          |  1 -
 php/containers-schema.json             |  2 +-
 php/containers.json                    | 26 +++++++++++++-------------
 php/src/ContainerDefinitionFetcher.php |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/manual-install/update-yaml.sh b/manual-install/update-yaml.sh
index 66586964..4589ce23 100644
--- a/manual-install/update-yaml.sh
+++ b/manual-install/update-yaml.sh
@@ -18,7 +18,6 @@ echo "$OUTPUT" | yq -P > ./manual-install/containers.yml
 cd manual-install || exit
 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 '/stop_grace_period:/s/$/s/' containers.yml
 sed -i '/: \[\]/d' containers.yml
diff --git a/php/containers-schema.json b/php/containers-schema.json
index 43b5dd40..34e5f817 100644
--- a/php/containers-schema.json
+++ b/php/containers-schema.json
@@ -47,7 +47,7 @@
 							"type": "string"
 						}
 					},
-					"restartPolicy": {
+					"restart": {
 						"type": "string"
 					},
 					"secrets": {
diff --git a/php/containers.json b/php/containers.json
index 31b51adc..a2cfa57b 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -41,7 +41,7 @@
         }
       ],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-database",
@@ -75,7 +75,7 @@
         "PGTZ=%TIMEZONE%"
       ],
       "stop_grace_period": 1800,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-nextcloud",
@@ -163,7 +163,7 @@
         "ADDITIONAL_PHP_EXTENSIONS=%NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS%"
       ],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-redis",
@@ -190,7 +190,7 @@
         "ONLYOFFICE_SECRET"
       ],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-collabora",
@@ -216,7 +216,7 @@
       ],
       "secrets": [],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-talk",
@@ -245,7 +245,7 @@
         "JANUS_API_KEY"
       ],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-borgbackup",
@@ -318,7 +318,7 @@
         "BORGBACKUP_PASSWORD"
       ],
       "stop_grace_period": 10,
-      "restartPolicy": ""
+      "restart": ""
     },
     {
       "container_name": "nextcloud-aio-watchtower",
@@ -339,7 +339,7 @@
       ],
       "secrets": [],
       "stop_grace_period": 10,
-      "restartPolicy": ""
+      "restart": ""
     },
     {
       "depends_on": [],
@@ -359,7 +359,7 @@
         "INSTANCE_ID"
       ],
       "stop_grace_period": 1,
-      "restartPolicy": ""
+      "restart": ""
     },
     {
       "container_name": "nextcloud-aio-clamav",
@@ -383,7 +383,7 @@
       ],
       "secrets": [],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-onlyoffice",
@@ -411,7 +411,7 @@
         "ONLYOFFICE_SECRET"
       ],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-imaginary",
@@ -428,7 +428,7 @@
       "volumes": [],
       "secrets": [],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     },
     {
       "container_name": "nextcloud-aio-fulltextsearch",
@@ -453,7 +453,7 @@
       ],
       "secrets": [],
       "stop_grace_period": 10,
-      "restartPolicy": "unless-stopped"
+      "restart": "unless-stopped"
     }
   ]
 }
diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php
index a144f641..60088f42 100644
--- a/php/src/ContainerDefinitionFetcher.php
+++ b/php/src/ContainerDefinitionFetcher.php
@@ -180,7 +180,7 @@ class ContainerDefinitionFetcher
                 $entry['container_name'],
                 $entry['displayName'],
                 $entry['image'],
-                $entry['restartPolicy'],
+                $entry['restart'],
                 $entry['stop_grace_period'],
                 $ports,
                 $internalPorts,