This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch ozone-1.0.0-rocky in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
commit 0a0e3d5349698929896325baaef2d31538d1b684 Author: Doroszlai, Attila <[email protected]> AuthorDate: Fri Aug 16 11:50:40 2024 +0200 HDDS-11329. Update Ozone images to Rocky Linux-based runner --- Dockerfile | 8 +++++--- build.sh | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index aeca649..1f83583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,10 @@ # 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:20240729-jdk11-1 +ARG OZONE_URL=https://archive.apache.org/dist/hadoop/ozone/ozone-1.0.0/hadoop-ozone-1.0.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 +RUN sudo rm -rf /opt/hadoop && curl -LSs -o ozone.tar.gz $OZONE_URL && tar zxf ozone.tar.gz && rm ozone.tar.gz && mv ozone* hadoop WORKDIR /opt/hadoop COPY log4j.properties /opt/hadoop/etc/hadoop/log4j.properties COPY ozone-site.xml /opt/hadoop/etc/hadoop/ozone-site.xml @@ -25,4 +25,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/ COPY --chown=hadoop:users transformation.py /opt/hadoop/libexec/ +ENV HADOOP_CONF_DIR=/etc/hadoop +ENV HADOOP_LOG_DIR=/var/log/hadoop CMD ["/usr/local/bin/start-ozone-all.sh"] diff --git a/build.sh b/build.sh index d27b85b..39e4227 100755 --- a/build.sh +++ b/build.sh @@ -15,13 +15,19 @@ # limitations under the License. DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + set -eu + mkdir -p build -if [ ! -d "$DIR/build/apache-rat-0.13" ]; then + +ozone_version=1.0.0 +rat_version=0.16.1 + +if [ ! -d "$DIR/build/apache-rat-${rat_version}" ]; then if type wget 2> /dev/null; then - wget "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz"; -O "$DIR/build/apache-rat.tar.gz" + wget "https://dlcdn.apache.org/creadur/apache-rat-${rat_version}/apache-rat-${rat_version}-bin.tar.gz"; -O "$DIR/build/apache-rat.tar.gz" elif type curl 2> /dev/null; then - curl -LSs "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=creadur/apache-rat-0.13/apache-rat-0.13-bin.tar.gz"; -o "$DIR/build/apache-rat.tar.gz" + curl -LSs "https://dlcdn.apache.org/creadur/apache-rat-${rat_version}/apache-rat-${rat_version}-bin.tar.gz"; -o "$DIR/build/apache-rat.tar.gz" else exit 1 fi @@ -29,6 +35,8 @@ if [ ! -d "$DIR/build/apache-rat-0.13" ]; then tar zvxf apache-rat.tar.gz cd - 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 + +java -jar $DIR/build/apache-rat-${rat_version}/apache-rat-${rat_version}.jar $DIR -e .dockerignore -e public -e apache-rat-${rat_version} -e .git -e .gitignore + +docker build --build-arg OZONE_URL -t apache/ozone $@ . +docker tag apache/ozone apache/ozone:${ozone_version} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
