chaos/NTP-Timeturner
1
0
Fork 0
mirror of https://github.com/cjfranko/NTP-Timeturner.git synced 2025-11-08 18:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: switch PTP daemon to linuxptp/ptp4l; remove statime

Browse source 
Co-authored-by: aider (openai/gpt-5) <aider@aider.chat>
This commit is contained in:
Chaos Rogers 2025-10-22 13:24:05 +01:00
parent 21e65d6125
commit 90cc95be21
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -20,7 +20,7 @@ RUN rm -rf src
# Copy full source and build project # Copy full source and build project
COPY . . COPY . .
RUN cargo build --release && cargo install --locked statime RUN cargo build --release
# (Statime installation removed; container runs only haci) # (Statime installation removed; container runs only haci)
@ -32,12 +32,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
tzdata \ tzdata \
socat \ socat \
linuxptp \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app
COPY --from=builder /app/target/release/get-haci /usr/local/bin/get-haci COPY --from=builder /app/target/release/get-haci /usr/local/bin/get-haci
COPY --from=builder /usr/local/cargo/bin/statime /usr/local/bin/statime # Using linuxptp (ptp4l) provided by apt; no statime binary copied
COPY static ./static COPY static ./static
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
COPY scripts/ltc_gen.sh /usr/local/bin/ltc-gen.sh COPY scripts/ltc_gen.sh /usr/local/bin/ltc-gen.sh

15
scripts/entrypoint.sh
View file

@ -28,17 +28,20 @@ if [ "${MOCK_TEENSY:-0}" = "1" ]; then
fi fi
fi fi
# Optionally start the PTP daemon (statime) for development # Optionally start a PTP daemon for development (prefer statime, fallback to ptp4l)
if [ "${RUN_STATIME:-0}" = "1" ]; then if [ "${RUN_STATIME:-0}" = "1" ]; then
echo "[entrypoint] Starting statime PTP daemon..." >&2 IFACE="${PTP_INTERFACE:-eth0}"
if command -v statime >/dev/null 2>&1; then if command -v statime >/dev/null 2>&1; then
IFACE="${PTP_INTERFACE:-eth0}" echo "[entrypoint] Starting statime on ${IFACE}..." >&2
echo "[entrypoint] statime interface: ${IFACE}" >&2
# Run statime in background; logs to container stderr/stdout
statime -i "${IFACE}" & statime -i "${IFACE}" &
STATIME_PID=$! STATIME_PID=$!
elif command -v ptp4l >/dev/null 2>&1; then
echo "[entrypoint] Starting ptp4l on ${IFACE}..." >&2
# -m prints messages to stdout; adjust args as needed for your environment
ptp4l -i "${IFACE}" -m &
PTP4L_PID=$!
else else
echo "[entrypoint] statime not found on PATH" >&2 echo "[entrypoint] No PTP daemon found (statime or ptp4l). Skipping." >&2
fi fi
fi fi