github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2665 from ijc/cri-containerd-v1.0.0-alpha.1

Browse Source 
kubernetes: Bump to cri-containerd v1.0.0-alpha.1 + add socat
This commit is contained in:
Ian Campbell 2017-11-01 12:16:18 +00:00 committed by GitHub
commit c4e9c56b53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/kubernetes/cri-containerd.yml
View File

@ -1,6 +1,6 @@
services: services:
- name: cri-containerd - name: cri-containerd
image: linuxkitprojects/cri-containerd:afb7c111a40788b1e085856fbddacf8a878385e7 image: linuxkitprojects/cri-containerd:7059f247c4135c75722047a2ce2fe6119a0e1681
files: files:
- path: /etc/kubelet.sh.conf - path: /etc/kubelet.sh.conf
contents: | contents: |

3
projects/kubernetes/cri-containerd/Dockerfile
View File

@ -10,12 +10,13 @@ RUN \
libseccomp-dev \ libseccomp-dev \
linux-headers \ linux-headers \
make \ make \
socat \
&& true && true
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin
ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git ENV CRI_CONTAINERD_URL https://github.com/kubernetes-incubator/cri-containerd.git
#ENV CRI_CONTAINERD_BRANCH pull/NNN/head #ENV CRI_CONTAINERD_BRANCH pull/NNN/head
ENV CRI_CONTAINERD_COMMIT v1.0.0-alpha.0 ENV CRI_CONTAINERD_COMMIT v1.0.0-alpha.1
RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \ RUN mkdir -p $GOPATH/src/github.com/kubernetes-incubator && \
cd $GOPATH/src/github.com/kubernetes-incubator && \ cd $GOPATH/src/github.com/kubernetes-incubator && \
git clone $CRI_CONTAINERD_URL cri-containerd git clone $CRI_CONTAINERD_URL cri-containerd