diff --git a/docker/Dockerfile b/docker/Dockerfile index 802cf36..4e3fe35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,10 +5,11 @@ 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 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"