Merge branch 'stable' into c-lightning

app-system/sources.list

@@ -8,4 +8,4 @@ https://github.com/runcitadel/apps c-lightning-v3
 # Some apps modified version of Umbrel apps, and their app definitions aren't FLOSS yet.
 # Include them anyway, but as a separate repo.
 # Add a # to the line below to disable the repo and only use FLOSS apps.
-https://github.com/runcitadel/apps-nonfree v3-dev
+https://github.com/runcitadel/apps-nonfree v3-beta

app/lib/composegenerator/shared/const.py

@@ -15,14 +15,6 @@ def permissions():
                 '${LND_DATA_DIR}:/lnd:ro'
             ]
         },
-        "c-lightning": {
-            "environment_allow": [
-                "C_LIGHTNING_IP"
-            ],
-            "volumes": [
-                '${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
-            ]
-        },
         "bitcoind": {
             "environment_allow": [
                 "BITCOIN_IP",
@@ -47,7 +39,15 @@ def permissions():
                 "ELECTRUM_PORT",
             ],
             "volumes": []
-        }
+        },
+        "c-lightning": {
+            "environment_allow": [
+                "C_LIGHTNING_IP"
+            ],
+            "volumes": [
+                '${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
+            ]
+        },
     }
 
 # Vars which are always allowed without permissions

app/lib/composegenerator/v3/generate.py

@@ -78,6 +78,13 @@ def createComposeConfigFromV3(app: dict, nodeRoot: str):
     networkingFile = os.path.join(nodeRoot, "apps", "networking.json")
     ignoredContainers = []
     newApp: App = generateApp(app)
+    for container in newApp.containers:
+        # TODO: Make this dynamic and not hardcoded
+        if container.requires and "lnd" in container.requires:
+            ignoredContainers.append(container.name)
+            container.ignored = True
+        elif container.requires:
+            del container.requires
     newApp = convertContainerPermissions(newApp)
     newApp = validateEnv(newApp)
     newApp = convertDataDirToVolumeGen3(newApp)
@@ -88,16 +95,9 @@ def createComposeConfigFromV3(app: dict, nodeRoot: str):
         del container.requiredPorts
     for container in newApp.containers:
         for udpPort in container.requiredUdpPorts:
-            container.ports.append(udpPort)
+            container.ports.append("{}/udp".format(udpPort))
         del container.requiredUdpPorts
     newApp = configureMainPort(newApp, nodeRoot)
-    for container in newApp.containers:
-        # TODO: Make this dynamic and not hardcoded
-        if container.requires and "lnd" in container.requires:
-            ignoredContainers.append(container.name)
-            container.ignored = True
-        elif container.requires:
-            del container.requires
     newApp = configureHiddenServices(newApp, nodeRoot)
     for container in newApp.containers:
         del container.ignored

docker-compose.yml

@@ -100,7 +100,7 @@ services:
         ipv4_address: $LND_IP
   dashboard:
     container_name: dashboard
-    image: ghcr.io/runcitadel/dashboard:main@sha256:d042a2eb7a6433cc42d267cf689bd4606e8c2fbf4081256c965ba9a1118c4f6d
+    image: ghcr.io/runcitadel/dashboard:v0.0.12@sha256:102a44b938765be8224c63785949b90bf796670f01aef4e282d58a4c26a42595
     restart: on-failure
     stop_grace_period: 1m30s
     networks:
@@ -108,7 +108,7 @@ services:
         ipv4_address: $DASHBOARD_IP
   manager:
     container_name: manager
-    image: ghcr.io/runcitadel/manager:main@sha256:139647074dc15328e06e74cce6f7009a695e1d361cf4c55eb5609b442f30f774
+    image: ghcr.io/runcitadel/manager:v0.0.12@sha256:de97eeb6e8caae5d1a8aeb045213621cf8e6e928177236bb0b3c25e76f6cd041
     depends_on:
     - tor
     - redis
@@ -162,7 +162,7 @@ services:
         ipv4_address: $MANAGER_IP
   middleware:
     container_name: middleware
-    image: ghcr.io/runcitadel/middleware:v0.0.9@sha256:6763b6006f0deeb746ccf6a5653cbc0401d03dd73e500bb869fb4c28ec258a1b
+    image: ghcr.io/runcitadel/middleware:v0.0.10@sha256:afd6e2b6f5ba27cde32f6f6d630ddc6dd46d1072871f7834d7424d0554d0f53d
     depends_on:
     - manager
     - bitcoin
@@ -241,7 +241,7 @@ services:
         ipv4_address: $C_LIGHTNING_IP
   redis:
     container_name: redis
-    image: redis:6.2.6-bullseye@sha256:0d9c9aed1eb385336db0bc9b976b6b49774aee3d2b9c2788a0d0d9e239986cb3
+    image: redis:7.0.0-bullseye@sha256:ad0705f2e2344c4b642449e658ef4669753d6eb70228d46267685045bf932303
     working_dir: /data
     volumes:
     - ${PWD}/redis:/data