diff options
| author |   Martin André <m.andre@redhat.com> | 2016-09-06 15:37:00 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2016-10-19 14:31:17 +0200 |
| commit | 6d41f690331b28b88dcdc614ed10019a06ed88c2 (patch) | |
| tree | b8ee0ca2066be529e207b1ef1ec2c08f2d9795b1 | |
| parent | 81aa47d3143bf58cffdb0bd9fbacfd0e05e195e4 (diff) | |
Have docker start script honor configuration
The test was always evaluate as true which resulted in
insecure_registry line being set even when DockerNamespaceIsRegistry
was set to false.
Change-Id: Iacb73a4908a6a27082b94fe919734e644ed47b19
| -rw-r--r-- | docker/firstboot/start_docker_agents.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/firstboot/start_docker_agents.sh b/docker/firstboot/start_docker_agents.sh index 68625032..2431ef0a 100644 --- a/docker/firstboot/start_docker_agents.sh +++ b/docker/firstboot/start_docker_agents.sh @@ -18,7 +18,9 @@ echo "127.0.0.1 $HOSTNAME.localdomain $HOSTNAME" >> /etc/hosts #echo "ADD_REGISTRY='--registry-mirror $docker_registry'" >> /etc/sysconfig/docker # Local docker registry 1.8 -if [ $docker_namespace_is_registry ]; then +# NOTE(mandre) $docker_namespace_is_registry is not a bash variable but is +# a place holder for text replacement done via heat +if [ "$docker_namespace_is_registry" = True ]; then /usr/bin/systemctl stop docker.service # if namespace is used with local registry, trim all namespacing trim_var=$docker_registry |