From 8936dc35337546ba28c5b7424225af7f77a5887e Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@google.com>
Date: Fri, 1 Sep 2017 14:54:08 -0400
Subject: [PATCH] fix bees

Signed-off-by: Jess Frazelle <acidburn@google.com>
---
 beeswithmachineguns/Dockerfile | 13 ++++++++++---
 golang-softhsm2/Dockerfile     | 35 ----------------------------------
 golang-softhsm2/softhsm2.conf  |  5 -----
 3 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 golang-softhsm2/Dockerfile
 delete mode 100644 golang-softhsm2/softhsm2.conf

diff --git a/beeswithmachineguns/Dockerfile b/beeswithmachineguns/Dockerfile
index 22d33ae..a38843c 100644
--- a/beeswithmachineguns/Dockerfile
+++ b/beeswithmachineguns/Dockerfile
@@ -3,14 +3,21 @@ LABEL maintainer "Jessie Frazelle <jess@linux.com>"
 
 RUN apk --no-cache add \
 	ca-certificates \
-	git \
 	python \
 	py-boto \
 	py-paramiko
 
-RUN git clone --depth 1 https://github.com/newsapps/beeswithmachineguns /usr/src/beeswithmachineguns \
+RUN buildDeps=' \
+		build-base \
+		git \
+		python-dev \
+	' \
+	set -x \
+	&& apk --no-cache add $buildDeps \
+	&& git clone --depth 1 https://github.com/newsapps/beeswithmachineguns /usr/src/beeswithmachineguns \
 	&& cd /usr/src/beeswithmachineguns \
 	&& python setup.py install \
-	&& rm -rf /usr/src/beeswithmachineguns
+	&& rm -rf /usr/src/beeswithmachineguns \
+	&& apk del $buildDeps
 
 ENTRYPOINT [ "bees" ]
diff --git a/golang-softhsm2/Dockerfile b/golang-softhsm2/Dockerfile
deleted file mode 100644
index 623c201..0000000
--- a/golang-softhsm2/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM golang:latest
-
-RUN apt-get update && apt-get install -y \
-	sqlite3 \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV SOFTHSM_VERSION 2.3.0rc1
-
-RUN buildDeps=' \
-		autoconf \
-		automake \
-		build-essential \
-		libtool \
-		libssl-dev \
-		libsqlite3-dev \
-	' \
-	&& set -x \
-	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& git clone --depth 1 --branch "${SOFTHSM_VERSION}" https://github.com/opendnssec/SoftHSMv2.git /usr/src/SoftHSMv2 \
-	&& cd /usr/src/SoftHSMv2 \
-	&& sh autogen.sh \
-	&& ./configure --with-objectstore-backend-db \
-	&& make \
-	&& make install \
-	&& rm -rf /usr/src/SoftHSMv2 \
-	&& apt-get purge -y --auto-remove $buildDeps \
-	&& mkdir -p /softhsm2/tokens
-
-# Default locations for the SoftHSM2 configuration and PKCS11 bindings
-ENV SOFTHSM2_CONF="/etc/softhsm2/softhsm2.conf"
-ENV LIBDIR="/usr/local/lib/softhsm/"
-COPY ./softhsm2.conf /etc/softhsm2/softhsm2.conf
-
-ENTRYPOINT ["softhsm2-util"]
diff --git a/golang-softhsm2/softhsm2.conf b/golang-softhsm2/softhsm2.conf
deleted file mode 100644
index 775101f..0000000
--- a/golang-softhsm2/softhsm2.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# SoftHSM v2 configuration file
-
-directories.tokendir = /softhsm2/tokens
-objectstore.backend = db
-log.level = INFO