From 1415405292d0b3d458d995a4461b731c8c7024fb Mon Sep 17 00:00:00 2001
From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com>
Date: Thu, 3 Jun 2021 22:45:21 -0400
Subject: [PATCH 1/2] Updating version numbers for CARMA release 3.6.0

---
 Dockerfile           | 2 +-
 docker/checkout.bash | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5deedfbe..937800d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 #  License for the specific language governing permissions and limitations under
 #  the License.
 
-FROM usdotfhwastoldev/carma-base:develop as base
+FROM usdotfhwastol/carma-base:carma-system-3.6.0 as base
 FROM base as setup
 
 RUN mkdir ~/src
diff --git a/docker/checkout.bash b/docker/checkout.bash
index fc94822c..c13874c3 100755
--- a/docker/checkout.bash
+++ b/docker/checkout.bash
@@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ "$BRANCH" = "develop" ]]; then
-      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1
-      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1
+      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.6.0
+      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.6.0
 else
-      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1
-      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1
+      git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.6.0
+      git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.6.0
 fi

From 751d731b7a179c42162c9f6f76759690b5613843 Mon Sep 17 00:00:00 2001
From: SaikrishnaBairamoni <saikrishna.bairamoni@leidos.com>
Date: Tue, 8 Jun 2021 02:53:50 -0400
Subject: [PATCH 2/2] Update version number 3.6.0

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 088733d8..b3f1d7d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
     # Pull docker image from docker hub
     # XTERM used for better catkin_make output
     docker:
-      - image: usdotfhwastoldev/carma-base:develop
+      - image: usdotfhwastol/carma-base:carma-system-3.6.0
         user: carma
         environment:
           TERM: xterm