HDDS-1627. Make the version of the used hadoop-runner configurable (#886)

hadoop-ozone/dist/pom.xml

@@ -29,6 +29,7 @@
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
     <docker.image>apache/hadoop:${project.version}</docker.image>
+    <docker.hadoop-runner.version>jdk11</docker.hadoop-runner.version>
   </properties>
 
   <build>

hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env

@@ -14,4 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HADOOP_VERSION=3
+HADOOP_VERSION=3
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml

@@ -37,7 +37,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -48,7 +48,7 @@ services:
           - ./docker-config
       command: ["ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -59,7 +59,7 @@ services:
           ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       command: ["ozone","scm"]
    s3g:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:

hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env

@@ -14,4 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HDDS_VERSION=${hdds.version}
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
         - ../..:/opt/hadoop
@@ -27,7 +27,7 @@ services:
       env_file:
         - ./docker-config
    om1:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
           - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    om2:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -53,7 +53,7 @@ services:
          - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    om3:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -66,7 +66,7 @@ services:
          - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop

hadoop-ozone/dist/src/main/compose/ozone-recon/.env

@@ -14,4 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HDDS_VERSION=${hdds.version}
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:
       privileged: true #required by the profiler
       volumes:
         - ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
           - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    scm:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
           ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       command: ["/opt/hadoop/bin/ozone","scm"]
    recon:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop

hadoop-ozone/dist/src/main/compose/ozone/.env

@@ -14,4 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-HDDS_VERSION=${hdds.version}
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
         - ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
           - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    scm:
-      image: apache/hadoop-runner:jdk11
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       privileged: true #required by the profiler
       volumes:
          - ../..:/opt/hadoop

hadoop-ozone/dist/src/main/compose/ozoneblockade/.env

@@ -0,0 +1,18 @@
+# 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.
+
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -26,7 +26,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -37,7 +37,7 @@ services:
           - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -48,7 +48,7 @@ services:
           ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       command: ["/opt/hadoop/bin/ozone","scm"]
    ozone_client:
-       image: apache/hadoop-runner
+       image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
        volumes:
          - ../..:/opt/hadoop
        ports:

hadoop-ozone/dist/src/main/compose/ozonefs/.env

@@ -0,0 +1,18 @@
+# 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.
+
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -26,7 +26,7 @@ services:
       env_file:
          - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       hostname: om
       volumes:
          - ../..:/opt/hadoop
@@ -38,7 +38,7 @@ services:
          - ./docker-config
       command: ["/opt/hadoop/bin/ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:

hadoop-ozone/dist/src/main/compose/ozoneperf/.env

@@ -15,3 +15,4 @@
 # limitations under the License.
 
 HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -26,7 +26,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -37,7 +37,7 @@ services:
           - ./docker-config
       command: ["ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -55,7 +55,7 @@ services:
      ports:
         - 9090:9090
    freon:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       environment:

hadoop-ozone/dist/src/main/compose/ozones3/.env

@@ -0,0 +1,18 @@
+# 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.
+
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml

@@ -17,7 +17,7 @@
 version: "3"
 services:
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -26,7 +26,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -37,7 +37,7 @@ services:
           - ./docker-config
       command: ["ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -48,7 +48,7 @@ services:
           ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       command: ["ozone","scm"]
    s3g:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:

hadoop-ozone/dist/src/main/compose/ozonescripts/.env

@@ -0,0 +1,18 @@
+# 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.
+
+HDDS_VERSION=${hdds.version}
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env

@@ -16,3 +16,4 @@
 
 HDDS_VERSION=${hdds.version}
 HADOOP_VERSION=3
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml

@@ -33,7 +33,7 @@ services:
       - ./docker-config
       command: ["hadoop", "kms"]
   datanode:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     volumes:
       - ../..:/opt/hadoop
     ports:
@@ -42,7 +42,7 @@ services:
     env_file:
       - docker-config
   om:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     hostname: om
     volumes:
       - ../..:/opt/hadoop
@@ -54,7 +54,7 @@ services:
       - docker-config
     command: ["/opt/hadoop/bin/ozone","om"]
   s3g:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     hostname: s3g
     volumes:
       - ../..:/opt/hadoop
@@ -64,7 +64,7 @@ services:
       - ./docker-config
     command: ["/opt/hadoop/bin/ozone","s3g"]
   scm:
-    image: apache/hadoop-runner:latest
+    image: apache/hadoop-runner:latest:${HADOOP_RUNNER_VERSION}
     hostname: scm
     volumes:
       - ../..:/opt/hadoop

hadoop-ozone/dist/src/main/compose/ozonesecure/.env

@@ -16,3 +16,4 @@
 
 HDDS_VERSION=${hdds.version}
 HADOOP_VERSION=3
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml

@@ -35,7 +35,7 @@ services:
       command: ["hadoop", "kms"]
 
   datanode:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     volumes:
       - ../..:/opt/hadoop
     ports:
@@ -44,7 +44,7 @@ services:
     env_file:
       - docker-config
   om:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     hostname: om
     volumes:
       - ../..:/opt/hadoop
@@ -56,7 +56,7 @@ services:
       - docker-config
     command: ["/opt/hadoop/bin/ozone","om"]
   s3g:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     hostname: s3g
     volumes:
       - ../..:/opt/hadoop
@@ -66,7 +66,7 @@ services:
       - ./docker-config
     command: ["/opt/hadoop/bin/ozone","s3g"]
   scm:
-    image: apache/hadoop-runner
+    image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
     hostname: scm
     volumes:
       - ../..:/opt/hadoop

hadoop-ozone/dist/src/main/compose/ozonetrace/.env

@@ -0,0 +1,19 @@
+# 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.
+
+HDDS_VERSION=${hdds.version}
+HADOOP_VERSION=3
+HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml

@@ -23,7 +23,7 @@ services:
       ports:
          - 16686:16686
    datanode:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
         - ../..:/opt/hadoop
       ports:
@@ -32,7 +32,7 @@ services:
       env_file:
         - ./docker-config
    om:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -43,7 +43,7 @@ services:
           - ./docker-config
       command: ["ozone","om"]
    scm:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports:
@@ -54,7 +54,7 @@ services:
           ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       command: ["ozone","scm"]
    s3g:
-      image: apache/hadoop-runner
+      image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
       volumes:
          - ../..:/opt/hadoop
       ports: