explicitly stop/start docker to fix up local-up-cluster.sh
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
		@@ -14,6 +14,8 @@
 | 
				
			|||||||
# See the License for the specific language governing permissions and
 | 
					# See the License for the specific language governing permissions and
 | 
				
			||||||
# limitations under the License.
 | 
					# limitations under the License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set -x
 | 
				
			||||||
 | 
					
 | 
				
			||||||
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 | 
					KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This script builds and runs a local kubernetes cluster. You may need to run
 | 
					# This script builds and runs a local kubernetes cluster. You may need to run
 | 
				
			||||||
@@ -1282,6 +1284,9 @@ if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then
 | 
				
			|||||||
  # let's log it where we can grab it later
 | 
					  # let's log it where we can grab it later
 | 
				
			||||||
  echo "DOCKER_LOGFILE=${LOG_DIR}/docker.log" >> /etc/default/docker
 | 
					  echo "DOCKER_LOGFILE=${LOG_DIR}/docker.log" >> /etc/default/docker
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  echo "stopping docker"
 | 
				
			||||||
 | 
					  service docker stop
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # bump up things
 | 
					  # bump up things
 | 
				
			||||||
  refresh_docker_containerd_runc
 | 
					  refresh_docker_containerd_runc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1290,8 +1295,8 @@ if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then
 | 
				
			|||||||
  containerd --version
 | 
					  containerd --version
 | 
				
			||||||
  runc --version
 | 
					  runc --version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  echo "restarting docker"
 | 
					  echo "starting docker"
 | 
				
			||||||
  service docker restart
 | 
					  service docker start
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# validate that etcd is: not running, in path, and has minimum required version.
 | 
					# validate that etcd is: not running, in path, and has minimum required version.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user