From ef3e45ac02a8bd00f2c036efac04405fc575fb46 Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Wed, 21 Apr 2021 08:18:39 +0300
Subject: [PATCH] pkgs: Update packages to the latest linuxkit/alpine

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 pkg/acpid/Dockerfile                 |  4 ++--
 pkg/auditd/Dockerfile                |  2 +-
 pkg/binfmt/Dockerfile                |  4 ++--
 pkg/bpftrace/Dockerfile              |  2 +-
 pkg/ca-certificates/Dockerfile       |  2 +-
 pkg/cadvisor/Dockerfile              | 11 +++++++----
 pkg/containerd/Dockerfile            |  2 +-
 pkg/dhcpcd/Dockerfile                |  2 +-
 pkg/dm-crypt/Dockerfile              |  2 +-
 pkg/extend/Dockerfile                |  6 +++---
 pkg/firmware-all/Dockerfile          |  2 +-
 pkg/firmware/Dockerfile              |  2 +-
 pkg/format/Dockerfile                |  6 +++---
 pkg/getty/Dockerfile                 |  2 +-
 pkg/host-timesync-daemon/Dockerfile  |  4 ++--
 pkg/init/Dockerfile                  |  6 +++---
 pkg/init/cmd/service/runc.go         | 10 ++++++++--
 pkg/ip/Dockerfile                    |  2 +-
 pkg/kmsg/Dockerfile                  |  4 ++--
 pkg/logwrite/Dockerfile              |  4 ++--
 pkg/losetup/Dockerfile               |  2 +-
 pkg/memlogd/Dockerfile               |  4 ++--
 pkg/metadata/Dockerfile              |  4 ++--
 pkg/mkimage/Dockerfile               |  2 +-
 pkg/modprobe/Dockerfile              |  2 +-
 pkg/mount/Dockerfile                 |  6 +++---
 pkg/node_exporter/Dockerfile         |  7 +++++--
 pkg/open-vm-tools/Dockerfile         |  2 +-
 pkg/openntpd/Dockerfile              |  2 +-
 pkg/qemu-ga/Dockerfile               |  2 +-
 pkg/rngd/Dockerfile                  |  4 ++--
 pkg/rngd/cmd/rngd/main.go            |  2 +-
 pkg/rngd/cmd/rngd/rng_unsupported.go |  3 +++
 pkg/runc/Dockerfile                  |  5 +++--
 pkg/sshd/Dockerfile                  |  2 +-
 pkg/swap/Dockerfile                  |  2 +-
 pkg/sysctl/Dockerfile                |  4 ++--
 pkg/sysfs/Dockerfile                 |  4 ++--
 pkg/trim-after-delete/Dockerfile     |  4 ++--
 pkg/tss/Dockerfile                   | 10 +++++-----
 pkg/vpnkit-expose-port/Dockerfile    |  4 ++--
 pkg/vpnkit-forwarder/Dockerfile      |  4 ++--
 pkg/vsudd/Dockerfile                 |  4 ++--
 43 files changed, 90 insertions(+), 74 deletions(-)

diff --git a/pkg/acpid/Dockerfile b/pkg/acpid/Dockerfile
index 0108c2d35..19f335e79 100644
--- a/pkg/acpid/Dockerfile
+++ b/pkg/acpid/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -6,7 +6,7 @@ RUN apk add --no-cache --initdb -p /out \
     busybox
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror2
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror2
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     busybox-initscripts
diff --git a/pkg/auditd/Dockerfile b/pkg/auditd/Dockerfile
index 76b36192a..ee6ede738 100644
--- a/pkg/auditd/Dockerfile
+++ b/pkg/auditd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --initdb -p /out alpine-baselayout apk-tools audit busybox tini
diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile
index c60b90067..597fa3c9b 100644
--- a/pkg/binfmt/Dockerfile
+++ b/pkg/binfmt/Dockerfile
@@ -8,10 +8,10 @@ RUN apt-get update && apt-get install -y qemu-user-static && \
     mv /usr/bin/qemu-riscv64-static /usr/bin/qemu-riscv64 && \
     rm /usr/bin/qemu-*-static
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 
 COPY main.go /go/src/binfmt/
 RUN go-compile.sh /go/src/binfmt
