Merge pull request #486 from selfhosters/ci-errors

selfhosters · Mar 21, 2024 · 317bc0c · 317bc0c
2 parents 5980ec3 + c17f892
commit 317bc0c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 187 deletions.
diff --git a/.github/scripts/check.py b/.github/scripts/check.py
@@ -7,6 +7,7 @@
 import re
 import os
 import argparse
+from urllib.parse import urlparse
 
 blacklistedChars: list = ["<", ">", "&", "\"", "'"]
 bloatTags: list = ["DateInstalled", "Networking", "Data", "Environment"]
@@ -33,14 +34,22 @@ def _end(self, *args, **kwargs):
 def check_xml(filename: str):
   webUiPort: dict = { "port": None, "line": None }
   targetPorts: list = []
+  requiredLinks: bool = False
 
   tree = ET.parse(filename, parser=LineNumberingParser())
 
   root = tree.getroot()
 
   # Errors
 
-  if root.find("Support") is None or root.find("Project") is None:
+  for tag in ["Support", "Project"]:
+    if (tag := root.find(tag)) is not None:
+      if len(tag.text) != 0:
+        if not (tag.text.startswith(" ") or tag.text.endswith(" ")):
+          requiredLinks = True
+          break
+
+  if not requiredLinks:
     title = "Missing Support or Project Link"
     message = "No Support or Project Link Present"
     print(f"::error file={filename},title={title}::{message}")
@@ -125,6 +134,6 @@ def check_xml(filename: str):
     directory = "templates"
     for filename in os.scandir(directory):
       if filename.name.endswith(".xml") and filename.is_file():
-          if filename.name == "ca_profile.xml":
-            pass
+          if filename.name.endswith("ca_profile.xml"):
+            continue
           check_xml(filename = filename.path)
diff --git a/templates/idrac-fan-controller.xml b/templates/idrac-fan-controller.xml
@@ -5,7 +5,7 @@
   <Registry>https://hub.docker.com/r/tigerblue77/dell_idrac_fan_controller/</Registry>
   <Network>bridge</Network>
   <Privileged>false</Privileged>
-  <Support>https://github.com/tigerblue77/Dell_iDRAC_fan_controller_Docker </Support>
+  <Support>https://github.com/tigerblue77/Dell_iDRAC_fan_controller_Docker</Support>
   <Overview>https://github.com/tigerblue77/Dell_iDRAC_fan_controller_Docker&#xD;
     &#xD;
     https://hub.docker.com/r/tigerblue77/dell_idrac_fan_controller/&#xD;

diff --git a/templates/lg-connector.xml b/templates/lg-connector.xml
diff --git a/templates/rebuild-dndc.xml b/templates/rebuild-dndc.xml
@@ -16,75 +16,6 @@
   <Description>- Rebuild Docker Network Dependent Containers, e.g. Monitor a VPN or any container and rebuild dependent containers using the VPN container network stack --net=container:vpn_cotnainer_name. [br]
   - RDNDC will monitor the master/vpn container during updates, restarts and after server boot. [br]
   - Please refer to the readme before deploying this container: https://github.com/elmerfdz/unRAIDscripts</Description>
-  <Data>
-    <Volume>
-      <HostDir/>
-      <ContainerDir>/var/run/docker.sock</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-    <Volume>
-      <HostDir/>
-      <ContainerDir>/config/docker-templates</ContainerDir>
-      <Mode>ro</Mode>
-    </Volume>
-    <Volume>
-      <HostDir/>
-      <ContainerDir>/config/rebuild-dndc</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value/>
-      <Name>mastercontname</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>mastercontconcheck</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>ping_ip</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>ping_ip_alt</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>ping_count</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>sleep_secs</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>run_startup</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>discord_notifications</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>discord_url</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>cron</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
   <Config Name="Master Container Name" Target="mastercontname" Default="" Mode="" Description="Container Variable: mastercontname" Type="Variable" Display="always" Required="true" Mask="false"/>
   <Config Name="Master Container Connection Check" Target="mastercontconcheck" Default="yes" Mode="" Description="Container Variable: mastercontconcheck (yes/no)" Type="Variable" Display="always" Required="false" Mask="false"/>
   <Config Name="Ping IP" Target="ping_ip" Default="1.1.1.1" Mode="" Description="Container Variable: ping_ip" Type="Variable" Display="always" Required="false" Mask="false"/>

