mirror of
https://github.com/cjfranko/NTP-Timeturner.git
synced 2025-11-08 18:32:02 +00:00
chore: drop ptp-probe/statime and run haci in Docker
Co-authored-by: aider (openai/gpt-5) <aider@aider.chat>
This commit is contained in:
parent
62c94c777f
commit
e5a2c52120
2 changed files with 7 additions and 45 deletions
15
Dockerfile
15
Dockerfile
|
|
@ -18,13 +18,11 @@ RUN mkdir -p src && echo 'fn main() { println!("cargo:rerun-if-changed=build.rs"
|
||||||
RUN cargo build --release || true
|
RUN cargo build --release || true
|
||||||
RUN rm -rf src
|
RUN rm -rf src
|
||||||
|
|
||||||
# Copy full source and build real binaries
|
# Copy full source and build project
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN cargo build --release --bin ntp_timeturner --bin ptp_probe
|
RUN cargo build --release
|
||||||
|
|
||||||
# Build and install the Statime PTP daemon (from crates.io)
|
# (Statime installation removed; container runs only haci)
|
||||||
# This installs the 'statime' binary into /usr/local/cargo/bin/statime in the builder image.
|
|
||||||
RUN cargo install --locked statime-linux --version 0.4.0
|
|
||||||
|
|
||||||
# Runtime image
|
# Runtime image
|
||||||
FROM debian:bookworm-slim AS runtime
|
FROM debian:bookworm-slim AS runtime
|
||||||
|
|
@ -37,13 +35,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=builder /app/target/release/ntp_timeturner /usr/local/bin/ntp_timeturner
|
COPY --from=builder /app/target/release/get-haci /usr/local/bin/get-haci
|
||||||
COPY --from=builder /app/target/release/ptp_probe /usr/local/bin/ptp_probe
|
|
||||||
COPY --from=builder /usr/local/cargo/bin/statime /usr/local/bin/statime
|
|
||||||
COPY static ./static
|
COPY static ./static
|
||||||
|
|
||||||
ENV RUST_LOG=info
|
ENV RUST_LOG=info
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
||||||
# Default to running the main server
|
CMD ["get-haci"]
|
||||||
CMD ["ntp_timeturner"]
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
haci:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
container_name: ntp_timeturner
|
container_name: haci
|
||||||
environment:
|
environment:
|
||||||
- RUST_LOG=info
|
- RUST_LOG=info
|
||||||
ports:
|
ports:
|
||||||
|
|
@ -13,36 +13,3 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./static:/app/static:ro
|
- ./static:/app/static:ro
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# Optional: probe a PTP hardware clock (Linux host with /dev/ptp0)
|
|
||||||
ptp-probe:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: ntp_timeturner:latest
|
|
||||||
profiles:
|
|
||||||
- hw
|
|
||||||
command: ["ptp_probe", "--device", "/dev/ptp0", "--interval", "1.0", "--count", "0"]
|
|
||||||
devices:
|
|
||||||
- "/dev/ptp0:/dev/ptp0"
|
|
||||||
restart: "no"
|
|
||||||
|
|
||||||
# PTP daemon using Statime (software PTP inside the container)
|
|
||||||
# Note: On macOS with Docker Desktop, low-level PTP networking features are limited.
|
|
||||||
# This service is most effective on a Linux host. Still useful for dev/testing.
|
|
||||||
statime:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: ntp_timeturner:latest
|
|
||||||
container_name: statime
|
|
||||||
cap_add:
|
|
||||||
- NET_ADMIN
|
|
||||||
- NET_RAW
|
|
||||||
- SYS_TIME
|
|
||||||
command: ["statime", "-i", "eth0"]
|
|
||||||
# Expose standard PTP ports (udp/319, udp/320)
|
|
||||||
ports:
|
|
||||||
- "319:319/udp"
|
|
||||||
- "320:320/udp"
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue