Merge branch 'master' into 'master'

Detect When Running as a Podman Container See merge request i2p-hackers/i2p.i2p!84
i2p · Mar 18, 2023 · 3ab904f · 3ab904f
2 parents ae4d3b5 + c71a428
commit 3ab904f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docker/rootfs/startapp.sh b/docker/rootfs/startapp.sh
@@ -22,7 +22,7 @@ for jar in `ls lib/*.jar`; do
     CLASSPATH=${CLASSPATH}:${jar}
 done
 
-if [ -f /.dockerenv ]; then
+if [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then
     echo "[startapp] Running in container"
     if [ -z "$IP_ADDR" ]; then
         export IP_ADDR=$(hostname -i)