From 909e79e0de164de62bd2a67408303401c169de0e Mon Sep 17 00:00:00 2001 From: openhands Date: Sat, 15 Aug 2026 17:09:39 +0000 Subject: [PATCH 1/2] Standardize Docker compose to use COPY instead of volume mounts - Add COPY directive to Dockerfile to copy source into image - Change compose.yml build context to parent directory with explicit dockerfile path - Remove source volume mounts from compose.yml - Keep X11/privileged volumes where required for GUI/USB access - Fix incorrect directory names in Dockerfiles (matching repo name) - Fix incorrect service names in compose.yml (matching repo name) This PR was created by an AI agent (OpenHands) on behalf of mmmarinho. --- docker/Dockerfile | 3 ++- docker/compose.yml | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 802cf36..642a1e7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,4 +11,5 @@ RUN cd /root/sas_datalogger \ && . install.sh RUN sudo sudo apt-get remove -y ros-jazzy-sas-datalogger -RUN mkdir -p /root/sas_robot_datalogger_devel/src/ \ No newline at end of file +RUN mkdir -p /root/sas_datalogger_devel/src/ +COPY . /root/sas_datalogger_devel/src/sas_datalogger \ No newline at end of file diff --git a/docker/compose.yml b/docker/compose.yml index 36c98bf..b0c3ed1 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -1,13 +1,13 @@ services: sas_datalogger: - build: . + build: + context: .. + dockerfile: docker/Dockerfile environment: TIMEOUT: 20 PYTHONUNBUFFERED: 1 DISPLAY: ":99" - volumes: - - ../../sas_datalogger:/root/sas_datalogger_devel/src/sas_datalogger command: /bin/bash -c " cd /root/sas_datalogger_devel/src/sas_datalogger/docker - && chmod +x test.sh - && ./test.sh" \ No newline at end of file + && chmod +x test.sh + && ./test.sh" From 5c84e04a20de704b7a8668ace48e1bdbb075ee24 Mon Sep 17 00:00:00 2001 From: openhands Date: Sat, 15 Aug 2026 17:28:55 +0000 Subject: [PATCH 2/2] Fix COPY path for install.sh with new build context The build context changed from '.' (docker/) to '..' (repo root), so 'COPY install.sh' must become 'COPY docker/install.sh'. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 642a1e7..4e3fe35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ ENV BASH_ENV="/etc/bash_env" RUN sudo apt-get update && sudo apt-get upgrade -y -COPY install.sh /root/sas_datalogger/ +COPY docker/install.sh /root/sas_datalogger/ RUN cd /root/sas_datalogger \ && chmod +x install.sh \ && . install.sh