Merge pull request #83 from ijc/linuxkit-v0.4

ijc · web-flow · commit 6e59d75cef67 · 2018-05-22T16:03:26.000+01:00
Linuxkit v0.4
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,7 +106,7 @@ jobs:
             tar xfO /tmp/docker.tgz docker/docker > /workspace/bin/docker
             # To update find the most recent successful build at https://circleci.com/gh/linuxkit/linuxkit/tree/master
             # and find the link + SHA256 in the `Artifacts` tab
-            curl -fsSL -o /workspace/bin/linuxkit https://github.com/linuxkit/linuxkit/releases/download/v0.3/linuxkit-linux-amd64
+            curl -fsSL -o /workspace/bin/linuxkit https://github.com/linuxkit/linuxkit/releases/download/v0.4/linuxkit-linux-amd64
             curl -fsSL -o /workspace/bin/manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
             curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.6.0/notary-Linux-amd64
 
@@ -117,7 +117,7 @@ jobs:
             echo "Checking checksums"
             sha256sum -c <<EOF
             f5ea546a4ccd64fbb71825f964171256388f1181b000f3c56747075e383c81c6  /workspace/bin/docker
-            7058bb86c6eeab6faf563c7c61537579e7a493b9e1f74835a554f0ac7345e1bf  /workspace/bin/linuxkit
+            57074fda28aefdefaec96866b178d1d0b8d3e251725c506d4e22851032733649  /workspace/bin/linuxkit
             e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d  /workspace/bin/manifest-tool
             f4e421b3bb3c32c39372f7f02fbe80c67580cccd381f9722b1c702b3ab63a1c7  /workspace/bin/notary
             EOF
diff --git a/pkg/cri-containerd/Dockerfile b/pkg/cri-containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 
 RUN \
   apk add \
diff --git a/pkg/kube-e2e-test/Dockerfile b/pkg/kube-e2e-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
diff --git a/pkg/kubelet/Dockerfile b/pkg/kubelet/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 
 # When changing kubernetes_version remember to also update:
 # - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
diff --git a/pkg/kubernetes-docker-image-cache-common/Dockerfile b/pkg/kubernetes-docker-image-cache-common/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
diff --git a/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile b/pkg/kubernetes-docker-image-cache-control-plane/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build
+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
diff --git a/yml/cri-containerd.yml b/yml/cri-containerd.yml
@@ -1,6 +1,6 @@
 services:
   - name: cri-containerd
-    image: linuxkit/cri-containerd:474d704f6dcb173b10768ab1d1bd61674468c7f9
+    image: linuxkit/cri-containerd:093735eea5b3d7488ffc5a0ecf83a08e344f2e4f
     cgroupsPath: podruntime/cri-containerd
 files:
   - path: /etc/kubelet.sh.conf
diff --git a/yml/docker-master.yml b/yml/docker-master.yml
@@ -1,4 +1,4 @@
 services:
   - name: kubernetes-docker-image-cache-control-plane
-    image: linuxkit/kubernetes-docker-image-cache-control-plane:68e9977b724c06a3007baf510246bb0a05cee44d
+    image: linuxkit/kubernetes-docker-image-cache-control-plane:698faae3de953d7fc0f009360bcfce98497afe76
     cgroupsPath: podruntime/control-cache
diff --git a/yml/docker.yml b/yml/docker.yml
@@ -28,7 +28,7 @@ services:
       mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
     cgroupsPath: podruntime/docker
   - name: kubernetes-docker-image-cache-common
-    image: linuxkit/kubernetes-docker-image-cache-common:667cc12b3b636959cfaf59ab769e1b0fa6987814
+    image: linuxkit/kubernetes-docker-image-cache-common:2da947148638cbbef869215cdb0e572c0402833c
     cgroupsPath: podruntime/common-cache
 files:
   - path: /etc/kubelet.sh.conf
diff --git a/yml/kube.yml b/yml/kube.yml
@@ -1,46 +1,46 @@
 kernel:
-  image: linuxkit/kernel:4.14.32
+  image: linuxkit/kernel:4.14.40
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
-  - linuxkit/runc:1b67e997c720301c62052c8f29f5629ad751199b
-  - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
-  - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
+  - linuxkit/init:c79d7587fcd0a195b8a3ecafe428a30e735cf2b4
+  - linuxkit/runc:d659de11767a419319b175700a7c6f64b8704f8c
+  - linuxkit/containerd:018fc633223d8a49f650da365603a5abccc6a423
+  - linuxkit/ca-certificates:f882e9be933fac737bf1f4d303a4bb49a12f302f
 onboot:
   - name: sysctl
-    image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
+    image: linuxkit/sysctl:2a98cb7a116d4d8a71498cea0e0ad8116a9b5a3b
     binds:
      - /etc/sysctl.d/01-kubernetes.conf:/etc/sysctl.d/01-kubernetes.conf
     readonly: false
   - name: sysfs
-    image: linuxkit/sysfs:640ebdbfd8f86178c69f76bc6cdac07feffd6825
+    image: linuxkit/sysfs:dc7b876f395fa44c2b93bad6b987e418497c5b34
   - name: dhcpcd
-    image: linuxkit/dhcpcd:295b63ada3346faffddc16b631b247b234bf8fd0
+    image: linuxkit/dhcpcd:193a81bd4a93779c8a048d66e0cb1d201d0ae102
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd
+    image: linuxkit/metadata:6962be42ec291db67ac9bb4267d8fd06fd464f48
   - name: format
-    image: linuxkit/format:a604e93516455f89eb5dcfa2e437c07d4cc9203b
+    image: linuxkit/format:9a537dd3eaefd02dbc01c598b843fba33da8c1a5
   - name: mounts
-    image: linuxkit/mount:0eba853dfa99f01166831c30f37f6bb818b61f2f
+    image: linuxkit/mount:a718496fa5ea2a7a9f7552eac64c7f3699fb6a86
     command: ["/usr/bin/mountie", "/var/lib/"]
 services:
   - name: getty
-    image: linuxkit/getty:32247863cace34f3b441b4c5d9d3f5cb5f64d189
+    image: linuxkit/getty:3fa8e2240c1392ba4af508d3e6be8548443b12cc
     env:
      - INSECURE=true
     cgroupsPath: systemreserved/getty
   - name: rngd
-    image: linuxkit/rngd:00b9cc2e63ba3d5384f44bf01fa0d2bd6a97845a
+    image: linuxkit/rngd:aaa9a63cbc9c04421b160b85aef4df5fa5d0f5f0
     cgroupsPath: systemreserved/rngd
   - name: ntpd
-    image: linuxkit/openntpd:bf56d222d258b60bae4d286791bc76003e58db55
+    image: linuxkit/openntpd:413ee972bc71a66030c50bc8daf7385e5c8ea269
     cgroupsPath: systemreserved/ntpd
   - name: sshd
-    image: linuxkit/sshd:39d6bdc9a7489ceffa761ad5cb96c87b50d6732d
+    image: linuxkit/sshd:5544de2376475f6685e12bdc10bfe49f4695873a
     cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:38bea97a5600bd442dc49ab453a71b3b8018b6d5
+    image: linuxkit/kubelet:bcff9a97b3ecaf204ca7ee122f5a071a3dc97d4c
     cgroupsPath: podruntime/kubelet
 files:
   - path: etc/linuxkit.yml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build`
	`1`	`+FROM linuxkit/alpine:1b05307ae8152e3d38f79e297b0632697a30c65c AS build`
`2`	`2`
`3`	`3`	`RUN \`
`4`	`4`	`apk add \`