From 40df96bcf3a9a48de62c518ef7f804f8cbfde680 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Mon, 6 Dec 2021 15:35:32 -0800 Subject: [PATCH] update image name to be osrf_lrauv from mbari_lrauv Following up feedback in review Signed-off-by: Tully Foote --- .github/workflows/integration_tests.yaml | 4 ++-- README.md | 10 +++++----- docker/build_and_run_docker.sh | 4 ++-- docker/debug_integration.sh | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index f924ab57..2611ef60 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -14,6 +14,6 @@ jobs: - name: Check out code uses: actions/checkout@v2 - name: Compile tests - run: docker build -t mbari_lrauv . -f docker/tests/Dockerfile + run: docker build -t osrf_lrauv . -f docker/tests/Dockerfile - name: Run tests - run: docker run --rm mbari_lrauv + run: docker run --rm osrf_lrauv diff --git a/README.md b/README.md index 132c6ed5..ad1e5639 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ docker/build_and_run_docker.sh To join in a separate terminal, remember to source Ignition and the workspace: ``` -docker/join.sh mbari_lrauv +docker/join.sh osrf_lrauv . /home/ign_ws/install/setup.bash . /home/colcon_ws/install/setup.bash ``` @@ -47,8 +47,8 @@ docker/join.sh mbari_lrauv ``` cd docker -docker build -t mbari_lrauv -f empty_world/Dockerfile .. -rocker --nvidia --x11 --user mbari_lrauv bash +docker build -t osrf_lrauv -f empty_world/Dockerfile .. +rocker --nvidia --x11 --user osrf_lrauv bash ign launch lrauv_world.ign ``` @@ -57,8 +57,8 @@ ign launch lrauv_world.ign Enter test environment ``` -docker build -t mbari_lrauv_tests -f tests/Dockerfile .. -rocker --nvidia --x11 --user mbari_lrauv_tests bash +docker build -t osrf_lrauv_tests -f tests/Dockerfile .. +rocker --nvidia --x11 --user osrf_lrauv_tests bash ``` Then run anything you want in the environment, unit tests are in `./build/lrauv_ignition_plugins` diff --git a/docker/build_and_run_docker.sh b/docker/build_and_run_docker.sh index abd2187a..b393fba2 100755 --- a/docker/build_and_run_docker.sh +++ b/docker/build_and_run_docker.sh @@ -27,7 +27,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd $DIR # Build the docker image -docker build -t mbari_lrauv -f $DIR/tests/Dockerfile .. +docker build -t osrf_lrauv -f $DIR/tests/Dockerfile .. -rocker --nvidia --x11 --user --user-override-name=developer --user-preserve-home -- mbari_lrauv +rocker --nvidia --x11 --user --user-override-name=developer --user-preserve-home -- osrf_lrauv diff --git a/docker/debug_integration.sh b/docker/debug_integration.sh index 4d5fbdf7..ee47e18a 100755 --- a/docker/debug_integration.sh +++ b/docker/debug_integration.sh @@ -31,6 +31,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd $DIR # Build the docker image -docker build -t mbari_lrauv_tests -f $DIR/tests/Dockerfile .. +docker build -t osrf_lrauv_tests -f $DIR/tests/Dockerfile .. -rocker --nvidia --x11 --user --user-override-name=developer --user-preserve-home -- mbari_lrauv_tests tmuxinator start debug_and_plot -n debug_session -p src/lrauv/docker/tests/debug_integration_mux.yml \ No newline at end of file +rocker --nvidia --x11 --user --user-override-name=developer --user-preserve-home -- osrf_lrauv_tests tmuxinator start debug_and_plot -n debug_session -p src/lrauv/docker/tests/debug_integration_mux.yml \ No newline at end of file