From 893c4b7aad773d08ac578bfd403df7fe28bbe4a5 Mon Sep 17 00:00:00 2001 From: Hirotaka Wakabayashi Date: Fri, 1 Jul 2022 13:42:51 +0900 Subject: Adds a configuration to use a local docker registry This PR adds an configuration to use a local docker registry for development and test purpose. Using this option in development, * Developers can test images in local docker registry * Developers don't mind DockerHub's pull ratelimit * Developers can save bandwidth * Developers can test database quickly Story: 2010125 Task: 44793 Change-Id: I762702654bc4430b8432dd96bf869408b2947ff8 --- trove/common/cfg.py | 2 ++ trove/instance/models.py | 3 +++ 2 files changed, 5 insertions(+) (limited to 'trove') diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 6270d96d..58dd3af6 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -449,6 +449,8 @@ common_opts = [ 'the datastores supported by Trove.'), cfg.StrOpt('docker_bridge_network_ip', default=None, help='Docker bridge network IP.'), + cfg.StrOpt('docker_insecure_registries', default=[], + help='Docker insecure registries for image development.'), cfg.StrOpt('template_path', default='/etc/trove/templates/', help='Path which leads to datastore templates.'), cfg.BoolOpt('sql_query_logging', default=False, diff --git a/trove/instance/models.py b/trove/instance/models.py index 3e2d9854..2b17cc73 100644 --- a/trove/instance/models.py +++ b/trove/instance/models.py @@ -1045,6 +1045,9 @@ class BaseInstance(SimpleInstance): # default range(172.17.0.0/16) of bridge network if CONF.docker_bridge_network_ip: docker_daemon_values["bip"] = CONF.docker_bridge_network_ip + if CONF.docker_insecure_registries: + docker_daemon_values["insecure-registries"] = \ + CONF.docker_insecure_registries.split(',') if docker_daemon_values: files['/etc/docker/daemon.json'] = ( -- cgit v1.2.1