diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile
index 28c1386cc..c35d201df 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 as alpine
+FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b as alpine
 RUN \
   apk add \
   btrfs-progs-dev \
diff --git a/pkg/containerd/cmd/service/main.go b/pkg/containerd/cmd/service/main.go
index bf68a3f2c..d2477d999 100644
--- a/pkg/containerd/cmd/service/main.go
+++ b/pkg/containerd/cmd/service/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
diff --git a/pkg/containerd/cmd/service/start.go b/pkg/containerd/cmd/service/start.go
index 6e37b3b99..8924c953b 100644
--- a/pkg/containerd/cmd/service/start.go
+++ b/pkg/containerd/cmd/service/start.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/namespaces"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
+	log "github.com/sirupsen/logrus"
 )
 
 func startCmd(args []string) {
@@ -98,7 +98,7 @@ func start(service, sock, path, dumpSpec string) (string, uint32, string, error)
 		return "", 0, "failed to create container", err
 	}
 
-	io := func() (*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 {
diff --git a/pkg/containerd/cmd/service/system_init.go b/pkg/containerd/cmd/service/system_init.go
index c450d5f40..e530e54a5 100644
--- a/pkg/containerd/cmd/service/system_init.go
+++ b/pkg/containerd/cmd/service/system_init.go
@@ -11,11 +11,11 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 )
 
 func cleanupTask(ctx context.Context, ctr containerd.Container) error {
diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 63d3bf086..b7b88ea7e 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
+FROM linuxkit/alpine:3b03eeb1b4cc58800b9f3608b6f148a044227df5 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)