From 045e5ad63317484ce07ee5f44fd77865a22809cd Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Thu, 4 Oct 2018 16:29:16 -0400
Subject: [PATCH] cleanup and fix

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 k8scan/main.go         |  2 +-
 windmill/Dockerfile    | 34 ----------------------------------
 windmill/entrypoint.sh |  7 -------
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 windmill/Dockerfile
 delete mode 100755 windmill/entrypoint.sh

diff --git a/k8scan/main.go b/k8scan/main.go
index 8a86b6c..816702f 100644
--- a/k8scan/main.go
+++ b/k8scan/main.go
@@ -405,7 +405,7 @@ func inc(ip net.IP) {
 }
 
 func sendEmail(uri, ip string, port int, arinInfo ARINResponse) error {
-	mailgunClient := mailgun.NewMailgun(mailgunDomain, mailgunAPIKey, "")
+	mailgunClient := mailgun.NewMailgun(mailgunDomain, mailgunAPIKey)
 
 	msg, _, err := mailgunClient.Send(mailgunClient.NewMessage(
 		/* From */ fmt.Sprintf("%s <%s>", emailSender, emailSender),
diff --git a/windmill/Dockerfile b/windmill/Dockerfile
deleted file mode 100644
index af4e66b..0000000
--- a/windmill/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM ruby:alpine
-
-RUN	apk add --no-cache \
-	bash \
-	ca-certificates \
-	libxml2 \
-	libxslt \
-	postgresql-libs \
-	sqlite-libs
-
-RUN	set -x \
-	&& apk add --no-cache --virtual .build-deps \
-		build-base \
-		git \
-		libxml2-dev \
-		libxslt-dev \
-		pkgconfig \
-		postgresql-dev \
-		sqlite-dev \
-	&& git clone --depth 1 https://github.com/heroku/windmill.git /usr/src/windmill \
-	&& ( \
-		cd /usr/src/windmill \
-		&& sed -i 's/ruby "2.2.3"/ruby "2.5.1"/' Gemfile \
-		&& bundle config build.nokogiri --use-system-libraries \
-		&& bundle install \
-	) \
-	&& apk del .build-deps
-
-WORKDIR /usr/src/windmill
-
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENTRYPOINT [ "entrypoint.sh" ]
-CMD [ "puma", "-C", "puma.rb" ]
diff --git a/windmill/entrypoint.sh b/windmill/entrypoint.sh
deleted file mode 100755
index 7d70d31..0000000
--- a/windmill/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-rake db:setup
-
-exec "$@"