From 6354405d3ff9372ba351240046b5e687c9b1e6aa Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Fri, 21 May 2021 17:15:08 +0800 Subject: [PATCH 1/2] HADOOP-17723. [build] fix the Dockerfile for ARM Change-Id: I8a2031ee1e532f5ecbf32d679d850be4fb80c8d1 --- dev-support/docker/Dockerfile_aarch64 | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index 362c5466a4a14..c1fdced78b1b4 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -80,12 +80,14 @@ RUN apt-get -q update \ python3-pkg-resources \ python3-setuptools \ python3-wheel \ + python2.7 \ rsync \ shellcheck \ software-properties-common \ sudo \ valgrind \ zlib1g-dev \ + phantomjs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -150,17 +152,6 @@ RUN pip3 install pylint==2.6.0 python-dateutil==2.8.1 # hadolint ignore=DL3008 RUN npm install -g bower@1.8.8 -### -# Install phantomjs built for aarch64 -#### -RUN mkdir -p /opt/phantomjs \ - && curl -L -s -S \ - https://github.com/liusheng/phantomjs/releases/download/2.1.1/phantomjs-2.1.1-linux-aarch64.tar.bz2 \ - -o /opt/phantomjs/phantomjs-2.1.1-linux-aarch64.tar.bz2 \ - && tar xvjf /opt/phantomjs/phantomjs-2.1.1-linux-aarch64.tar.bz2 --strip-components 1 -C /opt/phantomjs \ - && cp /opt/phantomjs/bin/phantomjs /usr/bin/ \ - && rm -rf /opt/phantomjs - ### # Avoid out of memory errors in builds ### @@ -169,6 +160,9 @@ ENV MAVEN_OPTS -Xms256m -Xmx1536m # Skip gpg verification when downloading Yetus via yetus-wrapper ENV HADOOP_SKIP_YETUS_VERIFICATION true +# Force PhantomJS to be in 'headless' mode, do not connect to Xwindow +ENV QT_QPA_PLATFORM offscreen + ### # Everything past this point is either not needed for testing or breaks Yetus. # So tell Yetus not to read the rest of the file: From 35ea183490deca47531ee19cb74de760410117a7 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 24 May 2021 16:24:02 +0800 Subject: [PATCH 2/2] Sort packges by alphabetical order. Change-Id: I1e38d8d4da24922e7a1a36f917203ca0d45c4a13 --- dev-support/docker/Dockerfile_aarch64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index c1fdced78b1b4..d8fcccdbba035 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -73,21 +73,21 @@ RUN apt-get -q update \ npm \ openjdk-11-jdk \ openjdk-8-jdk \ + phantomjs \ pinentry-curses \ pkg-config \ + python2.7 \ python3 \ python3-pip \ python3-pkg-resources \ python3-setuptools \ python3-wheel \ - python2.7 \ rsync \ shellcheck \ software-properties-common \ sudo \ valgrind \ zlib1g-dev \ - phantomjs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*