Logan CusanoandClaude Opus 5.5
d07d312e92
op25-container
- generate-config takes p25_mode "conventional" + conv_channels [{frequency,
name, nac}]. It builds fixed fsk4 channels (up to 2 on one non-tunable SDR,
DC spike kept off the channels) with no control channel to hunt. Two
channels send audio to UDP 23456/23457, and audio.py -2 + amplify(2) keeps
levels.
- tk_drb_conv.py (a tk_p25.rx_ctl subclass, copied into OP25 apps) reports
voice / NAC / encryption (LC service options + LDU2 ESS algid/keyid) for
conventional channels and applies the per-channel NAC filter, which stock
tk_p25 does not. Analog uses it too.
- Trunked P25 config is unchanged when p25_mode is absent.
drb-edge-node
- radio_config: system kind from type + config.mode (missing = trunked).
- conventional.py normalizes the console: a distinctive LC TGID, else the
channel's last TGID (30 s), else a synthetic per-channel id (freq/100 Hz).
Encrypted rows are never talkers. With exactly one conventional channel,
orphan audio is attributed to it at close, which fixes analog recording
(#20). The synthetic id and the real TGID on one channel never split.
- Health/dashboard: P25 conventional listen tab (/api/listen p25conv), and
conventional decode + encryption checks. The checkin carries radio_channels.
- Tests: edge 296 pass; op25-container 18 (new CI job). Reviewed by
drb-audio-review (findings fixed; simultaneous two-channel mixdown filed
as #26) and drb-qa-review.
Not verified on SDR hardware.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
66 lines
2.5 KiB
Docker
66 lines
2.5 KiB
Docker
# OP25 Core Container
|
|
# Pinned to a Python major version deliberately. The bare `slim-trixie` tag
|
|
# carries no version at all, so a rebuild could move the interpreter across a
|
|
# major release -- which this repo has already been bitten by once, when
|
|
# app/models.py only ran because trixie happened to ship 3.14 and PEP 649
|
|
# defers annotation evaluation. Matches drb-edge-node, which is already 3.14.
|
|
FROM python:3.14-slim
|
|
|
|
# Set environment variables
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
# Install system dependencies
|
|
RUN apt-get update && \
|
|
apt-get upgrade -y && \
|
|
apt-get install git pulseaudio pulseaudio-utils liquidsoap usbutils -y
|
|
|
|
# Install custom PulseAudio system config (enables anonymous access for edge-node)
|
|
COPY system.pa /etc/pulse/system.pa
|
|
|
|
# Clone the boatbod op25 repository
|
|
RUN git clone -b gr310 https://github.com/boatbod/op25 /op25
|
|
|
|
# Set the working directory
|
|
WORKDIR /op25
|
|
|
|
# Run the install script to set up op25
|
|
RUN sed -i 's/sudo //g' install.sh
|
|
RUN ./install.sh -f
|
|
|
|
# Install Python dependencies
|
|
COPY requirements.txt /tmp/requirements.txt
|
|
RUN pip3 install --no-cache-dir -r /tmp/requirements.txt
|
|
|
|
# DRB's trunking module for P25 conventional channels (node-26#24): reports
|
|
# encryption + NAC and applies the NAC filter, which stock tk_p25 does not.
|
|
COPY op25_addons/tk_drb_conv.py /op25/op25/gr-op25_repeater/apps/tk_drb_conv.py
|
|
|
|
# Create the run_multi-rx_service.sh script
|
|
COPY run_multi-rx_service.sh /op25/op25/gr-op25_repeater/apps/run_multi-rx_service.sh
|
|
RUN chmod +x /op25/op25/gr-op25_repeater/apps/run_multi-rx_service.sh
|
|
|
|
# Expose ports for HTTP control as needed, for example:
|
|
EXPOSE 8001 8081
|
|
|
|
# Create and set up the configuration directory
|
|
VOLUME ["/configs"]
|
|
|
|
# Set the working directory in the container
|
|
WORKDIR /app
|
|
|
|
# Copy the rest of the directory contents into the container at /app
|
|
COPY ./app /app
|
|
|
|
# 1. Copy the wrapper script and make it executable
|
|
COPY docker-entrypoint.sh /usr/local/bin/
|
|
RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh && \
|
|
chmod +x /usr/local/bin/docker-entrypoint.sh
|
|
|
|
# 2. Update ENTRYPOINT to use the wrapper script
|
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
|
|
# 3. Use CMD to pass the launch command as arguments to the ENTRYPOINT script.
|
|
# main.py starts uvicorn itself (see `if __name__ == "__main__"`) so the bind
|
|
# address can be driven by OP25_DEBUG_EXPOSE at runtime instead of being baked
|
|
# into this image at build time.
|
|
CMD ["python", "main.py"] |