diff --git a/templates/seekerr.xml b/templates/seekerr.xml
@@ -4,32 +4,27 @@
   <Repository>lightglitch/seekerr:stable</Repository>
   <Registry>https://hub.docker.com/r/lightglitch/seekerr/</Registry>
   <Branch>
-  <Tag>stable</Tag>
-  <TagDescription>Latest stable release of seekerr</TagDescription>
-  <Repository>lightglitch/seekerr:stable</Repository>
-  <Registry>https://hub.docker.com/r/lightglitch/seekerr/</Registry>
+    <Tag>stable</Tag>
+    <TagDescription>Latest stable release of seekerr</TagDescription>
+    <Repository>lightglitch/seekerr:stable</Repository>
+    <Registry>https://hub.docker.com/r/lightglitch/seekerr/</Registry>
   </Branch>
   <Branch>
-  <Tag>latest</Tag>
-  <TagDescription>Latest build of seekerr</TagDescription>
-  <Repository>lightglitch/seekerr:latest</Repository>
-  <Registry>https://hub.docker.com/r/lightglitch/seekerr/</Registry>
+    <Tag>latest</Tag>
+    <TagDescription>Latest build of seekerr</TagDescription>
+    <Repository>lightglitch/seekerr:latest</Repository>
+    <Registry>https://hub.docker.com/r/lightglitch/seekerr/</Registry>
   </Branch>
   <Network>bridge</Network>
   <Privileged>false</Privileged>
   <Support>https://hub.docker.com/r/lightglitch/seekerr/</Support>
   <Project>https://github.com/lightglitch/seekerr</Project>
   <Overview>Tool to add new movies to Radarr based on RSS, IMDB and Trakt lists. You need to create your config file before running the image. For more info on setup of your config file, check out: https://hub.docker.com/r/lightglitch/seekerr/</Overview>
   <Category>Tools:</Category>
-  <WebUI/>
   <TemplateURL/>
   <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/seekerr.png</Icon>
   <ExtraParams/>
   <PostArgs/>
-  <CPUset/>
-  <DateInstalled>1626112129</DateInstalled>
-  <DonateText/>
-  <DonateLink/>
   <Description>Tool to add new movies to Radarr based on RSS, IMDB and Trakt lists. You need to create your config file before running the image. For more info on setup of your config file, check out: https://hub.docker.com/r/lightglitch/seekerr/</Description>
   <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/seekerr" Mode="rw" Description="AppData" Type="Path" Display="always" Required="true" Mask="false"/>
 </Container>
diff --git a/templates/tdarr_node.xml b/templates/tdarr_node.xml
@@ -20,7 +20,6 @@ Plugins here: https://github.com/HaveAGitGat/Tdarr_Plugins&#xD;
 &#xD;
   </Overview>
   <Category>Productivity: MediaApp:Video</Category>
-  <WebUI>http://[IP]:[PORT:8265]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/tdarr.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/tdarr.png</Icon>
   <DonateText>If you appreciate my work, then please consider buying me a beer :D</DonateText>

