[fix] Fix 'ros_entrypoint.sh'

Author: ShigemichiMatsuzaki

docker-compose.yml

@@ -2,7 +2,7 @@ version: "2.3"
 services: 
   pytorch-train:
     container_name: pytorch-train
-    image: aisl/pytorch:latest
+    image: aisl/pytorch-enet:latest
     runtime: nvidia
     build: .
     command: >
@@ -19,7 +19,7 @@ services:
 
   tensorboard:
     container_name: tensorboard
-    image: aisl/pytorch:latest
+    image: aisl/pytorch-enet:latest
     command: tensorboard --logdir /root/PyTorch-ENet/runs
     build: .
     ports:
@@ -41,7 +41,7 @@ services:
       - master
     build: .
     runtime: nvidia
-    image: aisl/pytorch:latest
+    image: aisl/pytorch-enet:latest
     command: roslaunch pytorch_enet_ros pytorch_enet_ros.launch
     environment:
       - ROS_MASTER_URI=http://pytorch-ros-master:11311
@@ -55,12 +55,10 @@ services:
 
   catkin-build:
     container_name: catkin-build
-    depends_on:
-      - master
     build: .
     runtime: nvidia
-    image: aisl/pytorch:latest
-    entrypoint: bash -c "cd /root/catkin_ws && catkin build"
+    image: aisl/pytorch-enet:latest
+    command: bash -c "cd /root/catkin_ws && catkin build"
     environment:
       - ROS_MASTER_URI=http://pytorch-ros-master:11311
     volumes:

ros_entrypoint.sh

@@ -4,13 +4,13 @@ set -e
 g_setup=/opt/ros/$ROS_DISTRO/setup.bash
 l_setup=/root/catkin_ws/devel/setup.bash
 
-if [ ! -f $g_setup ]; then
+if [ -f $g_setup ]; then
   source $g_setup
 else
   echo "$g_setup not found"
 fi
 
-if [ ! -f $l_setup ]; then
+if [ -f $l_setup ]; then
   source $l_setup
 else
   echo "$l_setup not found"