From e587dc5082903b16847d718deef994bc7a5c93c5 Mon Sep 17 00:00:00 2001 From: Antoine Lima <antoine.lima@hds.utc.fr> Date: Tue, 23 May 2023 11:27:46 +0200 Subject: [PATCH] Fixed X & bash_history --- .gitignore | 2 ++ README.md | 2 ++ bash_history | 0 docker-compose.yml | 7 ++++--- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 bash_history diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..30f3787 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +workspace/ +bash_history diff --git a/README.md b/README.md index f01b129..486bb08 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ Docker image fitted with the right packages for SY31 + compose file to run smoot 3. Run `docker-compose up -d` to start the service as detached 4. Run `docker-compose run ros` +By default, a bash history will be synced with the one in this repo and a `workspace` folder will be created to export your work. + ## Update the image A Gitlab CI is setup to build and push an image to [registry.gitlab.utc.fr/sy31/docker](registry.gitlab.utc.fr/sy31/docker) with the lastest `Dockerfile`. diff --git a/bash_history b/bash_history new file mode 100644 index 0000000..e69de29 diff --git a/docker-compose.yml b/docker-compose.yml index 8f8cb23..5a9f74e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.2' +version: '3.8' services: ros: # uncomment build and comment image to build directly from Dockerfile @@ -7,11 +7,12 @@ services: network_mode: "host" # Share network with the turtlebot to freely communicate with it container_name: ros-sy31 volumes: - - ~/sy31_workspace:/home/ws # local_machine_path:container_path + - ./workspace:/root/ws + - ./bash_history:/root/.bash_history - /tmp/.X11-unix:/tmp/.X11-unix:rw # redirection X11 environment: - QT_X11_NO_MITSHM=1 - ROS_MASTER_URI=http://192.168.1.1:11311 # Reference turtlebot as the master - ROS_IP=192.168.1.138 # Adapt to current IP - TURTLEBOT3_MODEL=burger - - DISPLAY + - DISPLAY=:0 -- GitLab