From 645bf4a764e6240bb7f36683aa739505f40b9cce Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 14 Apr 2017 13:30:12 -0700
Subject: Resurrect zerotier-containerized.

---
 .../other/zerotier-containerized/Dockerfile          | 20 --------------------
 .../other/zerotier-containerized/main.sh             | 10 ----------
 .../linux/zerotier-containerized/Dockerfile          | 20 ++++++++++++++++++++
 .../linux/zerotier-containerized/main.sh             | 10 ++++++++++
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 attic/linux-build-farm/other/zerotier-containerized/Dockerfile
 delete mode 100755 attic/linux-build-farm/other/zerotier-containerized/main.sh
 create mode 100644 ext/installfiles/linux/zerotier-containerized/Dockerfile
 create mode 100755 ext/installfiles/linux/zerotier-containerized/main.sh

diff --git a/attic/linux-build-farm/other/zerotier-containerized/Dockerfile b/attic/linux-build-farm/other/zerotier-containerized/Dockerfile
deleted file mode 100644
index 678216da..00000000
--- a/attic/linux-build-farm/other/zerotier-containerized/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM alpine:latest
-MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
-
-LABEL version="1.1.14"
-LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
-
-# Uncomment to build in container
-#RUN apk add --update alpine-sdk linux-headers
-
-RUN apk add --update libgcc libstdc++
-
-ADD zerotier-one /
-RUN chmod 0755 /zerotier-one
-RUN ln -sf /zerotier-one /zerotier-cli
-RUN mkdir -p /var/lib/zerotier-one
-
-ADD main.sh /
-RUN chmod 0755 /main.sh
-
-ENTRYPOINT /main.sh
diff --git a/attic/linux-build-farm/other/zerotier-containerized/main.sh b/attic/linux-build-farm/other/zerotier-containerized/main.sh
deleted file mode 100755
index 685a6891..00000000
--- a/attic/linux-build-farm/other/zerotier-containerized/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
-
-if [ ! -e /dev/net/tun ]; then
-	echo 'FATAL: cannot start ZeroTier One in container: /dev/net/tun not present.'
-	exit 1
-fi
-
-exec /zerotier-one
diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile
new file mode 100644
index 00000000..678216da
--- /dev/null
+++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile
@@ -0,0 +1,20 @@
+FROM alpine:latest
+MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
+
+LABEL version="1.1.14"
+LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
+
+# Uncomment to build in container
+#RUN apk add --update alpine-sdk linux-headers
+
+RUN apk add --update libgcc libstdc++
+
+ADD zerotier-one /
+RUN chmod 0755 /zerotier-one
+RUN ln -sf /zerotier-one /zerotier-cli
+RUN mkdir -p /var/lib/zerotier-one
+
+ADD main.sh /
+RUN chmod 0755 /main.sh
+
+ENTRYPOINT /main.sh
diff --git a/ext/installfiles/linux/zerotier-containerized/main.sh b/ext/installfiles/linux/zerotier-containerized/main.sh
new file mode 100755
index 00000000..685a6891
--- /dev/null
+++ b/ext/installfiles/linux/zerotier-containerized/main.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
+
+if [ ! -e /dev/net/tun ]; then
+	echo 'FATAL: cannot start ZeroTier One in container: /dev/net/tun not present.'
+	exit 1
+fi
+
+exec /zerotier-one
-- 
cgit v1.2.3