You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/09/23 06:46:50 UTC
[phoenix] branch 5.1 updated: PHOENIX-6537 Fix CI pipeline and
upgrade Yetus (addendum: update java 11 in Docker image)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 063097a PHOENIX-6537 Fix CI pipeline and upgrade Yetus (addendum: update java 11 in Docker image)
063097a is described below
commit 063097a1cbf1b3474668e5cf83b41c648baa4947
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Sep 23 08:19:55 2021 +0200
PHOENIX-6537 Fix CI pipeline and upgrade Yetus (addendum: update java 11 in Docker image)
---
dev/docker/Dockerfile.multibranch | 10 +++++++++-
dev/docker/Dockerfile.yetus | 8 ++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev/docker/Dockerfile.multibranch b/dev/docker/Dockerfile.multibranch
index d739c71..4989169 100644
--- a/dev/docker/Dockerfile.multibranch
+++ b/dev/docker/Dockerfile.multibranch
@@ -27,4 +27,12 @@ RUN mkdir -p /run/user/910/gnupg/ \
&& mkdir -p /var/run/user/910/gnupg \
&& chown -R 910:910 /var/run/user/910 \
&& chmod -R 700 /var/run/user/910
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
\ No newline at end of file
+#####
+# Update Java 11 packages to 11.0.11 (to avoid Java 11.0.9.1 version Jetty bug)
+#####
+RUN apt-get update \
+ && apt-get -q install --no-install-recommends -y openjdk-11-jdk-headless=11.0.11+9-0ubuntu2~20.04 openjdk-11-jre-headless=11.0.11+9-0ubuntu2~20.04 openjdk-11-jre=11.0.11+9-0ubuntu2~20.04
+#####
+# Set default JDK to 11
+#####
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
diff --git a/dev/docker/Dockerfile.yetus b/dev/docker/Dockerfile.yetus
index 9721339..91e9add 100644
--- a/dev/docker/Dockerfile.yetus
+++ b/dev/docker/Dockerfile.yetus
@@ -43,4 +43,12 @@ RUN mkdir -p /run/user/910/gnupg/ \
&& mkdir -p /var/run/user/910/gnupg \
&& chown -R 910:910 /var/run/user/910 \
&& chmod -R 700 /var/run/user/910
+#####
+# Update Java 11 packages to 11.0.11 (to avoid Java 11.0.9.1 version Jetty bug)
+#####
+RUN apt-get update \
+ && apt-get -q install --no-install-recommends -y openjdk-11-jdk-headless=11.0.11+9-0ubuntu2~20.04 openjdk-11-jre-headless=11.0.11+9-0ubuntu2~20.04 openjdk-11-jre=11.0.11+9-0ubuntu2~20.04
+#####
+# Set default JDK to 11
+#####
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64