if XRCE_DOMAIN_ID_OVERRIDE is not set try to set it from ROS_DOMAIN_ID

husarion · Aug 9, 2023 · 3d163fb · 3d163fb
1 parent 9b5c326
commit 3d163fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml
@@ -34,7 +34,7 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v2
       with:
-        platforms: linux/amd64, linux/arm64
+        platforms: linux/amd64 #, linux/arm64
         push: true
         build-args: |
           MICRO_XRCE_DDS_AGENT_RELEASE=${{ env.MICRO_XRCE_DDS_AGENT_RELEASE }}

diff --git a/Dockerfile b/Dockerfile
@@ -50,6 +50,9 @@ RUN curl -L https://github.com/husarnet/husarnet-dds/releases/download/${HUSARNE
 # =======================
 FROM ubuntu:22.04
 
+ENV ROS_DOMAIN_ID=
+ENV XRCE_DOMAIN_ID_OVERRIDE=
+
 WORKDIR /root
 
 COPY --from=build /agent/install/ /usr/local/

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -6,4 +6,11 @@ if [[ "$HUSARNET_DDS_DEBUG" == "TRUE" ]]; then
   echo "$output"
 fi
 
+if [ -z "${XRCE_DOMAIN_ID_OVERRIDE}" ]; then
+  if [ -n "${ROS_DOMAIN_ID}" ]; then
+    export XRCE_DOMAIN_ID_OVERRIDE="${ROS_DOMAIN_ID}"
+  fi
+fi
+
+
 exec "$@"