From ddc7cc67beb7760d0c77befad643021370bf5435 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Fri, 23 Oct 2026 12:10:42 +1100 Subject: [PATCH] PR cleanup alpine and python bump --- .devcontainer/scripts/setup.sh | 2 +- install/production-filesystem/README.md | 2 +- test/docker_tests/conftest.py | 2 +- test/docker_tests/test_container_environment.py | 8 ++++---- test/docker_tests/test_puid_pgid.py | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/scripts/setup.sh b/.devcontainer/scripts/setup.sh index d06bcf7c0..72b10f30b 100755 --- a/.devcontainer/scripts/setup.sh +++ b/.devcontainer/scripts/setup.sh @@ -15,7 +15,7 @@ SOURCE_DIR=${SOURCE_DIR:-/workspaces/NetAlertX} -PY_SITE_PACKAGES="${VIRTUAL_ENV:-/opt/venv}/lib/python3.12/site-packages" +PY_SITE_PACKAGES="${VIRTUAL_ENV:-/opt/venv}/lib/python3.14/site-packages" LOG_FILES=( LOG_APP diff --git a/install/production-filesystem/README.md b/install/production-filesystem/README.md index 51c6be041..c81a02e86 100755 --- a/install/production-filesystem/README.md +++ b/install/production-filesystem/README.md @@ -29,7 +29,7 @@ Temporary directory used during Docker image building: - Deleted after build to reduce image size - Only exists during container creation -### `/opt/venv/lib/python3.12/site-packages/aiofreebox` - Certificate Storage +### `/opt/venv/lib/python3.14/site-packages/aiofreebox` - Certificate Storage Contains SSL certificates required for secure communication with Freebox OS devices. The aiofreebox Python package uses these certificates to authenticate and establish encrypted connections when integrating with Freebox routers for network device discovery. Contains certificates for the aiofreebox package, which communicates with Freebox OS devices. diff --git a/test/docker_tests/conftest.py b/test/docker_tests/conftest.py index 2643016b6..4a868e726 100644 --- a/test/docker_tests/conftest.py +++ b/test/docker_tests/conftest.py @@ -29,7 +29,7 @@ def _clean_test_mounts(project_root: pathlib.Path) -> None: cmd = [ "docker", "run", "--rm", "-v", f"{project_root}:/work", - "alpine:3.22", + "alpine:3.24", "rm", "-rf", "/work/test_mounts" ] subprocess.run( diff --git a/test/docker_tests/test_container_environment.py b/test/docker_tests/test_container_environment.py index 1ca1eb019..69cb30bfc 100644 --- a/test/docker_tests/test_container_environment.py +++ b/test/docker_tests/test_container_environment.py @@ -388,7 +388,7 @@ def _seed_volume_text_file( [ "-v", f"{volume_name}:/data", - "alpine:3.22", + "alpine:3.24", "sh", "-c", f"set -eu; mkdir -p \"$(dirname '{container_path}')\"; cat > '{container_path}'; chmod {chmod_mode} '{container_path}'", @@ -417,7 +417,7 @@ def _volume_has_file(volume_name: str, container_path: str) -> bool: "host", "-v", f"{volume_name}:/data", - "alpine:3.22", + "alpine:3.24", "sh", "-c", f"test -f '{container_path}'", @@ -943,7 +943,7 @@ def test_missing_app_conf_triggers_seed(tmp_path: pathlib.Path) -> None: check_conf = subprocess.run( [ "docker", "run", "--rm", "-v", f"{vol}:/data", - "alpine:3.22", "cat", "/data/config/app.conf" + "alpine:3.24", "cat", "/data/config/app.conf" ], capture_output=True, text=True, timeout=SUBPROCESS_TIMEOUT_SECONDS ) @@ -984,7 +984,7 @@ def test_first_run_dynamic_subnet(tmp_path: pathlib.Path) -> None: cmd = [ "docker", "run", "--rm", "-v", f"{paths['app_config']}:/mnt", - "alpine:3.22", + "alpine:3.24", "cat", "/mnt/app.conf" ] read_result = subprocess.run(cmd, capture_output=True, text=True, timeout=SUBPROCESS_TIMEOUT_SECONDS) diff --git a/test/docker_tests/test_puid_pgid.py b/test/docker_tests/test_puid_pgid.py index a7df8a2bc..f3d658d77 100644 --- a/test/docker_tests/test_puid_pgid.py +++ b/test/docker_tests/test_puid_pgid.py @@ -180,7 +180,7 @@ def test_synology_like_fresh_volume_is_primed() -> None: f"{volume}:/data", "--entrypoint", "/bin/sh", - "alpine:3.22", + "alpine:3.24", "-c", seed_cmd, ], @@ -214,7 +214,7 @@ def test_synology_like_fresh_volume_is_primed() -> None: f"{volume}:/data", "--entrypoint", "/bin/sh", - "alpine:3.22", + "alpine:3.24", "-c", stat_cmd, ], @@ -357,7 +357,7 @@ def test_missing_cap_chown_fails_priming() -> None: f"{volume}:/data", "--entrypoint", "/bin/sh", - "alpine:3.22", + "alpine:3.24", "-c", seed_cmd, ],