From b0b08e18a29de706c00eec6a62cc1a2d4b66cb1b Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Fri, 18 Aug 2017 21:00:13 +0100
Subject: [PATCH] Bump init and containerd packages to v1.0.0-alpha6

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 pkg/containerd/Dockerfile      |  2 +-
 pkg/init/Dockerfile            |  4 ++--
 pkg/init/cmd/service/start.go  | 32 ++++++++++++++++++++++++++------
 test/pkg/containerd/Dockerfile |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index 6fe59f23b..f4d7c41bf 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da as alpine
+FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 as alpine
 RUN \
   apk add \
   btrfs-progs-dev \
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index f1ddeca60..8413a24e0 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build
+FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
 ADD usermode-helper.c ./
@@ -13,7 +13,7 @@ RUN go-compile.sh /go/src/cmd/init
 RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
 RUN go-compile.sh /go/src/cmd/service
 
-FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
+FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl
 
diff --git a/pkg/init/cmd/service/start.go b/pkg/init/cmd/service/start.go
index a85945f14..86e48ff86 100644
--- a/pkg/init/cmd/service/start.go
+++ b/pkg/init/cmd/service/start.go
@@ -55,6 +55,24 @@ func startCmd(args []string) {
 	log.Debugf("Started %s pid %d", id, pid)
 }
 
+type cio struct {
+	config containerd.IOConfig
+}
+
+func (c *cio) Config() containerd.IOConfig {
+	return c.config
+}
+
+func (c *cio) Cancel() {
+}
+
+func (c *cio) Wait() {
+}
+
+func (c *cio) Close() error {
+	return nil
+}
+
 func start(service, sock, basePath, dumpSpec string) (string, uint32, string, error) {
 	path := filepath.Join(basePath, service)
 
@@ -102,18 +120,20 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er
 		return "", 0, "failed to create container", err
 	}
 
-	io := func(id string) (*containerd.IO, error) {
+	io := func(id string) (containerd.IO, error) {
 		logfile := filepath.Join("/var/log", service+".log")
 		// We just need this to exist.
 		if err := ioutil.WriteFile(logfile, []byte{}, 0600); err != nil {
 			// if we cannot write to log, discard output
 			logfile = "/dev/null"
 		}
-		return &containerd.IO{
-			Stdin:    "/dev/null",
-			Stdout:   logfile,
-			Stderr:   logfile,
-			Terminal: false,
+		return &cio{
+			containerd.IOConfig{
+				Stdin:    "/dev/null",
+				Stdout:   logfile,
+				Stderr:   logfile,
+				Terminal: false,
+			},
 		}, nil
 	}
 
diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 69808b98c..6069b5a52 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
+FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
 # util-linux is required for btrfs test (losetup)