-
Notifications
You must be signed in to change notification settings - Fork 908
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Descriptions of the changes in this PR: - Update "master" docker image to BK 4.11.0 - Update to OpenJDK11 the main Docker image and the Docker image used for integration tests - We are not using "JRE" because it does not bundle jshell and our script detects the presence of JDK11+ from the presence of file "jshell" Master Issue: #2387 Reviewers: Ravi Sharda <None>, Jia Zhai <[email protected]> This closes #2433 from eolivelli/fix/test-jdk11-upgrade-docker (cherry picked from commit 83dec6e) Signed-off-by: Enrico Olivelli <[email protected]>
- Loading branch information
Showing
6 changed files
with
13 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,20 +20,20 @@ | |
FROM centos:7 | ||
MAINTAINER Apache BookKeeper <[email protected]> | ||
|
||
ARG BK_VERSION=4.9.0 | ||
ARG BK_VERSION=4.11.0 | ||
ARG DISTRO_NAME=bookkeeper-server-${BK_VERSION}-bin | ||
ARG DISTRO_URL=https://archive.apache.org/dist/bookkeeper/bookkeeper-${BK_VERSION}/${DISTRO_NAME}.tar.gz | ||
|
||
ENV BOOKIE_PORT=3181 | ||
EXPOSE $BOOKIE_PORT | ||
ENV BK_USER=bookkeeper | ||
ENV BK_HOME=/opt/bookkeeper | ||
ENV JAVA_HOME=/usr/lib/jvm/jre-1.8.0 | ||
ENV JAVA_HOME=/usr/lib/jvm/jdk-11 | ||
|
||
# Download Apache Bookkeeper, untar and clean up | ||
RUN set -x \ | ||
&& adduser "${BK_USER}" \ | ||
&& yum install -y java-1.8.0-openjdk-headless wget bash python sudo\ | ||
&& yum install -y java-11-openjdk-devel wget bash python sudo\ | ||
&& mkdir -pv /opt \ | ||
&& cd /opt \ | ||
&& wget -q "${DISTRO_URL}" \ | ||
|
@@ -52,7 +52,8 @@ RUN set -x \ | |
&& pip install zk-shell \ | ||
&& rm -rf get-pip.py \ | ||
&& yum remove -y wget \ | ||
&& yum clean all | ||
&& yum clean all \ | ||
&& ls /usr/lib/jvm | ||
|
||
WORKDIR /opt/bookkeeper | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters