Merge pull request #69 from ijc/linuxkit-v0.3

ijc · web-flow · commit 218bd59525ba · 2018-04-06T13:25:35.000+01:00
Linuxkit v0.3 &amp; updated tools in CI
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -102,24 +102,24 @@ jobs:
       - run:
           name: Fetch binaries
           command: |
-            curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz
+            curl -fsSL -o /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.03.0-ce.tgz
             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://501-46932243-gh.circle-artifacts.com/0/linuxkit-linux-amd64
+            curl -fsSL -o /workspace/bin/linuxkit https://github.com/linuxkit/linuxkit/releases/download/v0.3/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.4.3/notary-Linux-amd64
+            curl -fsSL -o /workspace/bin/notary https://github.com/theupdateframework/notary/releases/download/v0.6.0/notary-Linux-amd64
 
             echo "Downloaded:"
             sha256sum /workspace/bin/*
             echo
 
             echo "Checking checksums"
             sha256sum -c <<EOF
-            6af40e74b2dbb2927882acab52d50bfc72551779d541957fc70b6adc325ee5ef  /workspace/bin/docker
-            fd15a491d834e93c29729d8dc295d1684ec2cf1df42fb751ff20bd0b2a3e5110  /workspace/bin/linuxkit
+            f5ea546a4ccd64fbb71825f964171256388f1181b000f3c56747075e383c81c6  /workspace/bin/docker
+            7058bb86c6eeab6faf563c7c61537579e7a493b9e1f74835a554f0ac7345e1bf  /workspace/bin/linuxkit
             e4ca2ef0015a4be8597d31d9e3e70d88da33924ae72b0999e9f3b79304d4710d  /workspace/bin/manifest-tool
-            06cd02c4c2e7a3b1ad9899b03b3d4dde5392d964c675247d32f604a24661f839  /workspace/bin/notary
+            f4e421b3bb3c32c39372f7f02fbe80c67580cccd381f9722b1c702b3ab63a1c7  /workspace/bin/notary
             EOF
       - run:
           name: Versions
diff --git a/pkg/cri-containerd/Dockerfile b/pkg/cri-containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 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:eb290524e5ed4d7b821615f7580db4a76ebc7918
+    image: linuxkit/cri-containerd:c7dfc51dfb34aa4df01beb23069e1cadb0bb1bb7
     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:be74a54ac117d66f7462cecf6ae8edfa13ec34aa
+    image: linuxkit/kubernetes-docker-image-cache-control-plane:b1bddee9fd3cfb73fad12408d5ca08136fd77889
     cgroupsPath: podruntime/control-cache
diff --git a/yml/docker.yml b/yml/docker.yml
@@ -1,6 +1,6 @@
 services:
   - name: docker
-    image: docker:17.12.0-ce-dind
+    image: docker:18.03.0-ce-dind
     capabilities:
      - all
     pid: host
@@ -26,7 +26,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:b58944f17b48e1372b16e4443ddb999c729c84b2
+    image: linuxkit/kubernetes-docker-image-cache-common:11e096a191cf68ec047ec74985951d225af18197
     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.26
+  image: linuxkit/kernel:4.14.32
   cmdline: "console=tty0 console=ttyS0"
 init:
-  - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a
-  - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731
-  - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0
-  - linuxkit/ca-certificates:0a188e40108b6ece8c2aefdfaaad94acc84368ce
+  - linuxkit/init:be60dd1cb15ad39225512b6753304571d8c2fb17
+  - linuxkit/runc:1b67e997c720301c62052c8f29f5629ad751199b
+  - linuxkit/containerd:87ea9b027267b26bf5cc2d10a50c3eb9b5017df4
+  - linuxkit/ca-certificates:fb5c7bf842a330f5b47cdf71f950fe0c85f4a772
 onboot:
   - name: sysctl
-    image: linuxkit/sysctl:d58499a8af6988929e2d7da357d5203634f5748e
+    image: linuxkit/sysctl:b51c3da02bc2fc9a53f699efc51f650ac17ffac8
     binds:
      - /etc/sysctl.d/01-kubernetes.conf:/etc/sysctl.d/01-kubernetes.conf
     readonly: false
   - name: sysfs
-    image: linuxkit/sysfs:43b21be975bb33fe8c60b1f005dd354bea265333
+    image: linuxkit/sysfs:640ebdbfd8f86178c69f76bc6cdac07feffd6825
   - name: dhcpcd
-    image: linuxkit/dhcpcd:0f90a720d88896fd7a415476ba9b2749d4376d6b
+    image: linuxkit/dhcpcd:295b63ada3346faffddc16b631b247b234bf8fd0
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata
-    image: linuxkit/metadata:b14cfe4ecc8ec42cafc2ca9c6afe2d52f2bf24f4
+    image: linuxkit/metadata:be507a0718df8ed6733dfab1d6866672f446e8fd
   - name: format
-    image: linuxkit/format:55aa87f123be212da4e2229257aac37dad3be8c3
+    image: linuxkit/format:a604e93516455f89eb5dcfa2e437c07d4cc9203b
   - name: mounts
-    image: linuxkit/mount:6cdb5653a69586f448698203ed295cd8fbdd579d
+    image: linuxkit/mount:0eba853dfa99f01166831c30f37f6bb818b61f2f
     command: ["/usr/bin/mountie", "/var/lib/"]
 services:
   - name: getty
-    image: linuxkit/getty:49c4e22cf44edf27ad6aea899153c7d717192c7a
+    image: linuxkit/getty:32247863cace34f3b441b4c5d9d3f5cb5f64d189
     env:
      - INSECURE=true
     cgroupsPath: systemreserved/getty
   - name: rngd
-    image: linuxkit/rngd:12dfee0c1f63b98b9e311b5f37d0a18a76b03eba
+    image: linuxkit/rngd:00b9cc2e63ba3d5384f44bf01fa0d2bd6a97845a
     cgroupsPath: systemreserved/rngd
   - name: ntpd
-    image: linuxkit/openntpd:e4e9073946e29683fc5a09c30e010c41911d36f8
+    image: linuxkit/openntpd:bf56d222d258b60bae4d286791bc76003e58db55
     cgroupsPath: systemreserved/ntpd
   - name: sshd
-    image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
+    image: linuxkit/sshd:39d6bdc9a7489ceffa761ad5cb96c87b50d6732d
     cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:6fe8c9a5182667c6dcb3b43279ce001a156730ea
+    image: linuxkit/kubelet:7e09d17481ac9dd43617d84d6b1b3af964ded505
     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:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build`
	`1`	`+FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build`
`2`	`2`
`3`	`3`	`RUN \`
`4`	`4`	`apk add \`