Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Elek, Márton 2019-07-02 18:54:43 +02:00 committed by Anu Engineer
parent e966edd025
commit 564758ae8d
34 changed files with 89 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-ozone/dist/dev-support/bin/dist-layout-stitching vendored
View File

@ -96,7 +96,7 @@ run cp "${ROOT}/hadoop-hdds/common/src/main/resources/network-topology-nodegroup
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop" "bin/" run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop" "bin/"
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd" "bin/" run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd" "bin/"
run cp "${ROOT}/hadoop-ozone/common/src/main/bin/ozone" "bin/" run cp "${ROOT}/hadoop-ozone/common/src/main/bin/ozone" "bin/"
run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerbin" "bin/" run cp -r "${ROOT}/hadoop-ozone/dist/src/main/dockerbin" "bin/docker"
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh" "libexec/" run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh" "libexec/"
run cp "${ROOT}/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd" "libexec/" 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" ./
run cp -p -R "${ROOT}/hadoop-ozone/dist/target/compose" . run cp -p -R "${ROOT}/hadoop-ozone/dist/target/compose" .
run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/smoketest" . run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/smoketest" .
run cp -p -r "${ROOT}/hadoop-ozone/dist/target/k8s" kubernetes run cp -p -r "${ROOT}/hadoop-ozone/dist/target/k8s" kubernetes
run cp -p -r "${ROOT}/hadoop-ozone/dist/src/main/Dockerfile" . run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" .
#workaround for https://issues.apache.org/jira/browse/MRESOURCES-236 #workaround for https://issues.apache.org/jira/browse/MRESOURCES-236
find ./compose -name "*.sh" -exec chmod 755 {} \; find ./compose -name "*.sh" -exec chmod 755 {} \;

18
hadoop-ozone/dist/pom.xml vendored
View File

@ -28,7 +28,7 @@
<properties> <properties>
<file.encoding>UTF-8</file.encoding> <file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources> <downloadSources>true</downloadSources>
<docker.hadoop-runner.version>jdk11</docker.hadoop-runner.version> <docker.ozone-runner.version>20190617-2</docker.ozone-runner.version>
</properties> </properties>
<build> <build>
@ -196,6 +196,22 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>copy-and-filter-dockerfile</id>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
<resource>
<directory>src/main/docker</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution> <execution>
<id>copy-k8s</id> <id>copy-k8s</id>
<phase>compile</phase> <phase>compile</phase>

6
hadoop-ozone/dist/src/main/compose/README.md vendored
View File

@ -49,9 +49,3 @@ docker-compose scale datanode=5
``` ```
Usually the key webui ports are published on the docker host. Usually the key webui ports are published on the docker host.
## Known issues
The base image used here is apache/hadoop-runner, which runs with JDK8 by default.
You may run with JDK11 by specify apache/hadoop-runner:jdk11 as base image in simple mode.
But in secure mode, JDK 11 is not fully supported yet due to JDK8 dependencies from hadoop-common jars.

2
hadoop-ozone/dist/src/main/compose/ozone-hdfs/.env vendored
View File

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

6
hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-compose.yaml vendored
View File

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

1
hadoop-ozone/dist/src/main/compose/ozone-mr/.env vendored
View File

@ -17,3 +17,4 @@
HDDS_VERSION=${hdds.version} HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=apache/hadoop HADOOP_IMAGE=apache/hadoop
HADOOP_VERSION=3 HADOOP_VERSION=3
HADOOP_RUNNER_VERSION=${docker.ozone-runner.version}

8
hadoop-ozone/dist/src/main/compose/ozone-mr/docker-compose.yaml vendored
View File

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

1
hadoop-ozone/dist/src/main/compose/ozone-net-topology/.env vendored
View File

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

