From 5a9fc1b4c38cae556b70184c89e85834174e80f8 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:07:26 +0100
Subject: [PATCH] HDDS-11700. Use ozone-runner from GitHub in ozone image build
 (#33)

(cherry picked from commit d1bb3b64b704d7fb2e7f251bc263b4479ccecb6e)
---
 .github/workflows/build.yaml | 4 ++++
 Dockerfile                   | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a292f29..c79b265 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,6 +38,9 @@ permissions:
   contents: read
   packages: write
 
+env:
+  OZONE_RUNNER_IMAGE: ghcr.io/apache/ozone-runner
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -87,6 +90,7 @@ jobs:
         if: ${{ steps.pull.outputs.success == 'false' }}
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
         with:
+          build-args: OZONE_RUNNER_IMAGE
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile b/Dockerfile
index 6db1690..adccb69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM apache/ozone-runner:20240729-jdk17-1
+ARG OZONE_RUNNER_IMAGE=apache/ozone-runner
+FROM ${OZONE_RUNNER_IMAGE}:20241108-jdk17-1
+
 ARG OZONE_URL=https://dlcdn.apache.org/ozone/1.4.0/ozone-1.4.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
+
 WORKDIR /opt/hadoop
 COPY log4j.properties /opt/hadoop/etc/hadoop/log4j.properties
 COPY ozone-site.xml /opt/hadoop/etc/hadoop/ozone-site.xml