From f7cc10890d87d6b7904c7cd11bd0a5bdea080167 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Sat, 20 May 2017 11:05:35 +0100
Subject: [PATCH] Update sysfs in line with sysctl

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 pkg/sysfs/.gitignore |  4 ----
 pkg/sysfs/Dockerfile | 14 ++++++++++++-
 pkg/sysfs/Makefile   | 48 +++++++++-----------------------------------
 3 files changed, 22 insertions(+), 44 deletions(-)
 delete mode 100644 pkg/sysfs/.gitignore

diff --git a/pkg/sysfs/.gitignore b/pkg/sysfs/.gitignore
deleted file mode 100644
index db2b4ca32..000000000
--- a/pkg/sysfs/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-dev
-proc
-sys
-usr
diff --git a/pkg/sysfs/Dockerfile b/pkg/sysfs/Dockerfile
index fa7e5a86f..42946bc42 100644
--- a/pkg/sysfs/Dockerfile
+++ b/pkg/sysfs/Dockerfile
@@ -1,3 +1,15 @@
+FROM linuxkit/alpine:5f6db26ab7bf6a9c452a612e236cc7495408132b@sha256:d009afc85d0b005daf51c8f3026aa552ab997dc47cab43915e9dc761accae086 AS mirror
+
+RUN apk add --no-cache go musl-dev
+ENV GOPATH=/go PATH=$PATH:/go/bin
+
+COPY main.go /go/src/sysfs/
+RUN go-compile.sh /go/src/sysfs
+
 FROM scratch
-COPY . ./
+ENTRYPOINT []
+CMD []
+WORKDIR /
+COPY --from=mirror /go/bin/sysfs /usr/bin/sysfs
+COPY etc/ /etc/
 CMD ["/usr/bin/sysfs"]
diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile
index d6e3b28c7..cebfb5003 100644
--- a/pkg/sysfs/Makefile
+++ b/pkg/sysfs/Makefile
@@ -1,45 +1,15 @@
-GO_COMPILE=linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5
-
-SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
-
-SYSFS_BINARY=usr/bin/sysfs
+.PHONY: tag push
+default: push
 
 ORG?=linuxkit
 IMAGE=sysfs
+DEPS=Dockerfile Makefile main.go
 
-.PHONY: tag push clean container
-default: push
+HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
 
-$(SYSFS_BINARY): main.go
-	mkdir -p $(dir $@)
-	tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(GO_COMPILE) -o $@ | tar xf -
+tag: $(DEPS)
+	docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
 
-DIRS=dev proc sys
-$(DIRS):
-	mkdir -p $@
-
-DEPS=$(DIRS) $(SYSFS_BINARY) etc/sysfs.d/00-moby.conf
-
-container: Dockerfile $(DEPS)
-	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-
-hash: Dockerfile $(DEPS)
-	find $^ -type f | xargs cat | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash
-
-push: hash container
-	docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) && \
-		 docker push $(ORG)/$(IMAGE):$(shell cat hash))
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-tag: hash container
-	docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash)
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-clean:
-	rm -rf hash $(DIRS) usr
-
-.DELETE_ON_ERROR:
+push: tag
+	docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	docker push $(ORG)/$(IMAGE):$(HASH)