Allow single multiarch image (manifest) in build_from (#105)

frenck · Aug 17, 2022 · 840a606 · 840a606
1 parent 9da4570
commit 840a606
Showing 1 changed file with 35 additions and 27 deletions.
diff --git a/src/build.schema.json b/src/build.schema.json
@@ -8,36 +8,44 @@
       "type": "object"
     },
     "build_from": {
-      "additionalProperties": false,
       "default": {},
-      "properties": {
-        "aarch64": {
-          "default": "homeassistant/aarch64-base:latest",
-          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
-          "type": "string"
-        },
-        "amd64": {
-          "default": "homeassistant/amd64-base:latest",
-          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
-          "type": "string"
-        },
-        "armhf": {
-          "default": "homeassistant/armhf-base:latest",
-          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
-          "type": "string"
+      "anyOf": [
+        {
+          "additionalProperties": false,
+          "properties": {
+            "aarch64": {
+              "default": "homeassistant/aarch64-base:latest",
+              "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
+              "type": "string"
+            },
+            "amd64": {
+              "default": "homeassistant/amd64-base:latest",
+              "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
+              "type": "string"
+            },
+            "armhf": {
+              "default": "homeassistant/armhf-base:latest",
+              "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
+              "type": "string"
+            },
+            "armv7": {
+              "default": "homeassistant/armv7-base:latest",
+              "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
+              "type": "string"
+            },
+            "i386": {
+              "default": "homeassistant/i386-base:latest",
+              "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
+              "type": "string"
+            }
+          },
+          "type": "object"
         },
-        "armv7": {
-          "default": "homeassistant/armv7-base:latest",
-          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
-          "type": "string"
-        },
-        "i386": {
-          "default": "homeassistant/i386-base:latest",
-          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$",
-          "type": "string"
+        {
+          "type": "string",
+          "pattern": "^([a-zA-Z\\-\\.:\\d{}]+/)*?([\\-\\w{}]+)/([\\-\\w{}]+)(:[\\.\\-\\w{}]+)?$"
         }
-      },
-      "type": "object"
+      ]
     },
     "codenotary": {
       "additionalProperties": false,