updated build-image and checkout.sh for test option (#31)

* updated build-image and checkout.sh for test option * updated for develop option * added -r to checkout.sh
usdot-fhwa-stol · Apr 22, 2020 · 515e72f · 515e72f
1 parent 3c0a5f3
commit 515e72f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
           name: Pull Deps
           command: |
             source ${INIT_ENV}
-            ./src/CARMAAvtVimbaDriver/docker/checkout.sh ${PWD}
+            ./src/CARMAAvtVimbaDriver/docker/checkout.sh -r ${PWD}
       - run:
           name: Build Driver
           command: |

diff --git a/docker/build-image.sh b/docker/build-image.sh
@@ -39,6 +39,11 @@ while [[ $# -gt 0 ]]; do
             PUSH=true
             shift
             ;;
+        -d|--develop)
+            USERNAME=usdotfhwastoldev
+            COMPONENT_VERSION_STRING=develop
+            shift
+            ;;
     esac
 done
 
@@ -50,10 +55,18 @@ echo "Building docker image for $IMAGE version: $COMPONENT_VERSION_STRING"
 echo "Final image name: $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING"
 
 cd ..
-docker build --no-cache -t $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING \
-    --build-arg VERSION="$COMPONENT_VERSION_STRING" \
-    --build-arg VCS_REF=`git rev-parse --short HEAD` \
-    --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` .
+if [[ $COMPONENT_VERSION_STRING = "test" ]]; then
+    sed "s|usdotfhwastol|$USERNAME|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$COMPONENT_VERSION_STRING|g; s|checkout.sh|checkout.sh -d|g" \
+        Dockerfile | docker build -f - --no-cache -t $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING \
+        --build-arg VERSION="$COMPONENT_VERSION_STRING" \
+        --build-arg VCS_REF=`git rev-parse --short HEAD` \
+        --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` .
+else
+    docker build --no-cache -t $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING \
+        --build-arg VERSION="$COMPONENT_VERSION_STRING" \
+        --build-arg VCS_REF=`git rev-parse --short HEAD` \
+        --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` .
+fi
 
 TAGS=()
 TAGS+=("$USERNAME/$IMAGE:$COMPONENT_VERSION_STRING")

diff --git a/docker/checkout.sh b/docker/checkout.sh
@@ -20,8 +20,23 @@
 set -ex
 
 dir=~
-if [[ -n ${1} ]]; then
-      dir=${1}
-fi
+while [[ $# -gt 0 ]]; do
+      arg="$1"
+      case $arg in
+            -d|--develop)
+                  BRANCH=develop
+                  shift
+            ;;
+            -r|--root)
+                  dir=$2
+                  shift
+                  shift
+            ;;
+      esac
+done
 
-git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch CARMAMsgs_1.1.0 --depth 1
+if [[ "$BRANCH" = "develop" ]]; then
+      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/CARMAMsgs --branch $BRANCH --depth 1
+else
+      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch CARMAMsgs_1.1.0 --depth 1
+fi
diff --git a/hooks/pre_build b/hooks/pre_build
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ "$SOURCE_BRANCH" = "develop" ]]; then
+    # add -t flag to checkout.sh and update image dependencies
+    sed -i "s|/checkout.sh|/checkout.sh -d|g; s|usdotfhwastol|usdotfhwastoldev|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:develop|g" \
+        Dockerfile
+fi