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 <geissonator@yahoo.com>
diff --git a/build-rootfs-size-docker.sh b/build-rootfs-size-docker.sh
index 056f1ea..ce64076 100755
--- a/build-rootfs-size-docker.sh
+++ b/build-rootfs-size-docker.sh
@@ -10,8 +10,8 @@
# default ones in /etc/apt/sources.list
# default is empty, and no mirror is used.
# DOCKER_REG: <optional, the URL of a docker registry to utilize
-# instead of the default docker hub
-# (ex. public.ecr.aws/ubuntu)
+# instead of our default (public.ecr.aws/ubuntu)
+# (ex. docker.io)
# http_proxy: The HTTP address of the proxy server to connect to.
# Default: "", proxy is not setup if this is not set
@@ -22,7 +22,7 @@
DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-rootfs-size"}
DISTRO=${DISTRO:-"ubuntu:bionic"}
-docker_reg=${DOCKER_REG:-"docker.io"}
+docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
PROXY=""
diff --git a/build-setup.sh b/build-setup.sh
index f9b9df9..c435ae7 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -24,8 +24,8 @@
# CONTAINER_ONLY Set to "true" if you only want to build the docker
# container. The bitbake will not occur in this case.
# DOCKER_REG: <optional, the URL of a docker registry to utilize
-# instead of the default docker hub
-# (ex. public.ecr.aws/ubuntu or public.ecr.aws/docker/library)
+# instead of our default (public.ecr.aws/ubuntu)
+# (ex. docker.io or public.ecr.aws/docker/library)
#
# Docker Image Build Variables:
# BITBAKE_OPTS Set to "-c populate_sdk" or whatever other BitBake options
@@ -35,7 +35,8 @@
# container, path cannot be located on network storage.
# Default: "$WORKSPACE/build"
# distro The distro used as the base image for the build image:
-# fedora|ubuntu
+# fedora|ubuntu. Note that if you chose fedora, you will
+# need to also update DOCKER_REG to a supported fedora reg.
# Default: "ubuntu"
# img_name The name given to the target build's docker image.
# Default: "openbmc/${distro}:${imgtag}-${target}-${ARCH}"
@@ -90,7 +91,7 @@
UBUNTU_MIRROR=${UBUNTU_MIRROR:-""}
ENV_LOCAL_CONF=${ENV_LOCAL_CONF:-""}
container_only=${CONTAINER_ONLY:-false}
-docker_reg=${DOCKER_REG:-"docker.io"}
+docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
# Docker Image Build Variables:
build_dir=${build_dir:-${WORKSPACE}/build}
diff --git a/qemu-build.sh b/qemu-build.sh
index 54044e7..5baa02e 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -22,8 +22,8 @@
# WORKSPACE Path of the workspace directory where the build will
# occur, and output artifacts will be produced.
# DOCKER_REG: <optional, the URL of a docker registry to utilize
-# instead of the default docker hub
-# (ex. public.ecr.aws/ubuntu)
+# instead of our default (public.ecr.aws/ubuntu)
+# (ex. docker.io)
#
###############################################################################
# Trace bash processing
@@ -37,7 +37,7 @@
exit 1
fi
-docker_reg=${DOCKER_REG:-"docker.io"}
+docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
# Docker Image Build Variables:
img_name=qemu-build
diff --git a/scripts/build-qemu-robot-docker.sh b/scripts/build-qemu-robot-docker.sh
index c8e402a..4517ffd 100755
--- a/scripts/build-qemu-robot-docker.sh
+++ b/scripts/build-qemu-robot-docker.sh
@@ -9,9 +9,8 @@
# PIP_MIRROR: <optional, the URL of a PIP mirror>
# default is empty, and no mirror is used.
# DOCKER_REG: <optional, the URL of a docker registry to utilize
-# instead of the default docker hub
-# (ex. public.ecr.aws/ubuntu)
-#
+# instead of our default (public.ecr.aws/ubuntu)
+# (ex. docker.io)
# Parameters:
# parm1: <optional, the name of the docker image to generate>
# default is openbmc/ubuntu-robot-qemu
@@ -25,7 +24,7 @@
DISTRO=${2:-"ubuntu:jammy"}
UBUNTU_MIRROR=${UBUNTU_MIRROR:-""}
PIP_MIRROR=${PIP_MIRROR:-""}
-docker_reg=${DOCKER_REG:-"docker.io"}
+docker_reg=${DOCKER_REG:-"public.ecr.aws/ubuntu"}
MIRROR=""
if [[ -n "${UBUNTU_MIRROR}" ]]; then