[Docker] add an argument, AERO_TYPE

seed-solutions · May 30, 2019 · ffd9217 · ffd9217
1 parent 36d42cc
commit ffd9217
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,17 +9,16 @@ services:
 
 env:
   - DISTR=indigo  BASEIMG=ros:indigo-robot
-  - DISTR=kinetic BASEIMG=ros:kinetic-robot
-  - DISTR=melodic BASEIMG=ros:melodic-robot
-  
+  - DISTR=kinetic BASEIMG=osrf/ros:kinetic-desktop
+  - DISTR=melodic BASEIMG=osrf/ros:melodic-desktop
+
 before_script:
   - docker pull ${BASEIMG}
 
 script:
   - docker build -f Dockerfile.${DISTR} --tag ros:aero_${DISTR} --build-arg RUN_TESTS=true .
- 
+
 matrix:
   allow_failures:
     - env: DISTR=indigo  BASEIMG=ros:indigo-robot
-    - env: DISTR=melodic BASEIMG=ros:melodic-robot
-
+    - env: DISTR=melodic BASEIMG=osrf/ros:melodic-desktop
diff --git a/Dockerfile.kinetic b/Dockerfile.kinetic
@@ -1,9 +1,10 @@
-FROM ros:kinetic-robot
+FROM osrf/ros:kinetic-desktop
 SHELL ["bash", "-c"]
 
 ENV WORKSPACE /catkin_ws
 
 ARG RUN_TESTS=false
+ARG AERO_TYPE=typeF
 
 # prepare catkin and all euslisp packages
 RUN apt-get -q -qq update && apt-get -q -qq install -y \
@@ -31,7 +32,7 @@ RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
 
 WORKDIR ${WORKSPACE}/src/aero-ros-pkg/aero_description
 RUN source ${WORKSPACE}/devel/setup.bash \
-    && ./setup.sh typeF
+    && ./setup.sh $AERO_TYPE
 
 WORKDIR ${WORKSPACE}
 ## build check

diff --git a/Dockerfile.melodic b/Dockerfile.melodic
@@ -1,9 +1,10 @@
-FROM ros:melodic-robot
+FROM osrf/ros:melodic-desktop
 SHELL ["bash", "-c"]
 
 ENV WORKSPACE /catkin_ws
 
 ARG RUN_TESTS=false
+ARG AERO_TYPE=typeF
 
 # prepare catkin and all euslisp packages
 RUN apt-get -q -qq update && apt-get -q -qq install -y \
@@ -31,7 +32,7 @@ RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
 
 WORKDIR ${WORKSPACE}/src/aero-ros-pkg/aero_description
 RUN source ${WORKSPACE}/devel/setup.bash \
-    && ./setup.sh typeF
+    && ./setup.sh $AERO_TYPE
 
 WORKDIR ${WORKSPACE}
 ## build check