Skip to content

Commit 564758a

Browse files
elekanuengineer
elek
authored and
anuengineer
committed
HDDS-1698. Switch to use apache/ozone-runner in the compose/Dockerfile (#979)
* HDDS-1698. Switch to use apache/ozone-runner in the compose/Dockerfile * docker image is moved to the parent in HDDS-1667
1 parent e966edd commit 564758a

File tree

34 files changed

+89
-77
lines changed

34 files changed

+89
-77
lines changed

‎hadoop-ozone/dist/dev-support/bin/dist-layout-stitching‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-nodegroup
9696
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop" "bin/"
9797
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd" "bin/"
9898
run cp "${ROOT}/hadoop-ozone/common/src/main/bin/ozone" "bin/"
99-
run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerbin" "bin/"
99+
run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerbin" "bin/docker"
100100

101101
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh" "libexec/"
102102
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd" "libexec/"
@@ -125,7 +125,7 @@ cp -r "${ROOT}/hadoop-hdds/docs/target/classes/docs" ./
125125
run cp -p -R "${ROOT}/hadoop-ozone/dist/target/compose" .
126126
run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/smoketest" .
127127
run cp -p -r "${ROOT}/hadoop-ozone/dist/target/k8s" kubernetes
128-
run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/Dockerfile" .
128+
run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" .
129129

130130
#workaround for https://issues.apache.org/jira/browse/MRESOURCES-236
131131
find ./compose -name "*.sh" -exec chmod 755 {} \;

‎hadoop-ozone/dist/pom.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<file.encoding>UTF-8</file.encoding>
3030
<downloadSources>true</downloadSources>
31-
<docker.hadoop-runner.version>jdk11</docker.hadoop-runner.version>
31+
<docker.ozone-runner.version>20190617-2</docker.ozone-runner.version>
3232
</properties>
3333

3434
<build>
@@ -196,6 +196,22 @@
196196
</resources>
197197
</configuration>
198198
</execution>
199+
<execution>
200+
<id>copy-and-filter-dockerfile</id>
201+
<phase>compile</phase>
202+
<goals>
203+
<goal>copy-resources</goal>
204+
</goals>
205+
<configuration>
206+
<outputDirectory>${project.build.directory}</outputDirectory>
207+
<resources>
208+
<resource>
209+
<directory>src/main/docker</directory>
210+
<filtering>true</filtering>
211+
</resource>
212+
</resources>
213+
</configuration>
214+
</execution>
199215
<execution>
200216
<id>copy-k8s</id>
201217
<phase>compile</phase>

‎hadoop-ozone/dist/src/main/compose/README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,3 @@ docker-compose scale datanode=5
4949
```
5050

5151
Usually the key webui ports are published on the docker host.
52-
53-
## Known issues
54-
55-
The base image used here is apache/hadoop-runner, which runs with JDK8 by default.
56-
You may run with JDK11 by specify apache/hadoop-runner:jdk11 as base image in simple mode.
57-
But in secure mode, JDK 11 is not fully supported yet due to JDK8 dependencies from hadoop-common jars.

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

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

1717
HADOOP_VERSION=3
18-
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}
18+
HADOOP_RUNNER_VERSION=${docker.ozone-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:${HADOOP_RUNNER_VERSION}
40+
image: apache/ozone-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:${HADOOP_RUNNER_VERSION}
51+
image: apache/ozone-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:${HADOOP_RUNNER_VERSION}
62+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
6363
volumes:
6464
- ../..:/opt/hadoop
6565
ports:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
HDDS_VERSION=${hdds.version}
1818
HADOOP_IMAGE=apache/hadoop
1919
HADOOP_VERSION=3
20+
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}

‎hadoop-ozone/dist/src/main/compose/ozone-mr/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/ozone-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/ozone-runner:${HADOOP_RUNNER_VERSION}
3030
hostname: om
3131
volumes:
3232
- ../..:/opt/hadoop
@@ -39,7 +39,7 @@ services:
3939
- docker-config
4040
command: ["/opt/hadoop/bin/ozone","om"]
4141
s3g:
42-
image: apache/hadoop-runner
42+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
4343
hostname: s3g
4444
volumes:
4545
- ../..:/opt/hadoop
@@ -49,7 +49,7 @@ services:
4949
- ./docker-config
5050
command: ["/opt/hadoop/bin/ozone","s3g"]
5151
scm:
52-
image: apache/hadoop-runner:latest
52+
image: apache/ozone-runner:latest:${HADOOP_RUNNER_VERSION}
5353
hostname: scm
5454
volumes:
5555
- ../..:/opt/hadoop

‎hadoop-ozone/dist/src/main/compose/ozone-net-topology/.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=0.5.0-SNAPSHOT
18+
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
version: "3"
1818
services:
1919
datanode_1:
20-
image: apache/hadoop-runner:jdk11
20+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
2121
privileged: true #required by the profiler
2222
volumes:
2323
- ../..:/opt/hadoop
@@ -31,7 +31,7 @@ services:
3131
service_network:
3232
ipv4_address: 10.5.0.4
3333
datanode_2:
34-
image: apache/hadoop-runner:jdk11
34+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
3535
privileged: true #required by the profiler
3636
volumes:
3737
- ../..:/opt/hadoop
@@ -45,7 +45,7 @@ services:
4545
service_network:
4646
ipv4_address: 10.5.0.5
4747
datanode_3:
48-
image: apache/hadoop-runner:jdk11
48+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
4949
privileged: true #required by the profiler
5050
volumes:
5151
- ../..:/opt/hadoop
@@ -59,7 +59,7 @@ services:
5959
service_network:
6060
ipv4_address: 10.5.0.6
6161
datanode_4:
62-
image: apache/hadoop-runner:jdk11
62+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
6363
privileged: true #required by the profiler
6464
volumes:
6565
- ../..:/opt/hadoop
@@ -73,7 +73,7 @@ services:
7373
service_network:
7474
ipv4_address: 10.5.0.7
7575
om:
76-
image: apache/hadoop-runner:jdk11
76+
image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
7777
privileged: true #required by the profiler
7878
volumes:
7979
- ../..:/opt/hadoop
@@ -88,7 +88,7 @@ services:
8888
service_network:
8989
ipv4_address: 10.5.0.70
9090
scm:
91-
image: apache/hadoop-runner:jdk11
91+
image: apache/ozone-runner::${HADOOP_RUNNER_VERSION}
9292
privileged: true #required by the profiler
9393
volumes:
9494
- ../..:/opt/hadoop

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

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

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

0 commit comments

Comments
 (0)