Merge pull request #260 from Jip-Hop/develop

v2.1.1

.github/workflows/test.yml

@@ -19,12 +19,16 @@ jobs:
   test:
     # The type of runner that the job will run on
     runs-on: ubuntu-24.04
-
+    defaults:
+      run:
+        shell: bash
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
-
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11' # TrueNAS SCALE 24.04 Dragonfish
       - name: Tune GitHub-hosted runner network
         uses: smorimoto/tune-github-hosted-runner-network@v1
 
@@ -38,6 +42,7 @@ jobs:
           rm /etc/resolv.conf
           echo 'nameserver 1.1.1.1' > /etc/resolv.conf
 
+          apt-get update
           apt-get install -qq -y systemd-container
 
           cat <<NETWORKCONFIG >/etc/systemd/network/10-br1.network

README.md

@@ -2,9 +2,9 @@
 
 Persistent Linux 'jails' on TrueNAS SCALE to install software (k3s, docker, portainer, podman, etc.) with full access to all files via bind mounts.
 
-## Project Up For Adoption
+## Project Unmaintained
 
-Please read [the announcement](https://github.com/Jip-Hop/jailmaker/discussions/241).
+[As announced](https://github.com/Jip-Hop/jailmaker/discussions/241) this repo is no longer maintained by the original author: Jip-Hop. The final release is v2.1.1 which has been tested to be compatible with TrueNAS SCALE 24.10.0. Perhaps development continues in [one of the forks](https://github.com/Jip-Hop/jailmaker/forks). But since [iX has decided to integrate Incus in the SCALE 25.04 Fangtooth](https://github.com/truenas/middleware/pull/14592) it's probably best to start using that once it's available instead of relying on `jailmaker` and `systemd-nspawn`.
 
 ## Video Tutorial
 

docs/compatibility.md

@@ -7,6 +7,7 @@
 |TrueNAS 22.12|❌|
 |TrueNAS 23.10|✅|
 |TrueNAS 24.04|✅|
+|TrueNAS 24.10|✅|
 
 ## Distro Compatibility
 |   |   |

jlmkr.py

@@ -4,7 +4,7 @@
 with full access to all files via bind mounts, \
 thanks to systemd-nspawn!"""
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 __author__ = "Jip-Hop"
 __copyright__ = "Copyright (C) 2023, Jip-Hop"
 __license__ = "LGPL-3.0-only"
@@ -116,7 +116,7 @@
 # https://manpages.debian.org/bookworm/manpages/sysfs.5.en.html
 
 DOWNLOAD_SCRIPT_DIGEST = (
-    "cfcb5d08b24187d108f2ab0d21a6cc4b73dcd7f5d7dfc80803bfd7f1642d638d"
+    "645ba65a8846a2f402fc8bd870029b95fbcd3128e3046cd55642d577652cb0a0"
 )
 SCRIPT_PATH = os.path.realpath(__file__)
 SCRIPT_NAME = os.path.basename(SCRIPT_PATH)
@@ -863,7 +863,7 @@ def run_lxc_download_script(
     # Fetch the lxc download script if not present locally (or hash doesn't match)
     if not validate_sha256(lxc_download_script, DOWNLOAD_SCRIPT_DIGEST):
         urllib.request.urlretrieve(
-            "https://raw.githubusercontent.com/Jip-Hop/lxc/97f93be72ebf380f3966259410b70b1c966b0ff0/templates/lxc-download.in",
+            "https://raw.githubusercontent.com/Jip-Hop/lxc/b24d2d45b3875b013131b480e61c93b6fb8ea70c/templates/lxc-download.in",
             lxc_download_script,
         )
 
@@ -905,12 +905,7 @@ def run_lxc_download_script(
             ):
                 print(line)
 
-        rc = p1.wait()
-        # Currently --list will always return a non-zero exit code, even when listing the images was successful
-        # https://github.com/lxc/lxc/pull/4462
-        # Therefore we must currently return 0, to prevent aborting the interactive create process
-
-        # return rc
+        return p1.wait()
 
     return 0