Skip to content

Commit fb45daa

Browse files
committed
make aws default docker registry in remaining scripts
AWS has much better anonymous pull request limits (1 per second) vs docker hub which is 100 per 6 hours per IP address. A lot of our CI and development occurs on shared systems so it's easy to exceed this limit on an IP basis. Tested: - Verified no setting for DOCKER_REG and a setting of docker.io work as expected within these scripts Change-Id: Ic5cb5ee07ee83567b6cf26754b6d1045025bdd65 Signed-off-by: Andrew Geissler <[email protected]>
1 parent 23ec332 commit fb45daa

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

build-rootfs-size-docker.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# default ones in /etc/apt/sources.list
1111
# default is empty, and no mirror is used.
1212
# DOCKER_REG: <optional, the URL of a docker registry to utilize
13-
# instead of the default docker hub
14-
# (ex. public.ecr.aws/ubuntu)
13+
# instead of our default (public.ecr.aws/ubuntu)
14+
# (ex. docker.io)
1515
# http_proxy: The HTTP address of the proxy server to connect to.
1616
# Default: "", proxy is not setup if this is not set
1717

@@ -22,7 +22,7 @@ set -uo pipefail
2222

2323
DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-rootfs-size"}
2424
DISTRO=${DISTRO:-"ubuntu:bionic"}
25-
docker_reg=${DOCKER_REG:-"docker.io"}
25+
docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
2626

2727
PROXY=""
2828

build-setup.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
# CONTAINER_ONLY Set to "true" if you only want to build the docker
2525
# container. The bitbake will not occur in this case.
2626
# DOCKER_REG: <optional, the URL of a docker registry to utilize
27-
# instead of the default docker hub
28-
# (ex. public.ecr.aws/ubuntu or public.ecr.aws/docker/library)
27+
# instead of our default (public.ecr.aws/ubuntu)
28+
# (ex. docker.io or public.ecr.aws/docker/library)
2929
#
3030
# Docker Image Build Variables:
3131
# BITBAKE_OPTS Set to "-c populate_sdk" or whatever other BitBake options
@@ -35,7 +35,8 @@
3535
# container, path cannot be located on network storage.
3636
# Default: "$WORKSPACE/build"
3737
# distro The distro used as the base image for the build image:
38-
# fedora|ubuntu
38+
# fedora|ubuntu. Note that if you chose fedora, you will
39+
# need to also update DOCKER_REG to a supported fedora reg.
3940
# Default: "ubuntu"
4041
# img_name The name given to the target build's docker image.
4142
# Default: "openbmc/${distro}:${imgtag}-${target}-${ARCH}"
@@ -90,7 +91,7 @@ num_cpu=${num_cpu:-$(nproc)}
9091
UBUNTU_MIRROR=${UBUNTU_MIRROR:-""}
9192
ENV_LOCAL_CONF=${ENV_LOCAL_CONF:-""}
9293
container_only=${CONTAINER_ONLY:-false}
93-
docker_reg=${DOCKER_REG:-"docker.io"}
94+
docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
9495

9596
# Docker Image Build Variables:
9697
build_dir=${build_dir:-${WORKSPACE}/build}

qemu-build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
# WORKSPACE Path of the workspace directory where the build will
2323
# occur, and output artifacts will be produced.
2424
# DOCKER_REG: <optional, the URL of a docker registry to utilize
25-
# instead of the default docker hub
26-
# (ex. public.ecr.aws/ubuntu)
25+
# instead of our default (public.ecr.aws/ubuntu)
26+
# (ex. docker.io)
2727
#
2828
###############################################################################
2929
# Trace bash processing
@@ -37,7 +37,7 @@ if [ -z ${WORKSPACE+x} ]; then
3737
exit 1
3838
fi
3939

40-
docker_reg=${DOCKER_REG:-"docker.io"}
40+
docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
4141

4242
# Docker Image Build Variables:
4343
img_name=qemu-build

scripts/build-qemu-robot-docker.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
# PIP_MIRROR: <optional, the URL of a PIP mirror>
1010
# default is empty, and no mirror is used.
1111
# DOCKER_REG: <optional, the URL of a docker registry to utilize
12-
# instead of the default docker hub
13-
# (ex. public.ecr.aws/ubuntu)
14-
#
12+
# instead of our default (public.ecr.aws/ubuntu)
13+
# (ex. docker.io)
1514
# Parameters:
1615
# parm1: <optional, the name of the docker image to generate>
1716
# default is openbmc/ubuntu-robot-qemu
@@ -25,7 +24,7 @@ DOCKER_IMG_NAME=${1:-"openbmc/ubuntu-robot-qemu"}
2524
DISTRO=${2:-"ubuntu:jammy"}
2625
UBUNTU_MIRROR=${UBUNTU_MIRROR:-""}
2726
PIP_MIRROR=${PIP_MIRROR:-""}
28-
docker_reg=${DOCKER_REG:-"docker.io"}
27+
docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
2928

3029
MIRROR=""
3130
if [[ -n "${UBUNTU_MIRROR}" ]]; then

0 commit comments

Comments
 (0)