Merge pull request #27 from usdot-fhwa-stol/master

Testarossa / System_3.2.0 merge to develop

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
     # Pull docker image from docker hub
     # XTERM used for better catkin_make output
     docker:
-      - image: usdotfhwastol/carma-base:3.3.0
+      - image: usdotfhwastol/carma-base:3.4.0
         user: carma
         environment:
           TERM: xterm

Dockerfile

@@ -12,14 +12,14 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-FROM usdotfhwastol/carma-base:3.3.0 as setup
+FROM usdotfhwastol/carma-base:3.4.0 as setup
 
 RUN mkdir ~/src
 COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver
 RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.sh
 RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh
 
-FROM usdotfhwastol/carma-base:3.3.0
+FROM usdotfhwastol/carma-base:3.4.0
 
 ARG BUILD_DATE="NULL"
 ARG VERSION="NULL"

docker/build-image.sh

@@ -17,7 +17,7 @@
 USERNAME=usdotfhwastol
 
 cd "$(dirname "$0")"
-IMAGE=$(./get-package-name.sh | tr '[:upper:]' '[:lower:]')
+IMAGE=$(./get-image-name.sh | tr '[:upper:]' '[:lower:]')
 
 echo ""
 echo "##### $IMAGE Docker Image Build Script #####"

docker/checkout.sh

@@ -24,4 +24,4 @@ if [[ -n ${1} ]]; then
       dir=${1}
 fi
 
-git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch develop --depth 1
+git clone https://github.com/usdot-fhwa-stol/CARMAMsgs.git ${dir}/src/CARMAMsgs --branch CARMAMsgs_1.1.0 --depth 1