From 28e22e40bb095585b25f4686223dffe9442a6f24 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Fri, 1 Dec 2017 13:22:30 +0000
Subject: [PATCH] Bump packages to new alpine w/ containerd v1.0.0-rc.0

Minor updates due to renamings in containerd.

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

diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index da7dc62cd..8c5db06ca 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 as alpine
+FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 as alpine
 RUN apk add tzdata
 
 WORKDIR $GOPATH/src/github.com/containerd/containerd
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index adfd8c1e5..b911f294e 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS build
+FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
 ADD usermode-helper.c ./
@@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
 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:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror
+FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 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 156797f3a..187322f47 100644
--- a/pkg/init/cmd/service/start.go
+++ b/pkg/init/cmd/service/start.go
@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/namespaces"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	log "github.com/sirupsen/logrus"
@@ -55,21 +56,21 @@ func startCmd(args []string) {
 	log.Debugf("Started %s pid %d", id, pid)
 }
 
-type cio struct {
-	config containerd.IOConfig
+type logio struct {
+	config cio.Config
 }
 
-func (c *cio) Config() containerd.IOConfig {
+func (c *logio) Config() cio.Config {
 	return c.config
 }
 
-func (c *cio) Cancel() {
+func (c *logio) Cancel() {
 }
 
-func (c *cio) Wait() {
+func (c *logio) Wait() {
 }
 
-func (c *cio) Close() error {
+func (c *logio) Close() error {
 	return nil
 }
 
@@ -120,7 +121,7 @@ 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) (cio.IO, error) {
 		stdoutFile := filepath.Join("/var/log", service+".out.log")
 		stderrFile := filepath.Join("/var/log", service+".err.log")
 		// We just need this to exist. If we cannot write to the directory,
@@ -131,8 +132,8 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er
 		if err := ioutil.WriteFile(stderrFile, []byte{}, 0600); err != nil {
 			stderrFile = "/dev/null"
 		}
-		return &cio{
-			containerd.IOConfig{
+		return &logio{
+			cio.Config{
 				Stdin:    "/dev/null",
 				Stdout:   stdoutFile,
 				Stderr:   stderrFile,
diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 90ed3637c..8e2ba17f5 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS mirror
+FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 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)