Skip to content

Commit c5ef7ee

Browse files
authored
Merge pull request kubernetes#92031 from dims/fix-default-runtime-endpoint-for-docker
fix default CONTAINER_RUNTIME_ENDPOINT for docker
2 parents 2e6eff7 + 66015ff commit c5ef7ee

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cluster/gce/config-default.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd}
9898

9999
# Set default values with override
100100
if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then
101-
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/docker.sock}
101+
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock}
102102
export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker}
103103
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
104104
elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then

cluster/gce/config-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-containerd}
101101

102102
# Set default values with override
103103
if [[ "${CONTAINER_RUNTIME}" == "docker" ]]; then
104-
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/docker.sock}
104+
export CONTAINER_RUNTIME_ENDPOINT=${KUBE_CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock}
105105
export CONTAINER_RUNTIME_NAME=${KUBE_CONTAINER_RUNTIME_NAME:-docker}
106106
export LOAD_IMAGE_COMMAND=${KUBE_LOAD_IMAGE_COMMAND:-}
107107
elif [[ "${CONTAINER_RUNTIME}" == "containerd" ]]; then

0 commit comments

Comments
 (0)