From a34849f92a48f64d3452006131e04294cbffc8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ellensohn?= Date: Tue, 14 Nov 2023 15:29:24 +0100 Subject: [PATCH] update --- ...cyclonedds_zerotier.xml => cyclonedds.xml} | 0 customize/entrypoint.sh | 20 +++++++++---------- docker-compose.yaml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) rename customize/{cyclonedds_zerotier.xml => cyclonedds.xml} (100%) diff --git a/customize/cyclonedds_zerotier.xml b/customize/cyclonedds.xml similarity index 100% rename from customize/cyclonedds_zerotier.xml rename to customize/cyclonedds.xml diff --git a/customize/entrypoint.sh b/customize/entrypoint.sh index 6f5eb31..9d205c5 100755 --- a/customize/entrypoint.sh +++ b/customize/entrypoint.sh @@ -79,20 +79,20 @@ fi apt update && apt install -y iproute2 # Find the ZeroTier interface name dynamically -zerotier_interface=$(ip addr show | awk '/^.*: zt/{print $2}' | cut -d ':' -f 1) +# zerotier_interface=$(ip addr show | awk '/^.*: zt/{print $2}' | cut -d ':' -f 1) -if [ -z "$zerotier_interface" ]; then - echo "ZeroTier interface not found." - exit 1 -fi +# if [ -z "$zerotier_interface" ]; then +# echo "ZeroTier interface not found." +# exit 1 +# fi -echo "Using ZeroTier interface: $zerotier_interface" +# echo "Using ZeroTier interface: $zerotier_interface" -# Set the path to your CycloneDDS configuration file -config_file="/cyclonedds.xml" +# # Set the path to your CycloneDDS configuration file +# config_file="/cyclonedds.xml" -# Replace the content between tags -sed -i "s|.*|$zerotier_interface|g" "$config_file" +# # Replace the content between tags +# sed -i "s|.*|$zerotier_interface|g" "$config_file" # Execute the command passed into this entrypoint exec "$@" \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 2dcc1d5..a60a6da 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -60,7 +60,7 @@ services: - /tmp/.X11-unix:/tmp/.X11-unix:rw - ${XAUTHORITY:-$HOME/.Xauthority}:/root/.Xauthority - ./customize/entrypoint.sh:/entrypoint.sh - - ./customize/cyclonedds_zerotier.xml:/cyclonedds.xml + - ./customize/cyclonedds.xml:/cyclonedds.xml # networks: # not using bridging anymore, instead try using all services on macvlan? let's see... shoudl word for now. Bridging does definitely not work because multicast is not supported here. # rmp: