Skip to content

Commit

Permalink
Merge pull request #181 from krunalhinguu/bump-cri-dockerd-0.3.11
Browse files Browse the repository at this point in the history
bump cri-dockerd to v0.3.11
  • Loading branch information
krunalhinguu authored Apr 29, 2024
2 parents 6fd84ca + 4786097 commit edd123f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if [ "$1" = "kubelet" ]; then
RKE_KUBELET_PAUSEIMAGE=$(echo "$@" | grep -Eo "\-\-pod-infra-container-image+.*" | awk '{print $1}')
CONTAINER_RUNTIME_ENDPOINT=$(echo "$@" | grep -Eo "\-\-container-runtime-endpoint+.*" | awk '{print $1}' | cut -d "=" -f2)
if [ "$CONTAINER_RUNTIME_ENDPOINT" == "/var/run/dockershim.sock" ]; then
# cri-dockerd v0.3.1 requires unix socket or tcp endpoint, update old endpoint passed by rke
# cri-dockerd v0.3.11 requires unix socket or tcp endpoint, update old endpoint passed by rke
CONTAINER_RUNTIME_ENDPOINT="unix://$CONTAINER_RUNTIME_ENDPOINT"
fi
EXTRA_FLAGS=""
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV DOCKER_VERSION=20.10.24
ENV CNI_PLUGINS_VERSION=v1.2.0
ENV FLANNEL_VERSION=v1.2.0
ENV ETCD_VERSION=v3.5.6
ENV CRIDOCKERD_VERSION=0.3.4
ENV CRIDOCKERD_VERSION=0.3.11
ENV RANCHER_CONFD_VERSION=v0.16.5
ENV KUBECTL_VERSION=v1.24.15

Expand Down

0 comments on commit edd123f

Please sign in to comment.