Fix ubuntu16.04 docker file (#3525)

* fix ubuntu 16.04 docker file * Fix ubuntu docker file
apache · May 17, 2020 · 07b5d8c · 07b5d8c
1 parent e0bb08a
commit 07b5d8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/docker/compile/Dockerfile.ubuntu16.04 b/docker/compile/Dockerfile.ubuntu16.04
@@ -21,6 +21,10 @@ FROM ubuntu:16.04
 ENV TARGET_PLATFORM ubuntu
 ENV bazelVersion 3.0.0
 
+RUN apt-get update && apt-get install -y software-properties-common
+
+RUN add-apt-repository ppa:openjdk-r/ppa
+
 RUN apt-get update && apt-get -y install \
       automake \
       build-essential \
@@ -31,12 +35,15 @@ RUN apt-get update && apt-get -y install \
       libtool-bin \
       libunwind8 \
       libunwind-setjmp0-dev \
+      pkg-config \
       python-dev \
       libcppunit-dev \
       tree \
       zip \
       unzip \
-      wget \
+      wget
+
+RUN apt-get update && apt-get -y install \
       openjdk-11-jdk-headless
 
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64

diff --git a/docker/dist/Dockerfile.dist.ubuntu16.04 b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -17,15 +17,19 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y software-properties-common
+
+RUN add-apt-repository ppa:openjdk-r/ppa
 
 RUN apt-get -y install \
     python \
     python3 \
     unzip \
     software-properties-common \
     curl \
-    supervisor \
+    supervisor
+
+RUN apt-get update && apt-get -y install \
     openjdk-11-jdk-headless
 
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64