diff --git a/pkg/bpftrace/Dockerfile b/pkg/bpftrace/Dockerfile
index 23aef7b5d..b4ebb9e8d 100644
--- a/pkg/bpftrace/Dockerfile
+++ b/pkg/bpftrace/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 RUN apk add --update \
     bison \
     build-base \
diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile
index 06440991a..2a3dfbadc 100644
--- a/pkg/ca-certificates/Dockerfile
+++ b/pkg/ca-certificates/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as alpine
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as alpine
 
 RUN apk add ca-certificates
 
diff --git a/pkg/cadvisor/Dockerfile b/pkg/cadvisor/Dockerfile
index 8c2724541..bf8d3066a 100644
--- a/pkg/cadvisor/Dockerfile
+++ b/pkg/cadvisor/Dockerfile
@@ -1,16 +1,19 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as build
 
-RUN apk add --no-cache bash go git musl-dev linux-headers make
+RUN apk add --no-cache bash go git musl-dev linux-headers make patch
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GITBASE=github.com/google
 ENV GITREPO=github.com/google/cadvisor
 ENV COMMIT=v0.36.0
 
 ADD /static.patch /tmp/
 
-RUN go get -d ${GITREPO} \
+RUN mkdir -p /go/src/${GITBASE} \
+    && cd /go/src/${GITBASE} \
+    && git clone https://${GITREPO}.git \
     && cd /go/src/${GITREPO} \
     && git checkout ${COMMIT} \
     && patch -p1 build/build.sh </tmp/static.patch \
@@ -18,7 +21,7 @@ RUN go get -d ${GITREPO} \
     && mv cadvisor /usr/bin/
 
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/containerd/Dockerfile b/pkg/containerd/Dockerfile
index aa3e76543..aefaeb744 100644
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a3d78322152a8b341bdaecfe182a2689fdbdee53 as alpine
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as alpine
 RUN apk add tzdata binutils
 
 WORKDIR $GOPATH/src/github.com/containerd/containerd
diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile
index 3f2e835b9..a75474c49 100644
--- a/pkg/dhcpcd/Dockerfile
+++ b/pkg/dhcpcd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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 \
diff --git a/pkg/dm-crypt/Dockerfile b/pkg/dm-crypt/Dockerfile
index 55ab6ed28..4788665a4 100644
--- a/pkg/dm-crypt/Dockerfile
+++ b/pkg/dm-crypt/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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 \
diff --git a/pkg/extend/Dockerfile b/pkg/extend/Dockerfile
index a09401a0a..ccecae383 100644
--- a/pkg/extend/Dockerfile
+++ b/pkg/extend/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -15,10 +15,10 @@ RUN apk add --no-cache --initdb -p /out \
     && true
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/firmware-all/Dockerfile b/pkg/firmware-all/Dockerfile
index d16f6438e..d587c1469 100644
--- a/pkg/firmware-all/Dockerfile
+++ b/pkg/firmware-all/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 RUN apk add --no-cache git
 
 # Make sure you also update the FW_COMMIT in ../firmware/Dockerfile
diff --git a/pkg/firmware/Dockerfile b/pkg/firmware/Dockerfile
index 6517c532e..76bccb68d 100644
--- a/pkg/firmware/Dockerfile
+++ b/pkg/firmware/Dockerfile
@@ -1,7 +1,7 @@
 # Make modules from a recentish kernel available
 FROM linuxkit/kernel:5.4.28 AS kernel
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 RUN apk add --no-cache git kmod
 
 # Clone the firmware repository
diff --git a/pkg/format/Dockerfile b/pkg/format/Dockerfile
index 70feace10..1b4c1f31b 100644
--- a/pkg/format/Dockerfile
+++ b/pkg/format/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -15,10 +15,10 @@ RUN apk add --no-cache --initdb -p /out \
     && true
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile
index 8c92aa46e..0b35e644b 100644
--- a/pkg/getty/Dockerfile
+++ b/pkg/getty/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile
index 87e2c7cba..48a6c4a28 100644
--- a/pkg/host-timesync-daemon/Dockerfile
+++ b/pkg/host-timesync-daemon/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev git
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 
 ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f
 RUN mkdir -p $GOPATH/src/github.com/linuxkit && \
diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile
index 0191b9548..7f54759c5 100644
--- a/pkg/init/Dockerfile
+++ b/pkg/init/Dockerfile
@@ -1,11 +1,11 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
 
 ADD usermode-helper.c ./
 RUN LDFLAGS=-static CFLAGS=-Werror make usermode-helper
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
@@ -18,7 +18,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:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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/runc.go b/pkg/init/cmd/service/runc.go
index 30e85c38d..97cb2fce0 100644
--- a/pkg/init/cmd/service/runc.go
+++ b/pkg/init/cmd/service/runc.go
@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/opencontainers/runc/libcontainer/system"
 	log "github.com/sirupsen/logrus"
+	"golang.org/x/sys/unix"
 )
 
 const (
@@ -49,7 +49,7 @@ func runcInit(rootPath, serviceType string) int {
 	}
 
 	// need to set ourselves as a child subreaper or we cannot wait for runc as reparents to init
-	if err := system.SetSubreaper(1); err != nil {
+	if err := setSubreaper(1); err != nil {
 		log.Fatalf("Cannot set as subreaper: %v", err)
 	}
 
@@ -164,3 +164,9 @@ func runcInit(rootPath, serviceType string) int {
 
 	return status
 }
+
+// setSubreaper copied directly from https://github.com/opencontainers/runc/blob/b23315bdd99c388f5d0dd3616188729c5a97484a/libcontainer/system/linux.go#L88
+// to avoid version and vendor conflict issues
+func setSubreaper(i int) error {
+	return unix.Prctl(unix.PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0)
+}
diff --git a/pkg/ip/Dockerfile b/pkg/ip/Dockerfile
index 7ac600366..72294b1b5 100644
--- a/pkg/ip/Dockerfile
+++ b/pkg/ip/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add curl
 RUN apk add --no-cache --initdb -p /out \
diff --git a/pkg/kmsg/Dockerfile b/pkg/kmsg/Dockerfile
index 520081591..2f4bb6344 100644
--- a/pkg/kmsg/Dockerfile
+++ b/pkg/kmsg/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev linux-headers
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/logwrite/Dockerfile b/pkg/logwrite/Dockerfile
index dd542db28..c3589ab77 100644
--- a/pkg/logwrite/Dockerfile
+++ b/pkg/logwrite/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/losetup/Dockerfile b/pkg/losetup/Dockerfile
index b9ca5dbf0..7f21587b9 100644
--- a/pkg/losetup/Dockerfile
+++ b/pkg/losetup/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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 \
diff --git a/pkg/memlogd/Dockerfile b/pkg/memlogd/Dockerfile
index b544aaa8e..9d5d46cf2 100644
--- a/pkg/memlogd/Dockerfile
+++ b/pkg/memlogd/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/metadata/Dockerfile b/pkg/metadata/Dockerfile
index 89a488174..6271e7d82 100644
--- a/pkg/metadata/Dockerfile
+++ b/pkg/metadata/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev linux-headers
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/mkimage/Dockerfile b/pkg/mkimage/Dockerfile
index 1557c4656..81e34d5a0 100644
--- a/pkg/mkimage/Dockerfile
+++ b/pkg/mkimage/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/modprobe/Dockerfile b/pkg/modprobe/Dockerfile
index bd5a041f1..fd8c02924 100644
--- a/pkg/modprobe/Dockerfile
+++ b/pkg/modprobe/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/mount/Dockerfile b/pkg/mount/Dockerfile
index 3444c3459..c0e0071d4 100644
--- a/pkg/mount/Dockerfile
+++ b/pkg/mount/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
@@ -9,10 +9,10 @@ RUN apk add --no-cache --initdb -p /out \
     && true
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/node_exporter/Dockerfile b/pkg/node_exporter/Dockerfile
index 469707a56..2592b31ae 100644
--- a/pkg/node_exporter/Dockerfile
+++ b/pkg/node_exporter/Dockerfile
@@ -1,12 +1,15 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as build
 
 RUN apk add --no-cache go git musl-dev make curl gcc
 
 ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GITBASE=github.com/prometheus
 ENV GITREPO=github.com/prometheus/node_exporter
 ENV COMMIT=v0.18.1
 
-RUN go get -d ${GITREPO} \
+RUN mkdir -p /go/src/${GITBASE} \
+    && cd /go/src/${GITBASE} \
+    && git clone https://${GITREPO}.git \
     && cd /go/src/${GITREPO} \
     && git checkout ${COMMIT} \
     && CGO_ENABLED=0 make build \
diff --git a/pkg/open-vm-tools/Dockerfile b/pkg/open-vm-tools/Dockerfile
index a7b483341..b250125d1 100644
--- a/pkg/open-vm-tools/Dockerfile
+++ b/pkg/open-vm-tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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 \
diff --git a/pkg/openntpd/Dockerfile b/pkg/openntpd/Dockerfile
index 44dc2838f..22dcf4687 100644
--- a/pkg/openntpd/Dockerfile
+++ b/pkg/openntpd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/qemu-ga/Dockerfile b/pkg/qemu-ga/Dockerfile
index 89f399307..2d986a17b 100644
--- a/pkg/qemu-ga/Dockerfile
+++ b/pkg/qemu-ga/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN mkdir -p /out/var/run
 RUN apk add --no-cache --initdb -p /out \
diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile
index 374f00063..b7d499fde 100644
--- a/pkg/rngd/Dockerfile
+++ b/pkg/rngd/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go gcc musl-dev linux-headers
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/rngd/cmd/rngd/main.go b/pkg/rngd/cmd/rngd/main.go
index af1fcdaa0..f2bd60cea 100644
--- a/pkg/rngd/cmd/rngd/main.go
+++ b/pkg/rngd/cmd/rngd/main.go
@@ -2,7 +2,7 @@
 
 package main
 
-// int rndaddentropy;
+// extern int rndaddentropy;
 import "C"
 
 import (
diff --git a/pkg/rngd/cmd/rngd/rng_unsupported.go b/pkg/rngd/cmd/rngd/rng_unsupported.go
index 423670bd7..2fa654db7 100644
--- a/pkg/rngd/cmd/rngd/rng_unsupported.go
+++ b/pkg/rngd/cmd/rngd/rng_unsupported.go
@@ -2,6 +2,9 @@
 
 package main
 
+// int rndaddentropy;
+import "C"
+
 import "errors"
 
 func initRand() bool {
diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile
index dbc5be3bc..10466a667 100644
--- a/pkg/runc/Dockerfile
+++ b/pkg/runc/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as alpine
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 as alpine
 RUN \
   apk add \
   bash \
@@ -7,10 +7,11 @@ RUN \
   go \
   libc-dev \
   libseccomp-dev \
+  libseccomp-static \
   linux-headers \
   make \
   && true
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 ENV RUNC_COMMIT=v1.0.0-rc10
 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
   cd $GOPATH/src/github.com/opencontainers && \
diff --git a/pkg/sshd/Dockerfile b/pkg/sshd/Dockerfile
index b0a829dcb..efd2a8af4 100644
--- a/pkg/sshd/Dockerfile
+++ b/pkg/sshd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:a3d78322152a8b341bdaecfe182a2689fdbdee53 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/swap/Dockerfile b/pkg/swap/Dockerfile
index c6ead36bd..ee408e4ee 100644
--- a/pkg/swap/Dockerfile
+++ b/pkg/swap/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 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/sysctl/Dockerfile b/pkg/sysctl/Dockerfile
index 26a9b06f3..9b5cccd55 100644
--- a/pkg/sysctl/Dockerfile
+++ b/pkg/sysctl/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile
index 1da25ec6d..2773f27d2 100644
--- a/pkg/sysfs/Dockerfile
+++ b/pkg/sysfs/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/trim-after-delete/Dockerfile b/pkg/trim-after-delete/Dockerfile
index c4945e029..0c6b76f2b 100644
--- a/pkg/trim-after-delete/Dockerfile
+++ b/pkg/trim-after-delete/Dockerfile
@@ -1,5 +1,5 @@
 # We need the `fstrim` binary:
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 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 \
@@ -11,7 +11,7 @@ RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
 # We also need the Go binary which calls it:
 RUN apk add --no-cache go musl-dev
-ENV GOPATH=/go PATH=$PATH:/go/bin
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 # Hack to work around an issue with go on arm64 requiring gcc
 RUN [ $(uname -m) = aarch64 ] && apk add --no-cache gcc || true
 
diff --git a/pkg/tss/Dockerfile b/pkg/tss/Dockerfile
index 1dc9da495..16e700e82 100644
--- a/pkg/tss/Dockerfile
+++ b/pkg/tss/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
-ENV TROUSERS_COMMIT de57f069ef2297d6a6b3a0353e217a5a2f66e444
-ENV TPM_TOOLS_COMMIT bdf9f1bc8f63cd6fc370c2deb58d03ac55079e84
+ENV TROUSERS_COMMIT 94144b0a1dcef6e31845d6c319e9bd7357208eb9
+ENV TPM_TOOLS_COMMIT bf43837575c5f7d31865562dce7778eae970052e
 
 RUN apk add --no-cache --initdb \
     automake \
@@ -24,8 +24,8 @@ COPY src/glibc_stubs/ /usr/src/glibc_stubs
 WORKDIR /usr/src/glibc_stubs
 RUN make && make install
 
-RUN git clone https://github.com/linuxkit/mirror-trousers.git /usr/src/trousers-trousers && cd /usr/src/trousers-trousers && git checkout $TROUSERS_COMMIT
-RUN git clone https://github.com/linuxkit/mirror-tpm-tools.git /usr/src/trousers-tpm-tools && cd /usr/src/trousers-tpm-tools && git checkout $TPM_TOOLS_COMMIT
+RUN git clone https://git.code.sf.net/p/trousers/trousers /usr/src/trousers-trousers && cd /usr/src/trousers-trousers && git checkout $TROUSERS_COMMIT
+RUN git clone https://git.code.sf.net/p/trousers/tpm-tools /usr/src/trousers-tpm-tools && cd /usr/src/trousers-tpm-tools && git checkout $TPM_TOOLS_COMMIT
 WORKDIR /usr/src/trousers-trousers
 RUN sh bootstrap.sh && \
     ./configure --prefix=/ --sysconfdir=/etc LDFLAGS="-L/out/lib/ -lgetpwent_r" && \
diff --git a/pkg/vpnkit-expose-port/Dockerfile b/pkg/vpnkit-expose-port/Dockerfile
index e7a784073..02cbb1741 100644
--- a/pkg/vpnkit-expose-port/Dockerfile
+++ b/pkg/vpnkit-expose-port/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS build
 
 RUN apk add --no-cache go musl-dev git build-base
-ENV GOPATH=/go PATH=$PATH:/go/bin 
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 ENV COMMIT=db7b7b0f8147f29360d69dc81af9e2877647f0de
 
 RUN git clone https://github.com/moby/vpnkit.git /go/src/github.com/moby/vpnkit && \
diff --git a/pkg/vpnkit-forwarder/Dockerfile b/pkg/vpnkit-forwarder/Dockerfile
index cfe436465..18878c3d9 100644
--- a/pkg/vpnkit-forwarder/Dockerfile
+++ b/pkg/vpnkit-forwarder/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev git build-base
-ENV GOPATH=/go PATH=$PATH:/go/bin 
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 ENV COMMIT=db7b7b0f8147f29360d69dc81af9e2877647f0de
 
 RUN git clone https://github.com/moby/vpnkit.git /go/src/github.com/moby/vpnkit && \
diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile
index 213e9ef61..bbf340ef4 100644
--- a/pkg/vsudd/Dockerfile
+++ b/pkg/vsudd/Dockerfile
@@ -1,7 +1,7 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS mirror
+FROM linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1 AS mirror
 
 RUN apk add --no-cache go musl-dev git build-base
-ENV GOPATH=/go PATH=$PATH:/go/bin 
+ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
 ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f
 
 RUN git clone https://github.com/linuxkit/virtsock.git /go/src/github.com/linuxkit/virtsock && \