From f9b2710b87357526736072b4f3ea432817b72c3c Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Mon, 10 Oct 2016 11:21:19 +0300 Subject: [PATCH] Fix changing DOCKER_OPTS for DSH and KubeCluster Currently DOCKER_OPTS incorrectly changed with insecure-registry and registry-mirror opts (setupDockerRegistry and setupDockerMirror scripts): opts aren't wrapped with quotes after changing. Change-Id: I3265953cc6e6d9de75fa4ba185059cd75c06181c Closes-bug: #1628405 --- .../package/Resources/scripts/setupDockerMirror.sh | 2 +- .../package/Resources/scripts/setupDockerRegistry.sh | 2 +- .../package/Resources/scripts/setupDockerMirror.sh | 2 +- .../package/Resources/scripts/setupDockerRegistry.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh b/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh index 0b8ae40..b8ce692 100644 --- a/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh +++ b/DockerStandaloneHost/package/Resources/scripts/setupDockerMirror.sh @@ -13,4 +13,4 @@ source /etc/default/docker DOCKER_OPTS+=" --registry-mirror=$1" -echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker +echo "DOCKER_OPTS=\"${DOCKER_OPTS}\"" > /etc/default/docker diff --git a/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh b/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh index dba4337..cff8d7e 100644 --- a/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh +++ b/DockerStandaloneHost/package/Resources/scripts/setupDockerRegistry.sh @@ -13,4 +13,4 @@ source /etc/default/docker DOCKER_OPTS+=" --insecure-registry $1" -echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker +echo "DOCKER_OPTS=\"${DOCKER_OPTS}\"" > /etc/default/docker diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh index 749d9fc..1f86b5e 100644 --- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh +++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerMirror.sh @@ -2,4 +2,4 @@ source /etc/default/docker DOCKER_OPTS+=" --registry-mirror=$1" -echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker +echo "DOCKER_OPTS=\"${DOCKER_OPTS}\"" > /etc/default/docker diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh index 4c7def2..9fddb5b 100644 --- a/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh +++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/setupDockerRegistry.sh @@ -2,4 +2,4 @@ source /etc/default/docker DOCKER_OPTS+=" --insecure-registry $1" -echo "DOCKER_OPTS=${DOCKER_OPTS}" > /etc/default/docker +echo "DOCKER_OPTS=\"${DOCKER_OPTS}\"" > /etc/default/docker