docker/entrypoint.sh aktualisiert

docker/entrypoint.sh

@@ -1,51 +1,43 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Container entrypoint: run sync.sh once, or in a loop every
+# SYNC_INTERVAL_SECONDS. There's no systemd/cron inside the container, so a
+# simple sleep-loop is the pragmatic choice.
 set -euo pipefail
 
-SYNC_CRON="${SYNC_CRON:-0 */6 * * *}"
+: "${SYNC_INTERVAL_SECONDS:=3600}"
-GIT_SSH_KEY_PATH="${GIT_SSH_KEY_PATH:-/etc/mirror/git-deploy-key}"
+: "${RUN_ONCE:=false}"
 
-export GNUPGHOME="${GNUPGHOME:-/etc/mirror-gpg}"
+log() { echo "[entrypoint] $(date '+%Y-%m-%d %H:%M:%S') $*"; }
-GPG_PRIVATE_KEY_FILE="${GPG_PRIVATE_KEY_FILE:-/run/secrets/gpg_private_key}"
-GPG_KEY_ID_FILE="${GNUPGHOME}/key-id"
 
-mkdir -p "$GNUPGHOME"
+run_once() {
-chmod 700 "$GNUPGHOME"
+    /opt/rpm-mirror/sync.sh
+}
 
-if [ -f "$GPG_PRIVATE_KEY_FILE" ] && [ ! -s "$GPG_KEY_ID_FILE" ]; then
+if [[ "$RUN_ONCE" == "true" ]]; then
-  echo "[entrypoint] Importiere Firmen-GPG-Key"
+    log "RUN_ONCE=true - running sync.sh once and exiting"
-  gpg --batch --import "$GPG_PRIVATE_KEY_FILE"
+    run_once
-  gpg --batch --list-secret-keys --with-colons \
+    exit $?
-    | awk -F: '/^sec/ {print $5; exit}' > "$GPG_KEY_ID_FILE"
 fi
 
-if [ -s "$GPG_KEY_ID_FILE" ]; then
+log "Starting sync loop (interval: ${SYNC_INTERVAL_SECONDS}s)"
-  GPG_KEY_ID="$(cat "$GPG_KEY_ID_FILE")"
-  export GPG_KEY_ID
 
-  mkdir -p /data/repo
+# Graceful shutdown on docker stop / compose down
-  gpg --batch --export --armor "$GPG_KEY_ID" > /data/repo/RPM-GPG-KEY-firma
+term_handler() {
+    log "Received SIGTERM, shutting down"
+    exit 0
+}
+trap term_handler SIGTERM SIGINT
 
-  {
+while true; do
-    echo "%_gpg_name  ${GPG_KEY_ID}"
+    # NOTE: don't inline `run_once` into `if ! run_once; then ...`  - inside
-    echo "%_gpg_path  ${GNUPGHOME}"
+    # that then-branch, $? would reflect the (always-0) negated test itself,
-  } > /root/.rpmmacros
+    # not run_once's real exit code. Capture it explicitly instead.
-else
+    rc=0
-  echo "[entrypoint] WARNUNG: kein GPG-Key gefunden, Pakete werden NICHT signiert."
+    run_once || rc=$?
+    if [[ $rc -ne 0 ]]; then
+        log "sync.sh failed (exit ${rc}) - will retry after the next interval"
     fi
-
+    log "Sleeping ${SYNC_INTERVAL_SECONDS}s until next sync..."
-{
+    sleep "${SYNC_INTERVAL_SECONDS}" &
-  echo "CONFIG_REPO_URL=${CONFIG_REPO_URL:-}"
+    wait $!
-  echo "CONFIG_REPO_BRANCH=${CONFIG_REPO_BRANCH:-main}"
+done
-  echo "GIT_SSH_KEY_PATH=${GIT_SSH_KEY_PATH}"
-  echo "GNUPGHOME=${GNUPGHOME}"
-  echo "GPG_KEY_ID=${GPG_KEY_ID:-}"
-  echo "${SYNC_CRON} root /usr/local/bin/sync.sh >> /var/log/sync.log 2>&1"
-} > /etc/cron.d/repo-sync
-chmod 0644 /etc/cron.d/repo-sync
-
-touch /var/log/sync.log
-crond
-
-/usr/local/bin/sync.sh || echo "[entrypoint] Initialer Sync fehlgeschlagen, Nginx startet trotzdem."
-
-exec nginx -g 'daemon off;'