fix getting ip-address

Signed-off-by: Simon L <[email protected]>
nextcloud · Nov 8, 2023 · 43ad776 · 43ad776
1 parent ebac4c9
commit 43ad776
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
@@ -31,7 +31,8 @@ RUN set -ex; \
         ca-certificates \
         openssl \
         bind-tools \
-        netcat-openbsd; \
+        netcat-openbsd \
+        grep; \
     \
     sed -i \
             -e '/^Listen /d' \

diff --git a/Containers/apache/start.sh b/Containers/apache/start.sh
@@ -18,7 +18,7 @@ while ! nc -z "$NEXTCLOUD_HOST" 9000; do
 done
 
 # Get ipv4-address of Apache
-IPv4_ADDRESS="$(dig nextcloud-aio-apache A +short +search | head -1)"
+IPv4_ADDRESS="$(hostname -i | grep -oP '[0-9]+\.[0-9]+.[0-9]+\.[0-9]+' | head -1)"
 # Bring it in CIDR notation
 # shellcheck disable=SC2001
 IPv4_ADDRESS="$(echo "$IPv4_ADDRESS" | sed 's|[0-9]\+$|1/32|')"

diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile
@@ -65,7 +65,8 @@ RUN set -ex; \
         libusrsctp \
         libwebsockets \
         \
-        shadow; \
+        shadow \
+        grep; \
     useradd --system -u 1000 eturnal; \
     apk del --no-cache \
         shadow; \

diff --git a/Containers/talk/start.sh b/Containers/talk/start.sh
@@ -19,7 +19,7 @@ elif [ -z "$INTERNAL_SECRET" ]; then
 fi
 
 set -x
-IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk IN A +short +search | grep '^[0-9.]\+$' | sort | head -n1)"
+IPv4_ADDRESS_TALK="$(hostname -i | grep -oP '[0-9]+\.[0-9]+.[0-9]+\.[0-9]+' | head -1)"
 IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short +search | grep '^[0-9a-f:]\+$' | sort | head -n1)"
 set +x
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ elif [ -z "$INTERNAL_SECRET" ]; then @@
     fi
     set -x
-    IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk IN A +short +search | grep '^[0-9.]\+$' | sort | head -n1)"
+    IPv4_ADDRESS_TALK="$(hostname -i | grep -oP '[0-9]+\.[0-9]+.[0-9]+\.[0-9]+' | head -1)"
     IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short +search | grep '^[0-9a-f:]\+$' | sort | head -n1)"
     set +x
@@ Expand Down @@