From 35f519d7d2bf2307bfc173ab83eb23e75e5c2b7f Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Wed, 22 Feb 2017 11:59:00 -0800
Subject: [PATCH] refactor xena/alpine

---
 base/alpine/bin/xeservca | 8 ++++++++
 base/alpine/box.rb       | 8 ++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100755 base/alpine/bin/xeservca

diff --git a/base/alpine/bin/xeservca b/base/alpine/bin/xeservca
new file mode 100755
index 0000000..d0f4224
--- /dev/null
+++ b/base/alpine/bin/xeservca
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "adding Xeserv CA"
+
+apk add wget
+wget https://xena.greedo.xeserv.us/files/ca.pem -O /usr/local/share/ca-certificates/xeserv_ca.pem
+update-ca-certificates
+apk del wget
diff --git a/base/alpine/box.rb b/base/alpine/box.rb
index 44b1308..a542a18 100644
--- a/base/alpine/box.rb
+++ b/base/alpine/box.rb
@@ -2,6 +2,7 @@ from "alpine:edge"
 
 copy "repositories", "/etc/apk/repositories"
 copy "runit/", "/etc/system"
+copy "bin/", "/bin"
 
 run "apk upgrade --no-cache"
 run "apk add --no-cache --virtual xe-alpine-base tini ca-certificates runit libc6-compat"
@@ -17,15 +18,10 @@ run %q[ apk add -U --no-cache wget ca-certificates \
      && rm backplane-stable-linux-amd64.tgz \
      && apk del wget ]
 
-# Add glue and vardene
+# Add glue
 run %q[ apk add -U --no-cache wget \
      && cd /usr/bin && wget https://xena.greedo.xeserv.us/files/glue \
      && chmod a+x /usr/bin/glue \
-     && wget https://xena.greedo.xeserv.us/files/vardene \
-     && chmod a+x /usr/bin/vardene \
-     && cd /usr/local/share/ca-certificates \
-     && wget https://xena.greedo.xeserv.us/files/ca.pem -O xeserv_ca.pem \
-     && update-ca-certificates \
      && apk del wget ]
 
 copy "./entrypoint.sh", "/usr/sbin/entrypoint.sh"