removed unwanted dependency from built packages, update docker docs, downgrade back to python3.10 due to emane packaging on Ubuntu 24 for now

Author: bharnden

.github/workflows/daemon-checks.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v1
-      - name: Set up Python 3.12
+      - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.12
+          python-version: 3.10
       - name: install poetry
         run: |
           python -m pip install --upgrade pip

Makefile.am

@@ -100,7 +100,6 @@ fpm -s dir -t rpm -n core \
 	-d "tk" \
 	-d "procps-ng" \
 	-d "bash >= 3.0" \
-	-d "ebtables" \
 	-d "iproute" \
 	-d "libev" \
 	-d "net-tools" \
@@ -133,7 +132,6 @@ fpm -s dir -t deb -n core \
 	-d "procps" \
 	-d "libc6 >= 2.14" \
 	-d "bash >= 3.0" \
-	-d "ebtables" \
 	-d "iproute2" \
 	-d "libev4" \
 	-d "nftables" \

configure.ac

@@ -79,7 +79,7 @@ if test "x$enable_daemon" = "xyes"; then
   want_python=yes
   want_linux_netns=yes
 
-  AM_PATH_PYTHON(3.12)
+  AM_PATH_PYTHON(3.10)
   AS_IF([./venv/bin/python -m grpc_tools.protoc -h &> /dev/null], [], [AC_MSG_ERROR([grpc tools must be setup in venv, try setup.sh])])
 
   AC_CHECK_PROG(sysctl_path, sysctl, $as_dir, no, $SEARCHPATH)

daemon/poetry.lock

@@ -24,7 +24,7 @@ core-service-update = "core.scripts.serviceupdate:main"
 core-cleanup = "core.scripts.cleanup:main"
 
 [tool.poetry.dependencies]
-python = "^3.12"
+python = "^3.10"
 fabric = "3.2.2"
 grpcio = "1.69.0"
 invoke = "2.2.0"

daemon/pyproject.toml

@@ -24,10 +24,7 @@ git clone https://github.com/coreemu/core.git
 cd core
 # first you must build EMANE python bindings
 sudo docker build -t emane-python -f dockerfiles/Dockerfile.emane-python .
-# build ospf packages
-sudo docker build -t ospf-rpm -f dockerfiles/Dockerfile.ospf-mdr-rpm .
-sudo docker build -t ospf-deb -f dockerfiles/Dockerfile.ospf-mdr-deb .
-# build desired CORE image
+# build desired CORE image, OSPF is a build stage dependency within the file
 sudo docker build -t core -f dockerfiles/<Dockerfile> .
 ```