From c50f69756c3c7ddcb42ff52f19e17fdaa293185b Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:46:15 +0200 Subject: [PATCH 1/7] Use python 3.11 --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e32fff2..f6adefc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,9 @@ jobs: 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 From ac278a167dc11e45d7b5706d04518543e42867cf Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Tue, 16 Jul 2024 17:36:18 +0200 Subject: [PATCH 2/7] Use bash as default shell --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6adefc..ba0e037 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,9 @@ 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 From 42a3251626fb3f7ab5e7142bcb3fbd3845ca31b1 Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:18:31 +0200 Subject: [PATCH 3/7] Add apt-get update --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba0e037..519052d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,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 </etc/systemd/network/10-br1.network From 66b12a6b3d787b5a3c6f3e99639ee040a0aba844 Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:55:42 +0200 Subject: [PATCH 4/7] Fix #223 --- jlmkr.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/jlmkr.py b/jlmkr.py index 5c54e50..4ab2bb6 100755 --- a/jlmkr.py +++ b/jlmkr.py @@ -116,7 +116,7 @@ systemd_nspawn_default_args=--bind-ro=/sys/module # 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 From 250a452278b1e99e91cfea0f1ac2b46b483fa8f6 Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Fri, 1 Nov 2024 20:47:53 +0100 Subject: [PATCH 5/7] Update compatibility.md --- docs/compatibility.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/compatibility.md b/docs/compatibility.md index 70f6223..39757ab 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -7,6 +7,7 @@ |TrueNAS 22.12|❌| |TrueNAS 23.10|✅| |TrueNAS 24.04|✅| +|TrueNAS 24.10|✅| ## Distro Compatibility | | | From 2d8e9735f8907245e0bf948e59370beb1f9cc17c Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Fri, 1 Nov 2024 21:03:02 +0100 Subject: [PATCH 6/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 604f9eb..c708d15 100644 --- a/README.md +++ b/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 From fc535e95c1813dfb0430294a1f0cd28c2531a4b5 Mon Sep 17 00:00:00 2001 From: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com> Date: Fri, 1 Nov 2024 21:03:25 +0100 Subject: [PATCH 7/7] Bump version to 2.1.1 --- jlmkr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jlmkr.py b/jlmkr.py index 4ab2bb6..094854c 100755 --- a/jlmkr.py +++ b/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"