This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch ozone-1.3.0-rocky in repository https://gitbox.apache.org/repos/asf/ozone-docker.git
commit b2ca095b83e0712f06cb54361f82c35924f69693 Author: Doroszlai, Attila <[email protected]> AuthorDate: Fri Aug 16 11:35:56 2024 +0200 HDDS-11329. Update Ozone images to Rocky Linux-based runner --- Dockerfile | 2 +- build.sh | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5682596..48e3e15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM apache/ozone-runner:20220623-1 +FROM apache/ozone-runner:20240729-jdk11-1 ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.3.0/ozone-1.3.0.tar.gz WORKDIR /opt 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 diff --git a/build.sh b/build.sh index 022b590..d7dbc21 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.15" ]; then + +ozone_version=1.3.0 +rat_version=0.16.1 + +if [ ! -d "$DIR/build/apache-rat-${rat_version}" ]; then if type wget 2> /dev/null; then - wget "https://dlcdn.apache.org/creadur/apache-rat-0.15/apache-rat-0.15-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://dlcdn.apache.org/creadur/apache-rat-0.15/apache-rat-0.15-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.15" ]; then tar zvxf apache-rat.tar.gz cd - fi -java -jar $DIR/build/apache-rat-0.15/apache-rat-0.15.jar $DIR -e .dockerignore -e public -e apache-rat-0.15 -e .git -e .gitignore + +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:1.3.0 +docker tag apache/ozone apache/ozone:${ozone_version} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
