Преглед на файлове

HADOOP-17723. [build] fix the Dockerfile for ARM (#3037)

Reviewed-by: Akira Ajisaka <aajisaka@apache.org>
Wei-Chiu Chuang преди 4 години
родител
ревизия
1576f81dfe
променени са 1 файла, в които са добавени 5 реда и са изтрити 11 реда
  1. 5 11
      dev-support/docker/Dockerfile_aarch64

+ 5 - 11
dev-support/docker/Dockerfile_aarch64

@@ -73,8 +73,10 @@ 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 \
@@ -154,17 +156,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
 ###
@@ -173,6 +164,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: