This is an automated email from the ASF dual-hosted git repository.
nwang 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 7bfa0c7 Fix debian9 docker file and clean up centos8 and ubuntu18.04
(#3518)
7bfa0c7 is described below
commit 7bfa0c732d5c32439cfe1ec07d9fb6ea9994dc34
Author: Ning Wang <[email protected]>
AuthorDate: Thu Apr 23 09:23:21 2020 -0700
Fix debian9 docker file and clean up centos8 and ubuntu18.04 (#3518)
---
docker/base/Dockerfile.base.debian9 | 2 +-
docker/test/Dockerfile.centos7 | 3 ++-
docker/test/Dockerfile.ubuntu18.04 | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docker/base/Dockerfile.base.debian9
b/docker/base/Dockerfile.base.debian9
index 27892fc..3a4ba7f 100644
--- a/docker/base/Dockerfile.base.debian9
+++ b/docker/base/Dockerfile.base.debian9
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:8-jdk-slim
+FROM openjdk:11-jdk-slim-stretch
RUN apt-get -y update && apt-get -y install \
netcat-openbsd \
diff --git a/docker/test/Dockerfile.centos7 b/docker/test/Dockerfile.centos7
index 8122b73..3a36273 100644
--- a/docker/test/Dockerfile.centos7
+++ b/docker/test/Dockerfile.centos7
@@ -19,7 +19,7 @@ FROM centos:centos7
# This is passed to the heron build command via the --config flag
ENV TARGET_PLATFORM centos
-ENV bazelVersion 0.26.0
+ENV bazelVersion 3.0.0
RUN yum -y upgrade
RUN yum -y install \
@@ -33,6 +33,7 @@ RUN yum -y install \
git \
kernel-devel \
libtool \
+ cppunit-devel \
make \
patch \
python-devel \
diff --git a/docker/test/Dockerfile.ubuntu18.04
b/docker/test/Dockerfile.ubuntu18.04
index e9c2e82..2586947 100644
--- a/docker/test/Dockerfile.ubuntu18.04
+++ b/docker/test/Dockerfile.ubuntu18.04
@@ -19,7 +19,7 @@ FROM ubuntu:18.04
# This is passed to the heron build command via the --config flag
ENV TARGET_PLATFORM ubuntu
-ENV bazelVersion 0.26.0
+ENV bazelVersion 3.0.0
RUN apt-get update && apt-get -y install \
g++ \
@@ -27,6 +27,7 @@ RUN apt-get update && apt-get -y install \
automake \
libtool-bin \
libunwind8 \
+ libcppunit-dev \
patch \
python-dev \
python3-dev \