From e0c3f12466fe1f13d498e29ccccfe07a33356d4f Mon Sep 17 00:00:00 2001
From: Cameron Sparr <sparrc@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:16:35 -0800
Subject: [PATCH] Pull gcc build image from public ECR

- Change dockerhub gcc image to public ecr
- gcc version 7.3.0 is not available on public ecr, so just bumped
  version to the latest version available
- Also removed the ci-ecr-pull/push scripts as these are no longer
  necessary, since we have no more dockerhub images in our build or test
  workflows.
---
 Makefile                        |  1 -
 misc/pause-container/Dockerfile |  2 +-
 scripts/ci-ecr-pull             | 47 +--------------------
 scripts/ci-ecr-push             | 72 ---------------------------------
 4 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100755 scripts/ci-ecr-push

diff --git a/Makefile b/Makefile
index 5083c8f692e..75c3bca8f7f 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,6 @@ cni-plugins: get-cni-sources .out-stamp build-ecs-cni-plugins build-vpc-cni-plug
 
 .PHONY: codebuild
 codebuild: .out-stamp
-	./scripts/ci-ecr-pull "us-west-2" 508403128001
 	$(MAKE) release TARGET_OS="linux"
 	TARGET_OS="linux" ./scripts/local-save
 	$(MAKE) docker-release TARGET_OS="windows"
diff --git a/misc/pause-container/Dockerfile b/misc/pause-container/Dockerfile
index 2ec202fbd9e..2d56f810198 100644
--- a/misc/pause-container/Dockerfile
+++ b/misc/pause-container/Dockerfile
@@ -10,7 +10,7 @@
 # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
-FROM gcc:7.3.0 as build
+FROM public.ecr.aws/docker/library/gcc:11.2.0 as build
 
 WORKDIR /src/
 ADD . /src/
diff --git a/scripts/ci-ecr-pull b/scripts/ci-ecr-pull
index 0f128b16d3f..3372f9cdfd7 100755
--- a/scripts/ci-ecr-pull
+++ b/scripts/ci-ecr-pull
@@ -15,49 +15,4 @@
 # limitations under the License.
 set -e
 
-dir=$(dirname "${BASH_SOURCE[0]}")
-source "$dir/ci-ecr"
-
-AWS_REGION="${1}"
-AWS_ACCOUNT_ID="${2}"
-
-usage() {
-    cat <<EOF
-Usage: ${0} AWS_REGION AWS_ACCOUNT_ID
-
-This script attempts to pull the following dockerhub images from ECR:
-
-$IMAGES
-
-It assumes that the ECR images will be formatted like:
-
-AWS_ACCOUNT_ID.dkr.ecr.AWS_REGION.amazonaws.com/ci/IMAGE_OS/IMAGE_ARCH/IMAGE_NAME
-
-(see ci-ecr-push for creating these)
-EOF
-}
-
-if [ -z "$AWS_REGION" ]; then
-    usage
-    exit 1
-fi
-
-if [ -z "$AWS_ACCOUNT_ID" ]; then
-    usage
-    exit 1
-fi
-
-ECR_URI="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
-
-aws --region "$AWS_REGION" ecr get-login-password | docker login --username AWS --password-stdin "$ECR_URI"
-
-for image in $IMAGES; do
-    imageArch=$(docker version --format "{{.Server.Arch}}")
-    imageOS=$(docker version --format "{{.Server.Os}}")
-    fullRepoName="ci/$imageOS/$imageArch/$image"
-    fullURI="$ECR_URI/$fullRepoName"
-    echo "PULLING: $fullURI"
-    # ignore errors if repo doesnt exist or pull fails (fallback to dockerhub)
-    docker pull "$fullURI" || continue
-    docker tag "$fullURI" "$image"
-done
+exit 0
diff --git a/scripts/ci-ecr-push b/scripts/ci-ecr-push
deleted file mode 100755
index 920a7afd6b3..00000000000
--- a/scripts/ci-ecr-push
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/bash
-
-# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the
-# "License"). You may not use this file except in compliance
-#  with the License. A copy of the License is located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and
-# limitations under the License.
-set -e
-
-dir=$(dirname "${BASH_SOURCE[0]}")
-source "$dir/ci-ecr"
-
-AWS_REGION="${1}"
-AWS_ACCOUNT_ID="${2}"
-
-usage() {
-    cat <<EOF
-Usage: ${0} AWS_REGION AWS_ACCOUNT_ID
-
-This script attempts to pull the following images from dockerhub locally and then
-push them to an ECR repo:
-
-$IMAGES
-
-It pushes them to an ECR repo named like:
-
-AWS_ACCOUNT_ID.dkr.ecr.AWS_REGION.amazonaws.com/ci/IMAGE_OS/IMAGE_ARCH/IMAGE_NAME
-
-(see ci-ecr-pull for pulling these instead of docker)
-EOF
-}
-
-if [ -z "$AWS_REGION" ]; then
-    usage
-    exit 1
-fi
-
-if [ -z "$AWS_ACCOUNT_ID" ]; then
-    usage
-    exit 1
-fi
-
-ECR_URI="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
-
-aws --region "$AWS_REGION" ecr get-login-password | docker login --username AWS --password-stdin "$ECR_URI"
-
-for image in $IMAGES; do
-    docker pull "$image"
-    repotag=(${image//:/ })
-    repo="${repotag[0]}"
-    tag="${repotag[1]}"
-    imageOS=$(docker image inspect "$image" --format "{{.Os}}")
-    imageArch=$(docker image inspect "$image" --format "{{.Architecture}}")
-
-    fullRepoName="ci/$imageOS/$imageArch/$repo"
-    if ! aws --region "$AWS_REGION" ecr describe-repositories --repository-names "$fullRepoName" &>/dev/null; then
-        aws --region "$AWS_REGION" ecr create-repository --repository-name "$fullRepoName"
-        echo "CREATED $ECR_URI/$fullRepoName"
-    fi
-
-    docker tag "$image" "$ECR_URI/$fullRepoName:$tag"
-    docker push "$ECR_URI/$fullRepoName:$tag"
-    echo "PUSHED $ECR_URI/$fullRepoName:$tag"
-done