diff --git a/templates/teddycloud.xml b/templates/teddycloud.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <Container version="2">
-    <Name>teddycloud</Name>
-    <Repository>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Repository>
-    <Registry>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Registry>
-    <Network>bridge</Network>
-    <Privileged>false</Privileged>
-    <Support>https://forums.unraid.net/topic/138058-support-catduck-templates</Support>
-    <Project>https://github.com/toniebox-reverse-engineering/teddycloud</Project>
-    <Overview>teddyCloud is an alternative server for your Toniebox, allowing you to host the cloud services locally. This gives you the control about which data is sent to the original manufacturers cloud and allows you to host your own figurine audio files on e.g. your NAS or any other server.
-    </Overview>
-    <WebUI>http://[IP]:[PORT:7780]</WebUI>
-    <Category>MediaServer:Music MediaServer:Other</Category>
-    <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/teddycloud.xml</TemplateURL>
-    <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/teddycloud.png</Icon>
-    <Config Name="WEB UI" Target="80" Default="7780" Mode="tcp" Description="This an optional port for the webui of teddycloud" Type="Port" Display="always" Required="true" Mask="false"/>
-    <Config Name="SSL-Certs" Target="443" Default="7443" Mode="tcp" Description="Required PORT to get certificates" Type="Port" Display="always" Required="true" Mask="false">7443</Config>
-    <Config Name="content" Target="/teddycloud/data/content" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/content</Config>
-    <Config Name="config" Target="/teddycloud/config" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/teddycloud/config</Config>
-    <Config Name="certs" Target="/teddycloud/certs" Default="" Mode="rw" Description="Place your certs here after grabbing them off your device. (Yes you need to do this)" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/certs</Config>
-    <Config Name="library" Target="/teddycloud/data/library" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/library</Config>
-    <Config Name="firmware" Target="/teddycloud/data/firmware" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/data/firmware</Config>
+  <Name>teddycloud</Name>
+  <Repository>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Repository>
+  <Registry>ghcr.io/toniebox-reverse-engineering/teddycloud:latest</Registry>
+  <Network>bridge</Network>
+  <Privileged>false</Privileged>
+  <Support>https://forums.unraid.net/topic/138058-support-catduck-templates</Support>
+  <Project>https://github.com/toniebox-reverse-engineering/teddycloud</Project>
+  <Overview>teddyCloud is an alternative server for your Toniebox, allowing you to host the cloud services locally. This gives you the control about which data is sent to the original manufacturers cloud and allows you to host your own figurine audio files on e.g. your NAS or any other server.
+  </Overview>
+  <WebUI>http://[IP]:[PORT:80]</WebUI>
+  <Category>MediaServer:Music MediaServer:Other</Category>
+  <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/teddycloud.xml</TemplateURL>
+  <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/teddycloud.png</Icon>
+  <Config Name="WEB UI" Target="80" Default="7780" Mode="tcp" Description="This an optional port for the webui of teddycloud" Type="Port" Display="always" Required="true" Mask="false"/>
+  <Config Name="SSL-Certs" Target="443" Default="7443" Mode="tcp" Description="Required PORT to get certificates" Type="Port" Display="always" Required="true" Mask="false">7443</Config>
+  <Config Name="content" Target="/teddycloud/data/content" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/content</Config>
+  <Config Name="config" Target="/teddycloud/config" Default="" Mode="rw" Description="" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/teddycloud/config</Config>
+  <Config Name="certs" Target="/teddycloud/certs" Default="" Mode="rw" Description="Place your certs here after grabbing them off your device. (Yes you need to do this)" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/certs</Config>
+  <Config Name="library" Target="/teddycloud/data/library" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/user/appdata/teddycloud/data/library</Config>
+  <Config Name="firmware" Target="/teddycloud/data/firmware" Default="" Mode="rw" Description="" Type="Path" Display="advanced" Required="true" Mask="false">/mnt/user/appdata/teddycloud/data/firmware</Config>
 </Container>
diff --git a/templates/traktarr.xml b/templates/traktarr.xml
@@ -12,65 +12,6 @@ For more info on env variables and setup of your config file, check out: https:/
   <Category>Tools:</Category>
   <TemplateURL>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/traktarr.xml</TemplateURL>
   <Icon>https://raw.githubusercontent.com/selfhosters/unRAID-CA-templates/master/templates/img/traktarr.png</Icon>
-  <Data>
-    <Volume>
-      <HostDir/>
-      <ContainerDir>/config</ContainerDir>
-      <Mode>rw</Mode>
-    </Volume>
-  </Data>
-  <Environment>
-    <Variable>
-      <Value/>
-      <Name>PUID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>PGID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>DELAY</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>SORT</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>NOSEARCH</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>NOTIFICATIONS</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>BLACKLIST</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>RUNNOW</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>SKIPUPDATE</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value/>
-      <Name>APP_BRANCH</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
   <Config Name="Config" Target="/config" Default="/mnt/user/appdata/traktarr" Mode="rw" Description="Container Path: /config" Type="Path" Display="advanced" Required="false" Mask="false"/>
   <Config Name="PUID" Target="PUID" Default="99" Mode="" Description="Container Variable: PUID" Type="Variable" Display="advanced" Required="false" Mask="false"/>
   <Config Name="PGID" Target="PGID" Default="100" Mode="" Description="Container Variable: PGID" Type="Variable" Display="advanced" Required="false" Mask="false"/>