From 61e01c61fee47e24f1525f0979aed204254f6243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ellensohn?= Date: Mon, 13 Nov 2023 16:24:55 +0100 Subject: [PATCH 1/2] update --- docker-compose.yaml | 4 ++-- docker/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a1a2bb9..0cb778a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -421,7 +421,7 @@ services: #- linux/arm64 - linux/amd64 # Networking and IPC for ROS 2 - #network_mode: host + network_mode: host ipc: host environment: - ROS_DOMAIN_ID=5 @@ -433,7 +433,7 @@ services: command: > roscore extends: ros1bridge - #network_mode: host + network_mode: host ipc: host environment: - ROS_DOMAIN_ID=5 diff --git a/docker/Dockerfile b/docker/Dockerfile index af8fe2c..74678e2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ ARG TARGETPLATFORM # Variable TARGETPLATFORM should be auomatically created during build process by docker. ######################################## -# Base Image for Bot Mini Control # +# Base Image for RMP Control # ######################################## FROM ros:${ROS_DISTRO} as base ENV ROS_DISTRO=${ROS_DISTRO} From cc9e84479cfb364a8afe0fb3e00c264ba4e2d919 Mon Sep 17 00:00:00 2001 From: bjoernellens1 <64093272+bjoernellens1@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:28:26 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 42ea1fe..cf3ee49 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,24 @@ For the build with docker buildx bake you will need binfmt dependencies for arm64 architecture, as we are doing a multiplatform build (Works on PCs as well as Jetson Nano, Raspberry Pi, Apple Silicon Devices). For Robot: +``` docker buildx bake overlay --load docker buildx bake overlay --push +``` e.g.: +``` docker compose up -d controller - +``` For PC: +``` docker buildx bake guis --load docker buildx bake guis --push +``` --> get into container shell: +``` docker compose run guis +``` or -docker compose up rviz2 \ No newline at end of file +``` +docker compose up rviz2 +```