diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml index 3ec4b83b037..64fc2cfa372 100644 --- a/hadoop-ozone/dist/pom.xml +++ b/hadoop-ozone/dist/pom.xml @@ -28,7 +28,7 @@ UTF-8 true - 20230615-1 + 20240316-jdk17-1 apache/ozone-testkrb5:20230318-1 true diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.ssh/environment b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.ssh/environment deleted file mode 100644 index cbde0f2078d..00000000000 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/.ssh/environment +++ /dev/null @@ -1,16 +0,0 @@ -# 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. -JAVA_HOME=/usr/lib/jvm/jre diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile index 79aeec48858..714a6f56d66 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/Dockerfile @@ -36,7 +36,8 @@ RUN sudo chown hadoop /opt RUN sudo chmod 600 /opt/.ssh/* RUN sudo chmod 700 /opt/.ssh -RUN sudo sh -c 'echo "export JAVA_HOME=/usr/lib/jvm/jre/" >> /etc/profile' +RUN echo "export JAVA_HOME=$JAVA_HOME" | sudo sh -c 'cat >> /etc/profile' +RUN echo "JAVA_HOME=$JAVA_HOME" | sh -c 'cat >> /opt/.ssh/environment' # Install required robot framework libraries RUN sudo pip3 install robotframework-sshlibrary diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/.ssh/environment b/hadoop-ozone/dist/src/main/compose/ozonescripts/.ssh/environment deleted file mode 100644 index cbde0f2078d..00000000000 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/.ssh/environment +++ /dev/null @@ -1,16 +0,0 @@ -# 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. -JAVA_HOME=/usr/lib/jvm/jre diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile index fd9993b56e2..35c6ccabd37 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile @@ -35,5 +35,7 @@ RUN sudo chown hadoop /opt RUN sudo chmod 600 /opt/.ssh/* RUN sudo chmod 700 /opt/.ssh -RUN sudo sh -c 'echo "export JAVA_HOME=/usr/lib/jvm/jre/" >> /etc/profile' +RUN echo "export JAVA_HOME=$JAVA_HOME" | sudo sh -c 'cat >> /etc/profile' +RUN echo "JAVA_HOME=$JAVA_HOME" | sh -c 'cat >> /opt/.ssh/environment' + CMD ["sudo","/usr/sbin/sshd","-D"] diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config index d8b82ff2201..a194fbc2265 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/docker-config @@ -157,7 +157,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=* #BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm OZONE_DATANODE_SECURE_USER=root -JAVA_HOME=/usr/lib/jvm/jre JSVC_HOME=/usr/bin OZONE_CONF_DIR=/etc/hadoop diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index c4ddfdbafec..0ffba0c96f4 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -75,7 +75,6 @@ CORE-SITE.XML_hadoop.security.authorization=false #BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm OZONE_DATANODE_SECURE_USER=root -JAVA_HOME=/usr/lib/jvm/jre JSVC_HOME=/usr/bin OZONE_CLASSPATH= diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config index d09e2db8e3d..b13eecf68e8 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config @@ -149,7 +149,6 @@ KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=* #BYTEMAN_SCRIPT_URL=https://raw.githubusercontent.com/apache/hadoop/trunk/dev-support/byteman/hadooprpc.btm OZONE_DATANODE_SECURE_USER=root -JAVA_HOME=/usr/lib/jvm/jre JSVC_HOME=/usr/bin OZONE_CONF_DIR=/etc/hadoop