Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump cri-dockerd to v0.3.11 #181

Merged
merged 1 commit into from
Apr 29, 2024
Merged

bump cri-dockerd to v0.3.11 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion entrypoint.sh
View file
Open in desktop
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
View file
Open in desktop
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