From 42a960df47f213cac5bf55c90d0ac3fdcc69bb85 Mon Sep 17 00:00:00 2001
From: Pagan Gazzard <pjgazzard@googlemail.com>
Date: Thu, 28 Apr 2016 17:16:32 -0700
Subject: [PATCH] Switch to using resin-base for the dind supervisor.

---
 Makefile                         |  3 --
 tools/dind/Dockerfile            | 70 ++------------------------------
 tools/dind/config/01_buildconfig |  5 ---
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 tools/dind/config/01_buildconfig

diff --git a/Makefile b/Makefile
index 0947a09e..c9c644b4 100644
--- a/Makefile
+++ b/Makefile
@@ -45,10 +45,7 @@ clean:
 	-rm Dockerfile
 
 supervisor-dind:
-	cp 01_nodoc tools/dind/config/
-	touch -t 7805200000 tools/dind/config/01_nodoc
 	cd tools/dind && docker build --no-cache=$(DISABLE_CACHE) -t resin/resin-supervisor-dind:$(SUPERVISOR_VERSION) .
-	rm tools/dind/config/01_nodoc
 
 run-supervisor: supervisor-dind stop-supervisor
 	cd tools/dind \
diff --git a/tools/dind/Dockerfile b/tools/dind/Dockerfile
index 3aa5faf6..1c47c5b5 100644
--- a/tools/dind/Dockerfile
+++ b/tools/dind/Dockerfile
@@ -1,75 +1,13 @@
-FROM debian:jessie
+FROM resin/resin-base:1
 
 VOLUME /var/lib/docker
 VOLUME /resin-data
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV TERM xterm
-ENV DOCKER_VERSION 1.6.2
-
-COPY ./config/01_nodoc /etc/dpkg/dpkg.cfg.d/
-COPY ./config/01_buildconfig /etc/apt/apt.conf.d/
-
 RUN apt-get update \
-	&& apt-get dist-upgrade \
-	&& apt-get install -y \
-		apt-transport-https \
-		build-essential \
-		ca-certificates \
-		curl \
-		dbus \
-		git \
-		htop \
-		iptables \
-		less \
-		libpq-dev \
-		libsqlite3-dev \
-		jq \
-		nano \
-		netcat \
-		ifupdown \
-		openssh-client \
-		openssh-server \
-		openvpn \
-		parted \
-		python \
-		python-dev \
-		rsyslog \
-		rsyslog-gnutls \
-		vim \
-		wget \
+	&& apt-get install -y ifupdown \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV CONFD_VERSION 0.10.0
-
-RUN wget -O /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v${CONFD_VERSION}/confd-${CONFD_VERSION}-linux-amd64 \
-	&& chmod a+x /usr/local/bin/confd \
-	&& ln -s /usr/src/app/config/confd /etc/confd
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# systemd configuration
-
-ENV container lxc
-
-# We never want these to run in a container
-RUN systemctl mask \
-	dev-hugepages.mount \
-	dev-mqueue.mount \
-	sys-fs-fuse-connections.mount \
-	sys-kernel-config.mount \
-	sys-kernel-debug.mount \
-
-	display-manager.service \
-	getty@.service \
-	systemd-logind.service \
-	systemd-remount-fs.service \
-
-	getty.target \
-	graphical.target
-
-RUN systemctl disable ssh.service
+ENV DOCKER_VERSION 1.6.2
 
 # From get.docker.com script
 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 \
@@ -82,5 +20,3 @@ COPY config/services/ /etc/systemd/system/
 COPY resin-vars vpn-init /usr/src/app/
 
 RUN systemctl enable resin-supervisor-dind
-
-CMD env > /etc/docker.env; exec /sbin/init
diff --git a/tools/dind/config/01_buildconfig b/tools/dind/config/01_buildconfig
deleted file mode 100644
index 15dcac99..00000000
--- a/tools/dind/config/01_buildconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-APT::Get::Assume-Yes "true";
-APT::Get::force-yes "true";
-APT::Install-Recommends "0";
-APT::Install-Suggests "0";
-quiet "true";