This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 94b98bf6bb HDDS-8825. Use apache/hadoop 3.3.5 docker image (#4963)
94b98bf6bb is described below
commit 94b98bf6bb14de3b062ba8a015affdd4c8ee6ff8
Author: Wei-Chiu Chuang <[email protected]>
AuthorDate: Fri Jun 23 06:22:35 2023 -0700
HDDS-8825. Use apache/hadoop 3.3.5 docker image (#4963)
---
hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 8 +++++++-
hadoop-ozone/dist/src/main/compose/ozone-ha/.env | 1 -
hadoop-ozone/dist/src/main/compose/ozone/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 4 ++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index 3982888a31..3f96c13980 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -33,9 +33,15 @@ export OZONE_DIR=/opt/ozone
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.1; do
+for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.5; do
export HADOOP_VERSION
export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
+ # Check if $HADOOP_VERSION starts with the prefix "3.3."
+ if [[ $HADOOP_VERSION == 3.3.* ]]; then
+ export HADOOP_IMAGE=apache/hadoop
+ else
+ export HADOOP_IMAGE=flokkr/hadoop
+ fi
docker-compose --ansi never --profile hadoop up -d nm rm
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
index cb11be7f0b..2de359fc5d 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/.env
@@ -15,7 +15,6 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_IMAGE=flokkr/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_OPTS=
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/.env
b/hadoop-ozone/dist/src/main/compose/ozone/.env
index cb11be7f0b..6507664fad 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone/.env
@@ -15,7 +15,7 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_IMAGE=flokkr/hadoop
+HADOOP_IMAGE=apache/hadoop
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_OPTS=
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
index 682aa1d967..83b68887a9 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
@@ -15,8 +15,8 @@
# limitations under the License.
HDDS_VERSION=${hdds.version}
-HADOOP_IMAGE=flokkr/hadoop
-HADOOP_VERSION=3.3.1
+HADOOP_IMAGE=apache/hadoop
+HADOOP_VERSION=3.3.5
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
