summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-13 12:57:38 +0000
committerGerrit Code Review <review@openstack.org>2016-10-13 12:57:38 +0000
commit6d72ac41c0a71a38c0f7d1b6decaac65c1d62ae2 (patch)
treedac47fe26bb1586ca224f4b92bfdd0837aaacbdb
parent8b9e9ff4ccbe52979f68416a96a863e9379d2619 (diff)
parent704a78d342ad1a735e50f29768d15636b866fc98 (diff)
Merge "Be more inclusive in insecure registry regex"
-rw-r--r--docker/firstboot/start_docker_agents.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh
index 65c4e6dc..68625032 100644
--- a/docker/firstboot/start_docker_agents.sh
+++ b/docker/firstboot/start_docker_agents.sh
@@ -23,7 +23,7 @@ if [ $docker_namespace_is_registry ]; then
# if namespace is used with local registry, trim all namespacing
trim_var=$docker_registry
registry_host="${trim_var%%/*}"
- /bin/sed -i "s/# INSECURE_REGISTRY='--insecure-registry[ ]'/INSECURE_REGISTRY='--insecure-registry $registry_host'/g" /etc/sysconfig/docker
+ /bin/sed -i -r "s/^[# ]*INSECURE_REGISTRY *=.+$/INSECURE_REGISTRY='--insecure-registry $registry_host'/" /etc/sysconfig/docker
/usr/bin/systemctl start --no-block docker.service
fi