Skip to content

Commit 96e1e41

Browse files
elekanuengineer
elek
authored and
anuengineer
committed
HDDS-1627. Make the version of the used hadoop-runner configurable (#886)
1 parent 3c9a5e7 commit 96e1e41

File tree

24 files changed

+145
-46
lines changed

24 files changed

+145
-46
lines changed

‎hadoop-ozone/dist/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<file.encoding>UTF-8</file.encoding>
3030
<downloadSources>true</downloadSources>
3131
<docker.image>apache/hadoop:${project.version}</docker.image>
32+
<docker.hadoop-runner.version>jdk11</docker.hadoop-runner.version>
3233
</properties>
3334

3435
<build>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
HADOOP_VERSION=3
17+
HADOOP_VERSION=3
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
env_file:
3838
- ./docker-config
3939
om:
40-
image: apache/hadoop-runner
40+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4141
volumes:
4242
- ../..:/opt/hadoop
4343
ports:
@@ -48,7 +48,7 @@ services:
4848
- ./docker-config
4949
command: ["ozone","om"]
5050
scm:
51-
image: apache/hadoop-runner
51+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5252
volumes:
5353
- ../..:/opt/hadoop
5454
ports:
@@ -59,7 +59,7 @@ services:
5959
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
6060
command: ["ozone","scm"]
6161
s3g:
62-
image: apache/hadoop-runner
62+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
6363
volumes:
6464
- ../..:/opt/hadoop
6565
ports:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
HDDS_VERSION=${hdds.version}
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
privileged: true #required by the profiler
2222
volumes:
2323
- ../..:/opt/hadoop
@@ -27,7 +27,7 @@ services:
2727
env_file:
2828
- ./docker-config
2929
om1:
30-
image: apache/hadoop-runner
30+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3131
privileged: true #required by the profiler
3232
volumes:
3333
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
4040
- ./docker-config
4141
command: ["/opt/hadoop/bin/ozone","om"]
4242
om2:
43-
image: apache/hadoop-runner
43+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4444
privileged: true #required by the profiler
4545
volumes:
4646
- ../..:/opt/hadoop
@@ -53,7 +53,7 @@ services:
5353
- ./docker-config
5454
command: ["/opt/hadoop/bin/ozone","om"]
5555
om3:
56-
image: apache/hadoop-runner
56+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5757
privileged: true #required by the profiler
5858
volumes:
5959
- ../..:/opt/hadoop
@@ -66,7 +66,7 @@ services:
6666
- ./docker-config
6767
command: ["/opt/hadoop/bin/ozone","om"]
6868
scm:
69-
image: apache/hadoop-runner
69+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
7070
privileged: true #required by the profiler
7171
volumes:
7272
- ../..:/opt/hadoop

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
HDDS_VERSION=${hdds.version}
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner:jdk11
20+
image: apache/hadoop-runner:
2121
privileged: true #required by the profiler
2222
volumes:
2323
- ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
2828
env_file:
2929
- ./docker-config
3030
om:
31-
image: apache/hadoop-runner:jdk11
31+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3232
privileged: true #required by the profiler
3333
volumes:
3434
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
4040
- ./docker-config
4141
command: ["/opt/hadoop/bin/ozone","om"]
4242
scm:
43-
image: apache/hadoop-runner:jdk11
43+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4444
privileged: true #required by the profiler
4545
volumes:
4646
- ../..:/opt/hadoop
@@ -52,7 +52,7 @@ services:
5252
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
5353
command: ["/opt/hadoop/bin/ozone","scm"]
5454
recon:
55-
image: apache/hadoop-runner:jdk11
55+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5656
privileged: true #required by the profiler
5757
volumes:
5858
- ../..:/opt/hadoop

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
HDDS_VERSION=${hdds.version}
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner:jdk11
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
privileged: true #required by the profiler
2222
volumes:
2323
- ../..:/opt/hadoop
@@ -28,7 +28,7 @@ services:
2828
env_file:
2929
- ./docker-config
3030
om:
31-
image: apache/hadoop-runner:jdk11
31+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3232
privileged: true #required by the profiler
3333
volumes:
3434
- ../..:/opt/hadoop
@@ -40,7 +40,7 @@ services:
4040
- ./docker-config
4141
command: ["/opt/hadoop/bin/ozone","om"]
4242
scm:
43-
image: apache/hadoop-runner:jdk11
43+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4444
privileged: true #required by the profiler
4545
volumes:
4646
- ../..:/opt/hadoop

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
volumes:
2222
- ../..:/opt/hadoop
2323
ports:
@@ -26,7 +26,7 @@ services:
2626
env_file:
2727
- ./docker-config
2828
om:
29-
image: apache/hadoop-runner
29+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3030
volumes:
3131
- ../..:/opt/hadoop
3232
ports:
@@ -37,7 +37,7 @@ services:
3737
- ./docker-config
3838
command: ["/opt/hadoop/bin/ozone","om"]
3939
scm:
40-
image: apache/hadoop-runner
40+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4141
volumes:
4242
- ../..:/opt/hadoop
4343
ports:
@@ -48,7 +48,7 @@ services:
4848
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
4949
command: ["/opt/hadoop/bin/ozone","scm"]
5050
ozone_client:
51-
image: apache/hadoop-runner
51+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5252
volumes:
5353
- ../..:/opt/hadoop
5454
ports:

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
volumes:
2222
- ../..:/opt/hadoop
2323
ports:
@@ -26,7 +26,7 @@ services:
2626
env_file:
2727
- ./docker-config
2828
om:
29-
image: apache/hadoop-runner
29+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3030
hostname: om
3131
volumes:
3232
- ../..:/opt/hadoop
@@ -38,7 +38,7 @@ services:
3838
- ./docker-config
3939
command: ["/opt/hadoop/bin/ozone","om"]
4040
scm:
41-
image: apache/hadoop-runner
41+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4242
volumes:
4343
- ../..:/opt/hadoop
4444
ports:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
# limitations under the License.
1616

1717
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
volumes:
2222
- ../..:/opt/hadoop
2323
ports:
@@ -26,7 +26,7 @@ services:
2626
env_file:
2727
- ./docker-config
2828
om:
29-
image: apache/hadoop-runner
29+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3030
volumes:
3131
- ../..:/opt/hadoop
3232
ports:
@@ -37,7 +37,7 @@ services:
3737
- ./docker-config
3838
command: ["ozone","om"]
3939
scm:
40-
image: apache/hadoop-runner
40+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4141
volumes:
4242
- ../..:/opt/hadoop
4343
ports:
@@ -55,7 +55,7 @@ services:
5555
ports:
5656
- 9090:9090
5757
freon:
58-
image: apache/hadoop-runner
58+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5959
volumes:
6060
- ../..:/opt/hadoop
6161
environment:

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode:
20-
image: apache/hadoop-runner
20+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
2121
volumes:
2222
- ../..:/opt/hadoop
2323
ports:
@@ -26,7 +26,7 @@ services:
2626
env_file:
2727
- ./docker-config
2828
om:
29-
image: apache/hadoop-runner
29+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
3030
volumes:
3131
- ../..:/opt/hadoop
3232
ports:
@@ -37,7 +37,7 @@ services:
3737
- ./docker-config
3838
command: ["ozone","om"]
3939
scm:
40-
image: apache/hadoop-runner
40+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
4141
volumes:
4242
- ../..:/opt/hadoop
4343
ports:
@@ -48,7 +48,7 @@ services:
4848
ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
4949
command: ["ozone","scm"]
5050
s3g:
51-
image: apache/hadoop-runner
51+
image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
5252
volumes:
5353
- ../..:/opt/hadoop
5454
ports:

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
HDDS_VERSION=${hdds.version}
18+
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

0 commit comments

Comments
 (0)