Rename Docker image and minor fix for build script

README.md

@@ -137,28 +137,28 @@ At the moment, MBARI WEC is supported by source installation only. Use Ubuntu Ja
    If you have an NVIDIA graphics card
    ```
    ./build.bash nvidia_opengl_ubuntu22
-   ./build.bash buoy
+   ./build.bash mbari_wec
    ```
    Otherwise
    ```
-   ./build.bash buoy --no-nvidia
+   ./build.bash mbari_wec --no-nvidia
    ```
 
 1. Run the container
 
    If you have an NVIDIA graphics card
    ```
-   ./run.bash buoy
+   ./run.bash mbari_wec
    ```
    Otherwise
    ```
-   ./run.bash buoy --no-nvidia
+   ./run.bash mbari_wec --no-nvidia
    ```
 
 1. To have another window running the same docker container, run this command in a new terminal:
 
    ```
-   ./join.bash buoy
+   ./join.bash mbari_wec
    ```
 
 ### Quick start
@@ -188,3 +188,31 @@ This sources the compiled workspace and launches the simulation:
    ```
    ros2 launch buoy_gazebo mbari_wec.launch.py
    ```
+
+# For maintainers only: To upload to DockerHub
+
+Make sure you have permissions to push to the
+[MBARI organization on DockerHub](https://hub.docker.com/u/mbari).
+This permission is given by the MBARI administrator.
+
+Build the `mbari_wec` Docker image, as detailed above.
+
+Find the image ID for `mbari_wec`:
+```
+docker images
+```
+
+Tag the image with the destination name:
+```
+docker tag <IMAGE ID> mbari/mbari_wec:latest
+```
+
+Push to the [`mbari/mbari_wec` public image](https://hub.docker.com/r/mbari/mbari_wec).
+```
+docker push mbari/mbari_wec:latest
+```
+
+You may have to log in for it to recognize your permissions:
+```
+docker login
+```

docker/build.bash

@@ -57,7 +57,7 @@ while (( "$#" )); do
       ;;
   esac
 done
-# set positional arguments in their proper place
+# Set positional arguments in their proper place
 eval set -- "$PARAMS"
 
 if [ ! -d $DIR/$1 ]
@@ -75,6 +75,9 @@ echo "Building $image_name with base image $base"
 docker build --rm -t $image_plus_tag --build-arg base=$base --build-arg user_id=$user_id $DIR/$image_name
 echo "Built $image_plus_tag"
 
-# Extra tag in case you have both the NVIDIA and no-NVIDIA images
-docker tag $image_plus_tag $image_name$image_suffix:latest
-echo "Tagged as $image_name$image_suffix:latest"
+# Don't add extra tag if just building the NVIDIA image
+if [[ "$image_name" != nvidia_opengl_ubuntu22 ]]; then
+  # Extra tag in case you have both the NVIDIA and no-NVIDIA images
+  docker tag $image_plus_tag $image_name$image_suffix:latest
+  echo "Tagged as $image_name$image_suffix:latest"
+fi

docker/run.bash

@@ -55,7 +55,9 @@ done
 # set positional arguments in their proper place
 eval set -- "$PARAMS"
 
-IMG=$(basename $1)
+#IMG=$(basename $1)
+# Use this for image repos with a slash "/" in the name
+IMG=$1
 
 ARGS=("$@")
 WORKSPACES=("${ARGS[@]:1}")