From 0138ce30e256a9f3a8fc3405a16051aa96294d57 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Tue, 17 Dec 2024 14:35:09 +0800 Subject: [PATCH] Using quay.io registry in project In order to avoid docker pull rate limit, this commit replaces images in the dockerhub to quay.io/openstack.trove Change-Id: I4fb7afd9f6a5d84578bb6226f8b2ff4b9908a526 --- backup/Dockerfile | 2 +- devstack/plugin.sh | 4 ++-- devstack/settings | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/backup/Dockerfile b/backup/Dockerfile index 598eaa2350..9edae1101f 100644 --- a/backup/Dockerfile +++ b/backup/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM quay.io/openstack.trove/ubuntu:20.04 LABEL maintainer="anlin.kong@gmail.com" ARG DATASTORE="mysql" diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0a07e992f6..731327eceb 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -526,10 +526,10 @@ function create_registry_container { echo "Running a docker registry container..." container=$(sudo docker ps -a --format "{{.Names}}" --filter name=registry) if [ -z $container ]; then - sudo docker run -d --net=host -e REGISTRY_HTTP_ADDR=0.0.0.0:4000 --restart=always -v /opt/trove_registry/:/var/lib/registry --name registry registry:2 + sudo docker run -d --net=host -e REGISTRY_HTTP_ADDR=0.0.0.0:4000 --restart=always -v /opt/trove_registry/:/var/lib/registry --name registry quay.io/openstack.trove/registry:2 for img in {"mysql:5.7","mysql:8.0","mariadb:10.4","postgres:12"}; do - sudo docker pull ${img} && sudo docker tag ${img} 127.0.0.1:4000/trove-datastores/${img} && sudo docker push 127.0.0.1:4000/trove-datastores/${img} + sudo docker pull quay.io/openstack.trove/${img} && sudo docker tag quay.io/openstack.trove/${img} 127.0.0.1:4000/trove-datastores/${img} && sudo docker push 127.0.0.1:4000/trove-datastores/${img} done pushd $DEST/trove/backup # build backup images diff --git a/devstack/settings b/devstack/settings index 0df5a0bce2..d81a4c23bb 100644 --- a/devstack/settings +++ b/devstack/settings @@ -94,9 +94,10 @@ if [ "$TROVE_ENABLE_LOCAL_REGISTRY" == "True" ] ; then TROVE_DATABASE_BACKUP_IMAGE_MARIADB=${TROVE_DATABASE_BACKUP_IMAGE_MARIADB:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-mariadb"} TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"$TROVE_HOST_GATEWAY:4000/trove-datastores/db-backup-postgresql"} else - TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"docker.io/library/mysql"} - TROVE_DATABASE_IMAGE_MARIADB=${TROVE_DATABASE_IMAGE_MARIAD:-"docker.io/library/mariadb"} - TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"docker.io/library/postgres"} - TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-""} - TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-""} + TROVE_DATABASE_IMAGE_MYSQL=${TROVE_DATABASE_IMAGE_MYSQL:-"quay.io/openstack.trove/mysql"} + TROVE_DATABASE_IMAGE_MARIADB=${TROVE_DATABASE_IMAGE_MARIAD:-"quay.io/openstack.trove/mariadb"} + TROVE_DATABASE_IMAGE_POSTGRES=${TROVE_DATABASE_IMAGE_POSTGRES:-"quay.io/openstack.trove/postgres"} + TROVE_DATABASE_BACKUP_IMAGE_MYSQL=${TROVE_DATABASE_BACKUP_IMAGE_MYSQL:-"quay.io/openstack.trove/db-backup-mysql"} + TROVE_DATABASE_BACKUP_IMAGE_MARIADB=${TROVE_DATABASE_BACKUP_IMAGE_MARIADB:-"quay.io/openstack.trove/db-backup-mariadb"} + TROVE_DATABASE_BACKUP_IMAGE_POSTGRES=${TROVE_DATABASE_BACKUP_IMAGE_POSTGRES:-"quay.io/openstack.trove/db-backup-postgresql"} fi