From ffe5ca3ee0af6b3d0a4ffe11f4d2de9d9ba151e7 Mon Sep 17 00:00:00 2001
From: Nate Koenig <nate@openrobotics.org>
Date: Thu, 28 May 2020 07:23:52 -0700
Subject: [PATCH] Support aws cli version 2

Signed-off-by: Nate Koenig <nate@openrobotics.org>
---
 subt_ign/scripts/subt_docker.bash | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/subt_ign/scripts/subt_docker.bash b/subt_ign/scripts/subt_docker.bash
index dc23dfea..9629c588 100755
--- a/subt_ign/scripts/subt_docker.bash
+++ b/subt_ign/scripts/subt_docker.bash
@@ -28,7 +28,15 @@ fi
 
 # Log into docker
 echo "Logging into docker"
-$(aws ecr get-login --no-include-email --region us-east-1)
+awsVersion=`aws --version`
+if [[ "$awsVersion" == *"aws-cli/1"* ]]; then
+  $(aws ecr get-login --no-include-email --region us-east-1)
+elif [[ "$awsVersion" == *"aws-cli/2"* ]]; then
+  $(aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 200670743174.dkr.ecr.us-east-1.amazonaws.com)
+else
+  echo "Unsupported aws cli version $awsVersion"
+  exit
+fi
 
 if [ $? != 0 ]; then
   echo "Failed to log into docker. Check your AWS credentials."