diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index b4e7164..ee27030 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -68,7 +68,7 @@ jobs: run: | CID=$(docker compose --project-name radiusnucleo ps -q freeradius) echo "Container: $CID" - docker inspect "$CID" --format '{{json .NetworkSettings.Ports}}' | jq . + docker inspect "$CID" --format '{{json .NetworkSettings.Ports}}' echo "docker port output:" || true docker port "$CID" || true diff --git a/freeradius/Dockerfile b/freeradius/Dockerfile index dc0506a..a76fe83 100644 --- a/freeradius/Dockerfile +++ b/freeradius/Dockerfile @@ -5,13 +5,17 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends freeradius-postgresql \ && rm -rf /var/lib/apt/lists/* -# Copy configuration overrides +## Copy configuration overrides (surgical, preserve defaults) COPY --chown=root:freerad clients.conf /etc/freeradius/clients.conf -COPY --chown=root:freerad mods-available/ /etc/freeradius/mods-available/ -COPY --chown=root:freerad mods-enabled/ /etc/freeradius/mods-enabled/ -COPY --chown=root:freerad sites-enabled/ /etc/freeradius/sites-enabled/ +COPY --chown=root:freerad mods-available/rest /etc/freeradius/mods-available/rest +COPY --chown=root:freerad mods-available/sql /etc/freeradius/mods-available/sql +COPY --chown=root:freerad mods-enabled/eap /etc/freeradius/mods-enabled/eap +COPY --chown=root:freerad sites-enabled/default /etc/freeradius/sites-enabled/default +COPY --chown=root:freerad sites-enabled/inner-tunnel /etc/freeradius/sites-enabled/inner-tunnel -# Ensure world-readable configs -RUN chmod -R a+r /etc/freeradius +# Enable required modules +RUN ln -sf /etc/freeradius/mods-available/rest /etc/freeradius/mods-enabled/rest \ + && ln -sf /etc/freeradius/mods-available/sql /etc/freeradius/mods-enabled/sql \ + && chmod -R a+r /etc/freeradius # Default command preserved by base image