12
hadoop-ozone/dist/src/main/compose/ozone-net-topology/docker-compose.yaml vendored
View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode_1: datanode_1:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
@ -31,7 +31,7 @@ services:
service_network: service_network:
ipv4_address: 10.5.0.4 ipv4_address: 10.5.0.4
datanode_2: datanode_2:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
@ -45,7 +45,7 @@ services:
service_network: service_network:
ipv4_address: 10.5.0.5 ipv4_address: 10.5.0.5
datanode_3: datanode_3:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
@ -59,7 +59,7 @@ services:
service_network: service_network:
ipv4_address: 10.5.0.6 ipv4_address: 10.5.0.6
datanode_4: datanode_4:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
@ -73,7 +73,7 @@ services:
service_network: service_network:
ipv4_address: 10.5.0.7 ipv4_address: 10.5.0.7
om: om:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
@ -88,7 +88,7 @@ services:
service_network: service_network:
ipv4_address: 10.5.0.70 ipv4_address: 10.5.0.70
scm: scm:
image: apache/hadoop-runner:jdk11 image: apache/ozone-runner::${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

2
hadoop-ozone/dist/src/main/compose/ozone-om-ha/.env vendored
View File

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

10
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozone-recon/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozone-recon/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozone/.env vendored
View File

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

6
hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozoneblockade/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozonefs/.env vendored
View File

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

6
hadoop-ozone/dist/src/main/compose/ozonefs/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozoneperf/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozones3/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozones3/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozonescripts/.env vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozonescripts/Dockerfile vendored
View File

@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM apache/hadoop-runner FROM apache/ozone-runner
RUN sudo apt-get update && sudo apt-get install -y openssh-server RUN sudo apt-get update && sudo apt-get install -y openssh-server
RUN sudo mkdir -p /run/sshd RUN sudo mkdir -p /run/sshd

2
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozonesecure/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/ozonetrace/.env vendored
View File

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

8
hadoop-ozone/dist/src/main/compose/ozonetrace/docker-compose.yaml vendored
View File

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

2
hadoop-ozone/dist/src/main/compose/test-all.sh vendored
View File

@ -43,5 +43,5 @@ for test in $(find $SCRIPT_DIR -name test.sh); do
cp "$RESULT_DIR"/robot-*.xml "$ALL_RESULT_DIR" cp "$RESULT_DIR"/robot-*.xml "$ALL_RESULT_DIR"
done done
docker run --rm -v "$SCRIPT_DIR/result:/opt/result" apache/hadoop-runner rebot -N "smoketests" -d "/opt/result" "/opt/result/robot-*.xml" docker run --rm -v "$SCRIPT_DIR/result:/opt/result" apache/ozone-runner rebot -N "smoketests" -d "/opt/result" "/opt/result/robot-*.xml"
exit $RESULT exit $RESULT

2
hadoop-ozone/dist/src/main/compose/testlib.sh vendored
View File

@ -94,5 +94,5 @@ stop_docker_env(){
## @description Generate robot framework reports based on the saved results. ## @description Generate robot framework reports based on the saved results.
generate_report(){ generate_report(){
#Generate the combined output and return with the right exit code (note: robot = execute test, rebot = generate output) #Generate the combined output and return with the right exit code (note: robot = execute test, rebot = generate output)
docker run --rm -v "$DIR/..:${OZONE_DIR:-/opt/hadoop}" apache/hadoop-runner rebot -d "$RESULT_DIR_INSIDE" "$RESULT_DIR_INSIDE/robot-*.xml" docker run --rm -v "$DIR/..:${OZONE_DIR:-/opt/hadoop}" apache/ozone-runner rebot -d "$RESULT_DIR_INSIDE" "$RESULT_DIR_INSIDE/robot-*.xml"
} }

2
hadoop-ozone/dist/src/main/Dockerfile → hadoop-ozone/dist/src/main/docker/Dockerfile vendored
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM apache/hadoop-runner:jdk11 FROM apache/ozone-runner:@docker.ozone-runner.version@
ADD --chown=hadoop . /opt/hadoop ADD --chown=hadoop . /opt/hadoop