Merge branch 'stable' of github.com:runcitadel/core into c-lightning

app/lib/composegenerator/v2/types.py

@@ -47,6 +47,7 @@ class Container:
     noNetwork: Union[bool, None] = None
     hiddenServicePorts: Union[dict, Union[int, Union[None, list]]] = field(default_factory=list)
     environment_allow: list = field(default_factory=list)
+    network_mode: Union[str, None] = None
     # Only added later
     volumes: list = field(default_factory=list)
     restart: Union[str, None] = None
@@ -90,6 +91,7 @@ class ContainerStage2:
     volumes: list[str] = field(default_factory=list)
     networks: NetworkConfig = field(default_factory=NetworkConfig)
     restart: Union[str, None] = None
+    network_mode: Union[str, None] = None
 
 @dataclass
 class AppStage2:
@@ -145,6 +147,7 @@ class ContainerStage4:
     volumes: list[str] = field(default_factory=list)
     networks: NetworkConfig = field(default_factory=NetworkConfig)
     restart: Union[str, None] = None
+    network_mode: Union[str, None] = None
 
 @dataclass
 class AppStage4:

info.json

@@ -1,6 +1,6 @@
 {
     "version": "0.0.1",
     "name": "Citadel 0.0.1",
-    "requires": ">=0.5.24",
+    "requires": ">=0.0.1",
     "notes": "Please note: This update is not compatible with the c-lightning beta. We're resetting version numbers to 0.0.1. This update only contains one bug fix, but please install this update so you'll receive further updates."
 }

scripts/citadel-os/external-storage/update-from-sdcard

@@ -40,9 +40,10 @@ main () {
   local external_version=$(cat "${CITADEL_ROOT}/info.json" | jq -r .version | cut -d "-" -f "1")
   local sd_version=$(cat "${SD_CITADEL_ROOT}/info.json" | jq -r .version | cut -d "-" -f "1")
 
-  if [[ "${external_version}" == "0.5"* ]]; then
+  if [[ "${external_version}" == "0.5"* ]] || [[ "${external_version}" == "99.99.99" ]]; then
     echo "External storage is on a pre version number reset version, updating to the latest version."
     "${CITADEL_ROOT}/scripts/update/update" --path "${SD_CITADEL_ROOT}"
+    exit 0
   fi
 
   if ! check_semver_range ">${external_version}" "${sd_version}"; then

scripts/update/01-run.sh

@@ -102,7 +102,7 @@ cat <<EOF > "$CITADEL_ROOT"/statuses/update-status.json
 {"state": "installing", "progress": 67, "description": "Stopping old containers", "updateTo": "$RELEASE"}
 EOF
 cd "$CITADEL_ROOT"
-./scripts/stop
+./scripts/stop || true
 
 
 # Overlay home dir structure with new dir tree