diff --git a/scripts/ecr-public-login b/scripts/ecr-public-login index 2e64f6c5..ed7692d1 100755 --- a/scripts/ecr-public-login +++ b/scripts/ecr-public-login @@ -16,6 +16,4 @@ function exit_and_fail() { trap exit_and_fail INT TERM ERR -"${SCRIPTPATH}/install-awscli" - -docker login --username AWS --password="$(aws ecr-public get-login-password --region us-east-1)" "${ECR_REGISTRY}" +docker login --username AWS --password="$(aws ecr-public get-login-password --region us-east-1)" "${ECR_REGISTRY}" \ No newline at end of file diff --git a/scripts/install-awscli b/scripts/install-awscli deleted file mode 100755 index 85e04b19..00000000 --- a/scripts/install-awscli +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -set -euo pipefail - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -BUILD_DIR=$SCRIPTPATH/../build/ - -VERSION="2.1.13" -os=$(uname) -arch=$(uname -m) - -function exit_and_fail() { - echo "❌ Unable to install awscli v${VERSION} for OS ${os} and arch ${arch}" -} -trap exit_and_fail INT TERM ERR - -if [[ "${os}" = "Linux" ]]; then - curl "https://awscli.amazonaws.com/awscli-exe-linux-${arch}-${VERSION}.zip" -o "${BUILD_DIR}/awscliv2.zip" - unzip "${BUILD_DIR}/awscliv2.zip" -d "${BUILD_DIR}/awscliv2" - ${BUILD_DIR}/awscliv2/aws/install -i ${BUILD_DIR}/awscliv2 -b "${BUILD_DIR}" -elif [[ "${os}" = "Darwin" ]]; then - curl "https://awscli.amazonaws.com/AWSCLIV2-${VERSION}.pkg" -o "${BUILD_DIR}/awscliv2.pkg" - CHOICES_XML="${BUILD_DIR}/aws-cli-mac.plist" - cat << EOF > "${CHOICES_XML}" - - - - - - choiceAttribute - customLocation - attributeSetting - ${BUILD_DIR} - choiceIdentifier - default - - - -EOF - installer -pkg ${BUILD_DIR}/awscliv2.pkg \ - -target CurrentUserHomeDirectory \ - -applyChoiceChangesXML "${CHOICES_XML}" - ln -s "${BUILD_DIR}/aws-cli/aws" "${BUILD_DIR}/aws" -else # windows - choco install awscli --version ${VERSION} --force -y || : -fi - -echo "✅ Install AWS CLI v${VERSION} for OS ${os} and arch ${arch}" \ No newline at end of file