Skip to content

Commit 21cf3fb

Browse files
authored
Pull gcc build image from public ECR, bump version (#3108)
- 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.
1 parent 05321f7 commit 21cf3fb

File tree

4 files changed

+2
-120
lines changed

4 files changed

+2
-120
lines changed

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ cni-plugins: get-cni-sources .out-stamp build-ecs-cni-plugins build-vpc-cni-plug
226226

227227
.PHONY: codebuild
228228
codebuild: .out-stamp
229-
./scripts/ci-ecr-pull "us-west-2" 508403128001
230229
$(MAKE) release TARGET_OS="linux"
231230
TARGET_OS="linux" ./scripts/local-save
232231
$(MAKE) docker-release TARGET_OS="windows"

misc/pause-container/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
1111
# express or implied. See the License for the specific language governing
1212
# permissions and limitations under the License.
13-
FROM gcc:7.3.0 as build
13+
FROM public.ecr.aws/docker/library/gcc:11.2.0 as build
1414

1515
WORKDIR /src/
1616
ADD . /src/

scripts/ci-ecr-pull

+1-46
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,4 @@
1515
# limitations under the License.
1616
set -e
1717

18-
dir=$(dirname "${BASH_SOURCE[0]}")
19-
source "$dir/ci-ecr"
20-
21-
AWS_REGION="${1}"
22-
AWS_ACCOUNT_ID="${2}"
23-
24-
usage() {
25-
cat <<EOF
26-
Usage: ${0} AWS_REGION AWS_ACCOUNT_ID
27-
28-
This script attempts to pull the following dockerhub images from ECR:
29-
30-
$IMAGES
31-
32-
It assumes that the ECR images will be formatted like:
33-
34-
AWS_ACCOUNT_ID.dkr.ecr.AWS_REGION.amazonaws.com/ci/IMAGE_OS/IMAGE_ARCH/IMAGE_NAME
35-
36-
(see ci-ecr-push for creating these)
37-
EOF
38-
}
39-
40-
if [ -z "$AWS_REGION" ]; then
41-
usage
42-
exit 1
43-
fi
44-
45-
if [ -z "$AWS_ACCOUNT_ID" ]; then
46-
usage
47-
exit 1
48-
fi
49-
50-
ECR_URI="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
51-
52-
aws --region "$AWS_REGION" ecr get-login-password | docker login --username AWS --password-stdin "$ECR_URI"
53-
54-
for image in $IMAGES; do
55-
imageArch=$(docker version --format "{{.Server.Arch}}")
56-
imageOS=$(docker version --format "{{.Server.Os}}")
57-
fullRepoName="ci/$imageOS/$imageArch/$image"
58-
fullURI="$ECR_URI/$fullRepoName"
59-
echo "PULLING: $fullURI"
60-
# ignore errors if repo doesnt exist or pull fails (fallback to dockerhub)
61-
docker pull "$fullURI" || continue
62-
docker tag "$fullURI" "$image"
63-
done
18+
exit 0

scripts/ci-ecr-push

-72
This file was deleted.

0 commit comments

Comments
 (0)