Skip to content

Commit

Permalink
update image name to be osrf_lrauv from mbari_lrauv
Browse files Browse the repository at this point in the history
Following up feedback in review

Signed-off-by: Tully Foote <[email protected]>
  • Loading branch information
tfoote committed Dec 6, 2021
1 parent 817535b commit 40df96b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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
```

Expand All @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions docker/build_and_run_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions docker/debug_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

0 comments on commit 40df96b

Please sign in to comment.