make workflow fail also for invalid json file

Signed-off-by: Simon L. <[email protected]>
nextcloud · Jun 27, 2024 · 0ec3bee · 0ec3bee
1 parent 16f3acd
commit 0ec3bee
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/json-validator.yml b/.github/workflows/json-validator.yml
@@ -30,6 +30,6 @@ jobs:
           for file in "${JSON_FILES[@]}"; do
             json validate --schema-file=php/containers-schema.json --document-file="$file" 2>&1 | tee -a ./json-validator.log
           done
-          if grep -q "document does not validate with schema." ./json-validator.log; then
+          if grep -q "document does not validate with schema.\|invalid JSONFile" ./json-validator.log; then
             exit 1
           fi
diff --git a/community-containers/makemkv/makemkv.json b/community-containers/makemkv/makemkv.json
@@ -27,11 +27,23 @@
                     "writeable": false
                 },
                 {
-                    "source": "%NEXTCLOUD_MOUNT%", --> add note that this needs to be configured, else it will discard it.
-                    "destination": "/output", --> add to readme how to configure this in the makemkv gui (so that e.g. a subdir can be used)
+                    "source": "%NEXTCLOUD_MOUNT%",
+                    "destination": "/output",
                     "writeable": true
                 }
             ],
+            "environment": [
+                "TZ=%TIMEZONE%",
+                "SECURE_CONNECTION=1",
+                "WEB_AUTHENTICATION=1",
+                "USER_ID=33",
+                "GROUP_ID=33",
+                "WEB_AUTHENTICATION_USERNAME=makemkv",
+                "WEB_AUTHENTICATION_PASSWORD=%MAKEMKV_PASSWORD%"
+            ],
+            "secrets": [
+                "MAKEMKV_PASSWORD"
+            ],
             "backup_volumes": [
                 "nextcloud_aio_makemkv"
             ],

diff --git a/community-containers/makemkv/readme.md b/community-containers/makemkv/readme.md
@@ -2,8 +2,12 @@
 This container bundles MakeMKV and auto-configures it for you.
 
 ### Notes
-- ⚠️ TODO
-- This container should only be run in home networks as it exposes port 5800 unencrypted
+- This container should only be run in home networks
+- This container requires the [`NEXTCLOUD_MOUNT` variable in AIO to be set](https://github.com/nextcloud/all-in-one?tab=readme-ov-file#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host). Otherwise the output will not be saved correctly.
+- ⚠️ TODO: note down requirements regarding devices and also how to check if they are there...
+- After adding and starting the container, you need to visit `https://internal.ip.of.server:5800` in order to log in with the `makemkv` user and the password that you can retrieve when running `sudo docker inspect nextcloud-aio-makemkv | grep WEB_AUTHENTICATION_PASSWORD`. 
+- After the first login, you can adjust the `/output` directory in the MakeMKV settings to a subdirectory of the root of your chosen `NEXTCLOUD_MOUNT`. (by default `NEXTCLOUD_MOUNT` is mounted to `/output` inside the container. Thus all data is written to the root of it)
+- The config data of MakeMKV will be automatically included in AIOs backup solution!
 - See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
 
 ### Repository