From cd9436c8271014d8fe10c0ad88b7c218d4f2b202 Mon Sep 17 00:00:00 2001
From: Joshua Spiewak <jss@rstudio.com>
Date: Mon, 27 Apr 2020 14:49:06 -0400
Subject: [PATCH] Revert usage of AWS CLI 1.17.10+ parameter

Until we update the Jenkins agent AMI
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index acd0046..9cd493c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ docker-shell-r-env:
 	@cd builder && docker-compose run --entrypoint /bin/bash ubuntu-1604
 
 ecr-login:
-	(aws ecr get-login-password --region $(AWS_REGION) | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com)
+	@eval $(shell aws ecr get-login --no-include-email --region $(AWS_REGION))
 
 fetch-serverless-custom-file:
 	aws s3 cp s3://rstudio-serverless/serverless/r-builds/serverless-custom.yml .