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

Jump to bottom

Bump to version Docker 18.09 #425

Merged
merged 2 commits into from
Apr 3, 2019
Merged

Bump to version Docker 18.09 #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53e1df
Bump to version Docker 18.09 and enable CRI for containerd
dims Apr 2, 2019
51a7876
bump base image to kindest/base:v20190402-b53e1df
BenTheElder Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions images/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ RUN clean-install \
# - add the fingerprint
# - add the repository
# - update apt, install docker, cleanup
# NOTE: 18.06 is officially supported by Kubernetes currently, so we pin to that.
# NOTE: 18.09 is officially supported by Kubernetes currently, so we pin to that.
# https://kubernetes.io/docs/tasks/tools/install-kubeadm/
ARG DOCKER_VERSION="18.06.*"
ARG DOCKER_VERSION="5:18.09.*"
dims marked this conversation as resolved.
Show resolved Hide resolved
# another temporary env, not a real argument. setting this to a non-zero value
# silences this warning from apt-key:
# "Warning: apt-key output should not be parsed (stdout is not a terminal)"
Expand All @@ -75,6 +75,10 @@ RUN curl -fsSL "https://download.docker.com/linux/$(. /etc/os-release; echo "$ID
"deb https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable" \
&& clean-install "docker-ce=${DOCKER_VERSION}"

# Enable CRI for containerd
RUN mkdir -p /etc/docker && echo '{"cri-containerd": true}' > /etc/docker/daemon.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @Random-Liu @yujuhong - 🎉 #425 (comment)

RUN mkdir -p /etc/containerd && containerd config default > /etc/containerd/config.toml

# Install CNI binaries to /opt/cni/bin
# TODO(bentheelder): doc why / what here
ARG CNI_VERSION="0.7.5"
Expand Down