From 50b32c77bdcb275c538e4f475e60a88769bb8947 Mon Sep 17 00:00:00 2001 From: Tommy Persson <tommmy.persson@liu.se> Date: Sun, 6 Sep 2020 22:00:58 +0200 Subject: [PATCH] Work on developer dockers. --- doc/local_ros_installation.md | 18 ++++++++++++++++++ script/base_dji | 2 +- script/dji_system | 2 +- script/exec_common | 2 +- script/exec_dji | 2 +- script/exec_exec | 2 +- script/exec_system | 2 +- script/gazebo | 2 +- script/pull_all_minimal | 2 +- script/rviz_gpu | 2 +- script/rviz_no_gpu | 2 +- script/tst | 2 +- script/wdb | 2 +- 13 files changed, 30 insertions(+), 12 deletions(-) diff --git a/doc/local_ros_installation.md b/doc/local_ros_installation.md index 398bcd1..6369640 100644 --- a/doc/local_ros_installation.md +++ b/doc/local_ros_installation.md @@ -42,6 +42,24 @@ And to clean up: docker system prune ``` +## Scripts + +You should now have help scripts in the path. For example there is a +script tst that is used among other things to start a TST factorty. For example: +```bash +tst roslaunch lrs_launch tst_part.launch ns:=${NS} +``` + +There is one script per minimal docker image and to pull the image do: +```bash +tst pull +``` + +To pull all minimal images do: +```bash +pull_all_minimal +``` + ## How to start differen parts ### Start a ros core locally: diff --git a/script/base_dji b/script/base_dji index e5d4259..ca8c33f 100755 --- a/script/base_dji +++ b/script/base_dji @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/base-dji-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/base-dji-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/dji_system b/script/dji_system index da39f7a..0b8a8e0 100755 --- a/script/dji_system +++ b/script/dji_system @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/dji-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/dji-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/exec_common b/script/exec_common index 94b76d9..ab24a2f 100755 --- a/script/exec_common +++ b/script/exec_common @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/exec-common-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/exec-common-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/exec_dji b/script/exec_dji index 6119d1d..06f90f0 100755 --- a/script/exec_dji +++ b/script/exec_dji @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/exec-dji-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/exec-dji-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/exec_exec b/script/exec_exec index 53d8ace..b9be32c 100755 --- a/script/exec_exec +++ b/script/exec_exec @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/exec-exec-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/exec-exec-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/exec_system b/script/exec_system index 811fb16..10fcd50 100755 --- a/script/exec_system +++ b/script/exec_system @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/exec-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/exec-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/gazebo b/script/gazebo index aac3e6f..3e133df 100755 --- a/script/gazebo +++ b/script/gazebo @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/gazebo-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/gazebo-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/pull_all_minimal b/script/pull_all_minimal index 829c7af..48d286f 100755 --- a/script/pull_all_minimal +++ b/script/pull_all_minimal @@ -2,7 +2,7 @@ base_dji pull dji_system pull -exec_common pull +### exec_common pull ### Why not built and distribued? exec_dji pull exec_exec pull exec_system ull diff --git a/script/rviz_gpu b/script/rviz_gpu index 5509164..e7dc5c9 100755 --- a/script/rviz_gpu +++ b/script/rviz_gpu @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/rviz-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/rviz-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/rviz_no_gpu b/script/rviz_no_gpu index 39fd294..5476033 100755 --- a/script/rviz_no_gpu +++ b/script/rviz_no_gpu @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/rviz-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/rviz-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/tst b/script/tst index 4e307b3..131733f 100755 --- a/script/tst +++ b/script/tst @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/tst-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/tst-minimal:latest if [ $1 = "pull" ]; then docker pull $tag diff --git a/script/wdb b/script/wdb index 80c2f7c..921541d 100755 --- a/script/wdb +++ b/script/wdb @@ -1,6 +1,6 @@ #!/bin/bash -tag=gitlab.liu.se:5000/lrs/lrs_docker_images/wdb-minimal:v01 +tag=gitlab.liu.se:5000/lrs/waraps_docker_images/wdb-minimal:latest if [ $1 = "pull" ]; then docker pull $tag -- GitLab