Bump to version Docker 18.09 #425
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/XS
|
|
/assign @BenTheElder |
Kubernetes master is now at 18.09: https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/util/system/docker_validator.go#L42 It was updated for 1.14 release: kubernetes/kubernetes@62fc6df Change-Id: Iab02ca4ef0de0a11fc763ef36418b85d77007220 Enable CRI for containerd Since docker installs containerd, we can also enable the CRI in containerd as well. So we can start creating CI jobs that directly use the CRI of containerd as well. Change-Id: Ib8bf960294d4b562a318cfac6b5d30a9584e908d
dims
force-pushed
the
bump-docker-to-version-18.09
branch
from
5ddf14c
to
b53e1df
Compare
k8s-ci-robot
added
size/S
BenTheElder
reviewed
Apr 2, 2019
BenTheElder
reviewed
Apr 2, 2019
| @@ -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 | |||
There was a problem hiding this comment.
FYI @Random-Liu @yujuhong - 🎉 #425 (comment)
|
this looks good, thank you! I will add a commit to update to a base image built with it later. |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BenTheElder, dims The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Kubernetes master is now at 18.09:
https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/util/system/docker_validator.go#L42
It was updated for 1.14 release:
kubernetes/kubernetes@62fc6df
Change-Id: Iab02ca4ef0de0a11fc763ef36418b85d77007220