Merge remote-tracking branch 'origin/ozone-latest' into latest
diff --git a/Dockerfile b/Dockerfile
index a66acf1..af6733f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apache/ozone-runner:20191107-1
-ARG OZONE_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=hadoop/ozone/ozone-1.0.0/hadoop-ozone-1.0.0.tar.gz
+FROM apache/ozone-runner:20210329-1
+ARG OZONE_URL=https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=ozone/1.1.0/ozone-1.1.0.tar.gz
WORKDIR /opt
RUN sudo rm -rf /opt/hadoop && wget $OZONE_URL -O ozone.tar.gz && tar zxf ozone.tar.gz && rm ozone.tar.gz && mv ozone* hadoop
WORKDIR /opt/hadoop
@@ -24,4 +24,6 @@
COPY --chown=hadoop:users start-ozone-all.sh /usr/local/bin/
COPY --chown=hadoop:users docker-compose.yaml /opt/hadoop/
COPY --chown=hadoop:users docker-config /opt/hadoop/
+ENV OZONE_CONF_DIR=/etc/hadoop
+ENV OZONE_LOG_DIR=/var/log/hadoop
CMD ["/usr/local/bin/start-ozone-all.sh"]
diff --git a/build.sh b/build.sh
index d27b85b..68c34d4 100755
--- a/build.sh
+++ b/build.sh
@@ -31,4 +31,4 @@
fi
java -jar $DIR/build/apache-rat-0.13/apache-rat-0.13.jar $DIR -e .dockerignore -e public -e apache-rat-0.13 -e .git -e .gitignore
docker build --build-arg OZONE_URL -t apache/ozone .
-docker tag apache/ozone apache/ozone:1.0.0
+docker tag apache/ozone apache/ozone:1.1.0
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b9b5a4e..56ae6f1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,14 +17,14 @@
version: "3"
services:
datanode:
- image: apache/ozone:1.0.0
+ image: apache/ozone:1.1.0
ports:
- 9864
command: ["ozone","datanode"]
env_file:
- ./docker-config
om:
- image: apache/ozone:1.0.0
+ image: apache/ozone:1.1.0
ports:
- 9874:9874
environment:
@@ -34,7 +34,7 @@
- ./docker-config
command: ["ozone","om"]
scm:
- image: apache/ozone:1.0.0
+ image: apache/ozone:1.1.0
ports:
- 9876:9876
env_file:
@@ -43,14 +43,14 @@
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
command: ["ozone","scm"]
recon:
- image: apache/ozone:1.0.0
+ image: apache/ozone:1.1.0
ports:
- 9888:9888
env_file:
- ./docker-config
command: ["ozone","recon"]
s3g:
- image: apache/ozone:1.0.0
+ image: apache/ozone:1.1.0
ports:
- 9878:9878
env_file:
diff --git a/docker-config b/docker-config
index 310263e..5a61be2 100644
--- a/docker-config
+++ b/docker-config
@@ -26,5 +26,4 @@
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
OZONE-SITE.XML_ozone.recon.address=recon:9891
-
no_proxy=om,recon,scm,s3g,localhost,127.0.0.1
