Merge pull request #44 from usdot-fhwa-stol/Fix/docker_image_name

Fix/docker image name

carla-carma-integration/build-image.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-docker build -t carla-carma-integration -f Dockerfile . "$@"
+docker build -t usdotfhwastol/carla-carma-integration -f Dockerfile . "$@"

carla-carma-integration/run.sh

@@ -11,4 +11,4 @@ docker run \
        -it --rm\
        --name carla_carma_integration \
        --net=host \
-       carla-carma-integration:latest
+       usdotfhwastol/carla-carma-integration:latest

co-simulation tool/docker/ns3-docker/README.md

@@ -35,11 +35,11 @@ If you do not have NVIDIA Container Toolkit installed, please refer to this [lin
 ##### Step 1:  Run the following command to build the docker image
 
 ```
-docker build - < Dockerfile -t ns-3-integration
+docker build - < Dockerfile -t usdotfhwastol/carma-xil-cosimulation
 ```
 ##### Step 2: Run docker image with a docker container
 ```
-docker run --rm -it --gpus all --net=host -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 --user=carla_sumo_mosaic ns-3-integration
+docker run --rm -it --gpus all --net=host -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 --user=carla_sumo_mosaic usdotfhwastol/carma-xil-cosimulation
 ```
 ##### Step 3: Copy CARLA and Co-Simulation tool with NS-3 to the docker image and commit them
 
@@ -223,7 +223,7 @@ Once everything is ready, under directory `/ns-3-integration`, simply type:
 
 After the run if there is no issue, commit docker container to docker image
 ```
-docker container commit <container-id> ns-3-integration
+docker container commit <container-id> usdotfhwastol/carma-xil-cosimulation
 ```
 
 Current CARMA XIL Version has a known issue with a port conflict between NS-3 and CARMA-CARLA integration see [#39](https://github.com/usdot-fhwa-stol/carma-simulation/issues/39). The recommended workaround is to run exclusively one or the other module. To run with only NS-3module run **`./mosaic.sh -s Co-simulation`**.

docker-compose.yml

@@ -16,7 +16,7 @@ version: "2"
 services:
   co-simulation:
     privileged: true
-    image: ns-3-integration:latest
+    image: usdotfhwastol/carma-xil-cosimulation:latest
     network_mode: host
     environment:
       - DISPLAY=${DISPLAY}
@@ -31,7 +31,7 @@ services:
     command: bash -c "export NS3_HOME='/ns-3-integration/bin/fed/ns3' && cd /ns-3-integration/ && ./mosaic.sh -s ${map}_${vehicle_num}"
 
   carla-carma-integration:
-    image: carla-carma-integration:latest
+    image: usdotfhwastol/carla-carma-integration:latest
     network_mode: host
     environment:
       - ROS_IP=127.0.0.1