Skip to content

move socat to cri-containerd container #27

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

Merged
merged 2 commits into from
Dec 18, 2017
Merged

move socat to cri-containerd container #27

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
6f78899
move socat to cri-containerd container
w9n Dec 13, 2017
6334e66
bump cri-containerd
w9n Dec 14, 2017
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 pkg/cri-containerd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN \
libseccomp-dev \
linux-headers \
make \
socat \
&& true
ENV GOPATH=/go PATH=$PATH:/go/bin

Expand Down Expand Up @@ -39,6 +38,7 @@ RUN apk add --no-cache --initdb -p /out \
ca-certificates \
iptables \
util-linux \
socat \
&& true
# Remove apk residuals. We have a read-only rootfs, so apk is of no use.
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
Expand Down
2 changes: 1 addition & 1 deletion yml/cri-containerd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
- name: cri-containerd
image: linuxkit/cri-containerd:13e866007004e919de34eccf828144a3be9c9741
image: linuxkit/cri-containerd:179d9a1087d615f3a628e47a73243f8e56fb1440
cgroupsPath: podruntime/runtime
files:
- path: /etc/kubelet.sh.conf
Expand Down