From 607686324415fbe005697e0101c4c40066feb4cc Mon Sep 17 00:00:00 2001
From: Austin Heyne <aheyne@ccri.com>
Date: Tue, 25 Jul 2017 11:08:45 -0400
Subject: [PATCH 1/2] Added fix for Accumulo 1.8

Signed-off-by: Austin Heyne <aheyne@ccri.com>
---
 fs/opt/accumulo/conf/client.conf.template | 21 +++++++++++++++++++++
 fs/sbin/entrypoint.sh                     |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 fs/opt/accumulo/conf/client.conf.template

diff --git a/fs/opt/accumulo/conf/client.conf.template b/fs/opt/accumulo/conf/client.conf.template
new file mode 100644
index 0000000..d7b0d9a
--- /dev/null
+++ b/fs/opt/accumulo/conf/client.conf.template
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+instance.name=${INSTANCE_NAME:=accumulo}
+instance.zookeeper.host=localhost:2181
+# instance.rpc.ssl.enabled=false
+
+# instance.rcp.sasl.enabled=false
+# rpc.sasl.qop=auth
diff --git a/fs/sbin/entrypoint.sh b/fs/sbin/entrypoint.sh
index 1e5c187..b270e38 100755
--- a/fs/sbin/entrypoint.sh
+++ b/fs/sbin/entrypoint.sh
@@ -22,6 +22,7 @@ template $HADOOP_CONF_DIR/core-site.xml
 DEFAULT_FS=$(xmllint --xpath "//property[name='fs.defaultFS']/value/text()"  $HADOOP_CONF_DIR/core-site.xml)
 INSTANCE_VOLUME=${INSTANCE_VOLUME:-$DEFAULT_FS/$INSTANCE_NAME}
 template $ACCUMULO_CONF_DIR/accumulo-site.xml
+template $ACCUMULO_CONF_DIR/client.conf
 
 # The first argument determines this container's role in the accumulo cluster
 ROLE=${1:-}

From 3e8b772699d1cbb0dc36f752eb8ee0680e26c29e Mon Sep 17 00:00:00 2001
From: Austin Heyne <aheyne@ccri.com>
Date: Tue, 25 Jul 2017 16:53:15 -0400
Subject: [PATCH 2/2] Update Accumulo mirror and version so project builds

Signed-off-by: Austin Heyne <aheyne@ccri.com>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f55cde9..ed039ac 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BASE := $(subst -, ,$(notdir ${CURDIR}))
 ORG  := $(word 1, ${BASE})
 REPO := $(word 2, ${BASE})
 IMG  := quay.io/${ORG}/${REPO}
-ACCUMULO_VERSION := 1.7.2
+ACCUMULO_VERSION := 1.7.3
 
 build: accumulo-${ACCUMULO_VERSION}-bin.tar.gz
 	docker build \
@@ -10,7 +10,7 @@ build: accumulo-${ACCUMULO_VERSION}-bin.tar.gz
 		-t ${IMG}:latest .
 
 accumulo-${ACCUMULO_VERSION}-bin.tar.gz:
-	curl -L -C - -O "http://apache.mirrors.pair.com/accumulo/${ACCUMULO_VERSION}/accumulo-${ACCUMULO_VERSION}-bin.tar.gz"
+	curl -L -C - -O "http://apache.mirrors.lucidnetworks.net/accumulo/${ACCUMULO_VERSION}/accumulo-${ACCUMULO_VERSION}-bin.tar.gz"
 
 publish: build
 	docker push ${IMG}:latest