From 09c89a923b397fb363e0f42366be0a96c826fe71 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Mon, 25 Sep 2017 13:31:12 +0100
Subject: [PATCH] Bump init and containerd package to v1.0.0-beta.1

golint on pkg/init now complains:

    golint...
    ./init.go:199:2: redundant if ...; err != nil check, just return error instead.

Resulting in a change which doesn't seem like an improvement to me.

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

diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index 71ed2296a..883ea417d 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3 as alpine
+FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 as alpine
 RUN apk add tzdata
 
 WORKDIR $GOPATH/src/github.com/containerd/containerd
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index 7740d863d..9e35c3b7d 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS build
+FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
 ADD usermode-helper.c ./
diff --git a/pkg/init/cmd/init/init.go b/pkg/init/cmd/init/init.go
index 8f80f6834..4829acc2c 100644
--- a/pkg/init/cmd/init/init.go
+++ b/pkg/init/cmd/init/init.go
@@ -196,11 +196,7 @@ func copyFS(newRoot string) error {
 	}
 
 	// chdir to "/" to fix up . and ..
-	if err := os.Chdir("/"); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Chdir("/")
 }
 
 func main() {
diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 39d601103..710214896 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror
+FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 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)