This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 07b5d8c Fix ubuntu16.04 docker file (#3525)
07b5d8c is described below
commit 07b5d8c09143112d5d2e595952f10fdd4e76f12a
Author: Ning Wang <[email protected]>
AuthorDate: Sun May 17 10:24:07 2020 -0700
Fix ubuntu16.04 docker file (#3525)
* fix ubuntu 16.04 docker file
* Fix ubuntu docker file
---
docker/compile/Dockerfile.ubuntu16.04 | 9 ++++++++-
docker/dist/Dockerfile.dist.ubuntu16.04 | 8 ++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/docker/compile/Dockerfile.ubuntu16.04
b/docker/compile/Dockerfile.ubuntu16.04
index a3a2265..dbf7b70 100644
--- 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
index 0fe59f9..bcf6f37 100644
--- a/docker/dist/Dockerfile.dist.ubuntu16.04
+++ b/docker/dist/Dockerfile.dist.ubuntu16.04
@@ -17,7 +17,9 @@
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 \
@@ -25,7 +27,9 @@ RUN apt-get -y install \
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