From 289ecbd2370d74932eedd91da715a17e02c6a9f9 Mon Sep 17 00:00:00 2001 From: John Ajera Date: Tue, 18 Aug 2026 09:05:38 +1200 Subject: [PATCH] chore: wrap earthscope/ringserver for Dependabot Pin FROM earthscope/ringserver so docker version updates can bump the upstream image. Keep the default listen config overlay. --- .github/dependabot.yml | 3 --- Dockerfile | 55 ++++-------------------------------------- README.md | 2 +- 3 files changed, 6 insertions(+), 54 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cd3a4ed..6dd694b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,9 +8,6 @@ updates: commit-message: prefix: "chore" include: "scope" - ignore: - - dependency-name: "debian" - update-types: ["version-update:semver-major"] - package-ecosystem: "github-actions" directory: "/" diff --git a/Dockerfile b/Dockerfile index 3806648..97fcbda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,53 +1,8 @@ -# Debian bookworm + EarthScope ringserver. Pin RINGSERVER_VERSION. +FROM earthscope/ringserver:4.5.6 -ARG BASE=debian:bookworm-slim +USER root +COPY --chown=10000:10000 config/ringserver.conf /config/ringserver.conf +USER 10000 -FROM ${BASE} AS buildenv -ARG RINGSERVER_VERSION=4.5.6 -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - clang \ - git \ - make \ - netbase \ - && rm -rf /var/lib/apt/lists/* - -RUN git clone --depth 1 --branch "v${RINGSERVER_VERSION}" \ - https://github.com/EarthScope/ringserver.git /build \ - && cd /build \ - && CFLAGS="-O3" make -j - -FROM ${BASE} -ARG DEBIAN_FRONTEND=noninteractive -ARG UID=10000 -ARG GID=10000 -ARG USERNAME=containeruser - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - netbase \ - procps \ - && rm -rf /var/cache/apt/archives /var/lib/apt/lists/* - -COPY --from=buildenv /build/ringserver /ringserver -COPY config/ringserver.conf /config/ringserver.conf - -RUN groupadd --gid "${GID}" "${USERNAME}" \ - && adduser --uid "${UID}" --gid "${GID}" "${USERNAME}" \ - && mkdir -p /data/ring \ - && chown -R "${UID}:${GID}" /data /config - -WORKDIR /data -EXPOSE 18000 16000 -USER ${USERNAME} - -# SeedLink-only on 18000, DataLink-only on 16000. Override with RS_* env. +# SeedLink on 18000, DataLink on 16000. Override with RS_* env. ENV RS_CONFIG_FILE=/config/ringserver.conf -ENV RS_RING_DIRECTORY=/data/ring -ENV RS_SEEDLINK_PORT=18000 -ENV RS_DATALINK_PORT=16000 - -ENTRYPOINT ["/ringserver"] diff --git a/README.md b/README.md index 237a84d..9c570b3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![CI](https://github.com/platformfuzz/ringserver/actions/workflows/ci.yml/badge.svg) ![Build and Release](https://github.com/platformfuzz/ringserver/actions/workflows/build-and-release.yml/badge.svg) -Ringserver image built from EarthScope. +Ringserver image based on `earthscope/ringserver`. Listens on TCP 18000 (SeedLink) and TCP 16000 (DataLink). Ring files live under `/data/ring`. Mount that path if the ring must survive restarts.