You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2021/02/22 04:51:48 UTC
[hadoop] branch branch-3.3 updated (27f00c7 -> c7bab34)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from 27f00c7 YARN-10501. Can't remove all node labels after add node label without nodemanager port. Contributed by caozhiqiang.
new 118a574 HADOOP-16054. Update Dockerfile to use Bionic (#1966)
new c7bab34 HADOOP-17084 Update Dockerfile_aarch64 to use Bionic (#2103). Contributed by zhaorenhai.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/docker/Dockerfile | 46 ++++--------------
dev-support/docker/Dockerfile_aarch64 | 90 +++++++----------------------------
2 files changed, 26 insertions(+), 110 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HADOOP-17084 Update Dockerfile_aarch64 to use
Bionic (#2103). Contributed by zhaorenhai.
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c7bab342ee564ac076a13fbc02572886355ea254
Author: zhaorenhai <zh...@hotmail.com>
AuthorDate: Wed Jul 1 17:57:11 2020 +0800
HADOOP-17084 Update Dockerfile_aarch64 to use Bionic (#2103). Contributed by zhaorenhai.
Signed-off-by: Ayush Saxena <ay...@apache.org>
(cherry picked from commit 6c57be48973e182f8141d166102bdc513b944900)
---
dev-support/docker/Dockerfile_aarch64 | 90 +++++++----------------------------
1 file changed, 16 insertions(+), 74 deletions(-)
diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64
index 250d020..dc288ad 100644
--- a/dev-support/docker/Dockerfile_aarch64
+++ b/dev-support/docker/Dockerfile_aarch64
@@ -17,7 +17,7 @@
# Dockerfile for installing the necessary dependencies for building Hadoop.
# See BUILDING.txt.
-FROM ubuntu:xenial
+FROM ubuntu:bionic
WORKDIR /root
@@ -35,24 +35,26 @@ ENV DEBCONF_TERSE true
######
# Install common dependencies from packages. Versions here are either
# sufficient or irrelevant.
-#
-# WARNING: DO NOT PUT JAVA APPS HERE! Otherwise they will install default
-# Ubuntu Java. See Java section below!
######
# hadolint ignore=DL3008
RUN apt-get -q update \
&& apt-get -q install -y --no-install-recommends \
+ ant \
apt-utils \
+ bats \
build-essential \
bzip2 \
clang \
+ cmake \
curl \
doxygen \
+ findbugs \
fuse \
g++ \
gcc \
git \
gnupg-agent \
+ libbcprov-java \
libbz2-dev \
libcurl4-openssl-dev \
libfuse-dev \
@@ -65,6 +67,9 @@ RUN apt-get -q update \
libzstd1-dev \
locales \
make \
+ maven \
+ openjdk-11-jdk \
+ openjdk-8-jdk \
pinentry-curses \
pkg-config \
python \
@@ -74,47 +79,24 @@ RUN apt-get -q update \
python-setuptools \
python-wheel \
rsync \
+ shellcheck \
software-properties-common \
- snappy \
sudo \
valgrind \
zlib1g-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
-
-#######
-# OpenJDK 8
-#######
-# hadolint ignore=DL3008
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends openjdk-8-jdk libbcprov-java \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-
######
-# Install cmake 3.1.0 (3.5.1 ships with Xenial)
-# There is no cmake binary available for aarch64. Build from source.
+# Set env vars required to build Hadoop
######
-# hadolint ignore=DL3003
-RUN mkdir -p /opt/cmake/src \
- && curl -L -s -S \
- https://cmake.org/files/v3.1/cmake-3.1.0-1-src.tar.bz2 \
- -o /opt/cmake/cmake-src.tar.bz2 \
- && tar xvjf /opt/cmake/cmake-src.tar.bz2 -C /opt/cmake/src \
- && cd /opt/cmake/src \
- && tar xvjf cmake-3.1.0.tar.bz2 \
- && cd cmake-3.1.0 && patch -p0 -i ../cmake-3.1.0-1.patch && mkdir .build && cd .build \
- && ../bootstrap --parallel=2 \
- && make -j2 && ./bin/cpack \
- && tar xzf cmake-3.1.0-Linux-aarch64.tar.gz --strip-components 1 -C /opt/cmake \
- && cd /opt/cmake && rm -rf /opt/cmake/src
-ENV CMAKE_HOME /opt/cmake
-ENV PATH "${PATH}:/opt/cmake/bin"
+ENV MAVEN_HOME /usr
+# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
+ENV FINDBUGS_HOME /usr
######
-# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
+# Install Google Protobuf 3.7.1 (3.0.0 ships with Bionic)
######
# hadolint ignore=DL3003
RUN mkdir -p /opt/protobuf-src \
@@ -130,46 +112,6 @@ RUN mkdir -p /opt/protobuf-src \
ENV PROTOBUF_HOME /opt/protobuf
ENV PATH "${PATH}:/opt/protobuf/bin"
-######
-# Install Apache Maven 3.3.9 (3.3.9 ships with Xenial)
-######
-# hadolint ignore=DL3008
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends maven \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-ENV MAVEN_HOME /usr
-
-######
-# Install findbugs 3.0.1 (3.0.1 ships with Xenial)
-# Ant is needed for findbugs
-######
-# hadolint ignore=DL3008
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends findbugs ant \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-ENV FINDBUGS_HOME /usr
-
-####
-# Install shellcheck (0.4.6, the latest as of 2017-09-26)
-####
-# hadolint ignore=DL3008
-RUN add-apt-repository -y ppa:hvr/ghc \
- && apt-get -q update \
- && apt-get -q install -y --no-install-recommends shellcheck \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-####
-# Install bats (0.4.0, the latest as of 2017-09-26, ships with Xenial)
-####
-# hadolint ignore=DL3008
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends bats \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
####
# Install pylint at fixed version (2.0.0 removed python2 support)
# https://github.com/PyCQA/pylint/issues/2294
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: HADOOP-16054. Update Dockerfile to use Bionic
(#1966)
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 118a5747f8cc90489911886b0c4cb66f5354f7d4
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Sun Apr 26 02:54:45 2020 +0900
HADOOP-16054. Update Dockerfile to use Bionic (#1966)
(cherry picked from commit 81d8b71534645a2109a037115fb955351edfbf64)
---
dev-support/docker/Dockerfile | 46 ++++++++++---------------------------------
1 file changed, 10 insertions(+), 36 deletions(-)
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 85cdfc0..581f9dd 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -18,7 +18,7 @@
# Dockerfile for installing the necessary dependencies for building Hadoop.
# See BUILDING.txt.
-FROM ubuntu:xenial
+FROM ubuntu:bionic
WORKDIR /root
@@ -44,9 +44,11 @@ ENV DEBCONF_TERSE true
RUN apt-get -q update \
&& apt-get -q install -y --no-install-recommends \
apt-utils \
+ bats \
build-essential \
bzip2 \
clang \
+ cmake \
curl \
doxygen \
fuse \
@@ -62,6 +64,7 @@ RUN apt-get -q update \
libsasl2-dev \
libsnappy-dev \
libssl-dev \
+ libsnappy-dev \
libtool \
libzstd1-dev \
locales \
@@ -75,8 +78,8 @@ RUN apt-get -q update \
python-setuptools \
python-wheel \
rsync \
+ shellcheck \
software-properties-common \
- snappy \
sudo \
valgrind \
zlib1g-dev \
@@ -93,20 +96,8 @@ RUN apt-get -q update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
-
-######
-# Install cmake 3.1.0 (3.5.1 ships with Xenial)
-######
-RUN mkdir -p /opt/cmake \
- && curl -L -s -S \
- https://cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz \
- -o /opt/cmake.tar.gz \
- && tar xzf /opt/cmake.tar.gz --strip-components 1 -C /opt/cmake
-ENV CMAKE_HOME /opt/cmake
-ENV PATH "${PATH}:/opt/cmake/bin"
-
######
-# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
+# Install Google Protobuf 3.7.1 (3.0.0 ships with Bionic)
######
# hadolint ignore=DL3003
RUN mkdir -p /opt/protobuf-src \
@@ -123,7 +114,7 @@ ENV PROTOBUF_HOME /opt/protobuf
ENV PATH "${PATH}:/opt/protobuf/bin"
######
-# Install Apache Maven 3.3.9 (3.3.9 ships with Xenial)
+# Install Apache Maven 3.6.0 (3.6.0 ships with Bionic)
######
# hadolint ignore=DL3008
RUN apt-get -q update \
@@ -131,9 +122,11 @@ RUN apt-get -q update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
ENV MAVEN_HOME /usr
+# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
######
-# Install findbugs 3.0.1 (3.0.1 ships with Xenial)
+# Install findbugs 3.1.0 (3.1.0 ships with Bionic)
# Ant is needed for findbugs
######
# hadolint ignore=DL3008
@@ -144,25 +137,6 @@ RUN apt-get -q update \
ENV FINDBUGS_HOME /usr
####
-# Install shellcheck (0.4.6, the latest as of 2017-09-26)
-####
-# hadolint ignore=DL3008
-RUN add-apt-repository -y ppa:hvr/ghc \
- && apt-get -q update \
- && apt-get -q install -y --no-install-recommends shellcheck ghc-8.0.2 \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-####
-# Install bats (0.4.0, the latest as of 2017-09-26, ships with Xenial)
-####
-# hadolint ignore=DL3008
-RUN apt-get -q update \
- && apt-get -q install -y --no-install-recommends bats \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-####
# Install pylint at fixed version (2.0.0 removed python2 support)
# https://github.com/PyCQA/pylint/issues/2294
####
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org