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 43c7c74 Update Debian docker build with JDK11 and correct debian
version (#3487)
43c7c74 is described below
commit 43c7c748967e4fd15d0aeabd63e97ab48ad89f8d
Author: Windham Wong <[email protected]>
AuthorDate: Thu Mar 12 09:15:59 2020 +0800
Update Debian docker build with JDK11 and correct debian version (#3487)
* Debian9 docker build fix
* Fix Debian docker build with JDK11
Co-authored-by: tahlia <[email protected]>
---
docker/compile/Dockerfile.debian10 | 2 +-
docker/compile/Dockerfile.debian9 | 7 ++-----
docker/dist/Dockerfile.dist.debian9 | 7 +++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/docker/compile/Dockerfile.debian10
b/docker/compile/Dockerfile.debian10
index c240b98..70e15d0 100644
--- a/docker/compile/Dockerfile.debian10
+++ b/docker/compile/Dockerfile.debian10
@@ -31,7 +31,7 @@ RUN apt-get update && apt-get -y install \
libtool \
libtool-bin \
python \
- python2.7-dev \
+ python-dev \
software-properties-common \
python-setuptools \
tree \
diff --git a/docker/compile/Dockerfile.debian9
b/docker/compile/Dockerfile.debian9
index 0af0330..223c4eb 100644
--- a/docker/compile/Dockerfile.debian9
+++ b/docker/compile/Dockerfile.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
# This is passed to the heron build command via the --config flag
ENV TARGET_PLATFORM debian
@@ -37,10 +37,7 @@ RUN apt-get update && apt-get -y install \
tree \
zip \
unzip \
- wget \
- openjdk-11-jdk-headless
-
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
+ wget
RUN wget -O /tmp/bazel.sh
https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-installer-linux-x86_64.sh
\
&& chmod +x /tmp/bazel.sh \
diff --git a/docker/dist/Dockerfile.dist.debian9
b/docker/dist/Dockerfile.dist.debian9
index 7ba3645..5d56c1e 100644
--- a/docker/dist/Dockerfile.dist.debian9
+++ b/docker/dist/Dockerfile.dist.debian9
@@ -15,17 +15,16 @@
# 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 \
python \
- python3 \
+ python-dev \
unzip \
curl \
vim \
- supervisor \
- openjdk-11-jdk-headless && \
+ supervisor && \
apt-get clean all && \
rm -rf /var/lib/apt/lists/*
