From ab50a2f2da3eaed5dfd69f4b3dfdc65513489232 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Thu, 9 Jul 2026 19:00:05 -0400
Subject: [PATCH] Dockerfile: Add iproute2 package to runtime images;
 startapp.sh: Fix exec command syntax for running Java application

---
 Dockerfile                | 6 +++---
 docker/rootfs/startapp.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 326c85d85..a81ee427c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,15 +19,15 @@ RUN apk add --no-cache gettext tar bzip2 curl openjdk21 \
 # --- Runtime stages per architecture ---
 
 FROM debian:bookworm-slim AS runtime-amd64
-RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu \
+RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu iproute2 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM debian:bookworm-slim AS runtime-arm64
-RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu \
+RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu iproute2\
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 FROM debian:bookworm-slim AS runtime-arm
-RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu \
+RUN apt-get update && apt-get install -y --no-install-recommends openjdk-17-jre-headless fonts-dejavu iproute2 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Select runtime based on target architecture
diff --git a/docker/rootfs/startapp.sh b/docker/rootfs/startapp.sh
index e34c7602c..143e3fc4e 100644
--- a/docker/rootfs/startapp.sh
+++ b/docker/rootfs/startapp.sh
@@ -79,4 +79,4 @@ mkdir -p "$HOME/.i2p" && chown -R i2p:i2p "$HOME/.i2p"
 
 # Execute the Java application with the constructed classpath and options
 # The `exec` command replaces the shell with the Java process, ensuring that it receives signals directly and can shut down gracefully.
-exec -runuser i2p "java -cp "${CLASSPATH}" ${JAVAOPTS} ${JAVA17OPTS} net.i2p.router.RouterLaunch"
+exec runuser -u i2p -- java -cp "${CLASSPATH}" ${JAVAOPTS} ${JAVA17OPTS} net.i2p.router.RouterLaunch