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

This commit is contained in:
Elek, Márton 2019-06-11 20:18:12 +02:00 committed by Anu Engineer
parent 3c9a5e7b16
commit 96e1e41746
24 changed files with 145 additions and 46 deletions

View File

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

View File

@ -14,4 +14,5 @@
# 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.
HADOOP_VERSION=3 HADOOP_VERSION=3
HADOOP_RUNNER_VERSION=${docker.hadoop-runner.version}

View File

@ -37,7 +37,7 @@ services:
env_file: env_file:
- ./docker-config - ./docker-config
om: om:
image: apache/hadoop-runner image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
ports: ports:

View File

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

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

View File

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

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner:jdk11 image: apache/hadoop-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:jdk11 image: apache/hadoop-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:jdk11 image: apache/hadoop-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:jdk11 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

View File

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

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner:jdk11 image: apache/hadoop-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:jdk11 image: apache/hadoop-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:jdk11 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
privileged: true #required by the profiler privileged: true #required by the profiler
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

View File

@ -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}

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
ports: ports:

View File

@ -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}

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
ports: ports:

View File

@ -15,3 +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}

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
environment: environment:

View File

@ -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}

View File

@ -17,7 +17,7 @@
version: "3" version: "3"
services: services:
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
ports: ports:

View File

@ -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}

View File

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

View File

@ -33,7 +33,7 @@ services:
- ./docker-config - ./docker-config
command: ["hadoop", "kms"] command: ["hadoop", "kms"]
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:latest:${HADOOP_RUNNER_VERSION}
hostname: scm hostname: scm
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

View File

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

View File

@ -35,7 +35,7 @@ services:
command: ["hadoop", "kms"] command: ["hadoop", "kms"]
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
hostname: scm hostname: scm
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop

View File

@ -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}

View File

@ -23,7 +23,7 @@ services:
ports: ports:
- 16686:16686 - 16686:16686
datanode: datanode:
image: apache/hadoop-runner image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-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 image: apache/hadoop-runner:${HADOOP_RUNNER_VERSION}
volumes: volumes:
- ../..:/opt/hadoop - ../..:/opt/hadoop
ports: ports: