Update due to changes in Accumulo 2.0.0-SNAPSHOT (#5)
* Accumulo 2.0 requires Hadoop 3.x
* Use HADOOP_HOME rather than HADOOP_PREFIX for Hadoop 3.x
* Converted accumulo-site.xml to accumulo.properties
diff --git a/Dockerfile b/Dockerfile
index 59e331d..8066d56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,9 +22,9 @@
ARG HADOOP_USER_NAME
ARG ZOOKEEPER_VERSION
-ENV HADOOP_VERSION ${HADOOP_VERSION:-2.7.4}
+ENV HADOOP_VERSION ${HADOOP_VERSION:-3.1.1}
ENV HADOOP_USER_NAME ${HADOOP_USER_NAME:-accumulo}
-ENV ZOOKEEPER_VERSION ${ZOOKEEPER_VERSION:-3.4.9}
+ENV ZOOKEEPER_VERSION ${ZOOKEEPER_VERSION:-3.4.13}
ENV ACCUMULO_VERSION 2.0.0-SNAPSHOT
ENV APACHE_DIST_URLS \
@@ -66,11 +66,11 @@
RUN /opt/accumulo/bin/accumulo-util build-native
-ADD ./accumulo-site.xml /opt/accumulo/conf
+ADD ./accumulo.properties /opt/accumulo/conf
ADD ./log4j-service.properties /opt/accumulo/conf
ADD ./log4j-monitor.properties /opt/accumulo/conf
-ENV HADOOP_PREFIX /opt/hadoop
+ENV HADOOP_HOME /opt/hadoop
ENV ZOOKEEPER_HOME /opt/zookeeper
ENV ACCUMULO_HOME /opt/accumulo
ENV PATH "$PATH:$ACCUMULO_HOME/bin"
diff --git a/README.md b/README.md
index 83f23de..28bc23f 100644
--- a/README.md
+++ b/README.md
@@ -62,14 +62,14 @@
# Run Accumulo using Docker
-Before you can run Accumulo services in Docker, you will need to install Accumulo, configure `accumulo-site.xml`,
-and initialize your instance with `--upload-accumulo-site`. This will upload configuration to Zookeeper and limit
+Before you can run Accumulo services in Docker, you will need to install Accumulo, configure `accumulo.properties`,
+and initialize your instance with `--upload-accumulo-props`. This will upload configuration to Zookeeper and limit
how much configuration needs to be set on the command line.
```bash
-$ accumulo init --upload-accumulo-site
+$ accumulo init --upload-accumulo-props
...
-Uploading properties in accumulo-site.xml to Zookeeper. Properties that cannot be set in Zookeeper will be skipped:
+Uploading properties in accumulo.properties to Zookeeper. Properties that cannot be set in Zookeeper will be skipped:
Skipped - instance.secret = <hidden>
Skipped - instance.volumes = hdfs://localhost:8020/accumulo
Skipped - instance.zookeeper.host = localhost:2181
diff --git a/accumulo-site.xml b/accumulo-site.xml
deleted file mode 100644
index 09c7394..0000000
--- a/accumulo-site.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!-- This is the main configuration file for Apache Accumulo. Available configuration properties can be
- found in the Accumulo documentation on the Accumulo project website (https://accumulo.apache.org/) -->
-<configuration>
- <!-- Set location in HDFS where Accumulo will store data -->
- <property>
- <name>instance.volumes</name>
- <value>hdfs://localhost:8020/accumulo</value>
- </property>
- <!-- Set location of Zookeepers -->
- <property>
- <name>instance.zookeeper.host</name>
- <value>localhost:2181</value>
- </property>
- <!-- Change secret before initialization. All servers must have same secret -->
- <property>
- <name>instance.secret</name>
- <value>DEFAULT</value>
- </property>
- <!-- Set to false if 'accumulo-util build-native' fails -->
- <property>
- <name>tserver.memory.maps.native.enabled</name>
- <value>true</value>
- </property>
- <!-- Set a correct user/password below -->
- <property>
- <name>trace.user</name>
- <value>root</value>
- </property>
- <property>
- <name>trace.password</name>
- <value>secret</value>
- </property>
- <property>
- <name>tserver.port.search</name>
- <value>true</value>
- </property>
-</configuration>
diff --git a/accumulo.properties b/accumulo.properties
new file mode 100644
index 0000000..2ba912a
--- /dev/null
+++ b/accumulo.properties
@@ -0,0 +1,39 @@
+# 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.
+
+# This is the main configuration file for Apache Accumulo. Available configuration properties can be
+# found in the Accumulo documentation on the Accumulo project website (https://accumulo.apache.org/)
+# Link for Accumulo 2.0: https://accumulo.apache.org/docs/2.0/administration/properties
+
+## Sets location in HDFS where Accumulo will store data
+instance.volumes=hdfs://localhost:8020/accumulo
+
+## Sets location of Zookeepers
+instance.zookeeper.host=localhost:2181
+
+## Change secret before initialization. All Accumulo servers must have same secret
+instance.secret=DEFAULT
+
+## Set to false if 'accumulo-util build-native' fails
+tserver.memory.maps.native.enabled=true
+
+## Trace user
+trace.user=root
+
+## Trace password
+trace.password=secret
+
+## Search for available port if default is unavailable
+tserver.port.search=true
