diff --git a/Makefile b/Makefile index 5083c8f692..75c3bca8f7 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 2ec202fbd9..2d56f81019 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 0f128b16d3..3372f9cdfd 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 </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