Skip to content

Make JDK 17 a default #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hashhar merged 1 commit into from
Aug 12, 2022
Merged

Make JDK 17 a default #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
config:
- image: accumulo
- image: dns
- image: centos7-oj11
- image: centos7-oj11-openldap-referrals
- image: centos7-oj17
- image: centos7-oj17-openldap-referrals
- image: spark3.0-iceberg
- image: spark3-delta
- image: kerberos
Expand Down
4 changes: 2 additions & 2 deletions testing/accumulo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

ARG ACCUMULO_VERSION=1.7.4
ARG HADOOP_VERSION=2.6.5
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN yum update -y && \
alternatives --set javac /usr/lib/jvm/zulu-8/bin/javac && \
yum clean all -y

# Override JAVA_HOME inherited from testing/centos7-oj11
# Override JAVA_HOME inherited from testing/centos7-oj17
ENV JAVA_HOME=/usr/lib/jvm/zulu-8

RUN mkdir -p $IMAGE_ROOT_INSTALL
Expand Down
12 changes: 5 additions & 7 deletions testing/cdh5.12-hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ RUN \
set -xeu && \
# Remove unaccessible CDH5 repos so yum is still usable
rm /etc/yum.repos.d/cloudera-cdh5.repo && \
# Install additional Zulu JDK 17.0.3
rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \
# Upgrade Zulu JDK to 11.0.15
rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \
# Set JDK 11 as a default one
alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
# Install Zulu JDK 17.0.4
rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \
# Set JDK 17 as a default one
alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
echo "Done"

# HDFS ports
Expand Down
12 changes: 5 additions & 7 deletions testing/cdh5.15-hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ RUN \
set -xeu && \
# Remove unaccessible CDH5 repos so yum is still usable
rm /etc/yum.repos.d/cloudera-cdh5.repo && \
# Install additional Zulu JDK 17.0.3
rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \
# Upgrade Zulu JDK to 11.0.15
rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \
# Set JDK 11 as default one
alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
# Install Zulu JDK 17.0.4
rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \
# Set JDK 17 as a default one
alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
echo "Done"

# HDFS ports
Expand Down
2 changes: 1 addition & 1 deletion ...entos7-oj11-openldap-referrals/Dockerfile → ...entos7-oj17-openldap-referrals/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11-openldap:unlabelled
FROM testing/centos7-oj17-openldap:unlabelled

# COPY CONFIGURATION
COPY ./files /
Expand Down
0 ...s/etc/openldap/setup/createReferrals.ldif → ...s/etc/openldap/setup/createReferrals.ldif
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion testing/centos7-oj11-openldap/Dockerfile → testing/centos7-oj17-openldap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

# INSTALL OPENLDAP
RUN yum -y install openssl openldap openldap-clients openldap-servers \
Expand Down
0 ...ap/certs/active-directory-certificate.crt → ...ap/certs/active-directory-certificate.crt
View file
Open in desktop
File renamed without changes.
0 ...c/openldap/certs/openldap-certificate.pem → ...c/openldap/certs/openldap-certificate.pem
View file
Open in desktop
File renamed without changes.
0 ...ldap/files/etc/openldap/certs/private.pem → ...ldap/files/etc/openldap/certs/private.pem
View file
Open in desktop
File renamed without changes.
0 ...nldap/files/etc/openldap/certs/serial.txt → ...nldap/files/etc/openldap/certs/serial.txt
View file
Open in desktop
File renamed without changes.
0 ...ldap/certs/trino-coordinator-for-ldap.pem → ...ldap/certs/trino-coordinator-for-ldap.pem
View file
Open in desktop
File renamed without changes.
0 ...ap/files/etc/openldap/setup/createOU.ldif → ...ap/files/etc/openldap/setup/createOU.ldif
View file
Open in desktop
File renamed without changes.
0 ...penldap/setup/ldap_disable_bind_anon.ldif → ...penldap/setup/ldap_disable_bind_anon.ldif
View file
Open in desktop
File renamed without changes.
0 ...ap/files/etc/openldap/setup/memberof.ldif → ...ap/files/etc/openldap/setup/memberof.ldif
View file
Open in desktop
File renamed without changes.
0 ...les/etc/openldap/setup/modify_server.ldif → ...les/etc/openldap/setup/modify_server.ldif
View file
Open in desktop
File renamed without changes.
0 ...ldap/files/etc/openldap/setup/refint.ldif → ...ldap/files/etc/openldap/setup/refint.ldif
View file
Open in desktop
File renamed without changes.
0 ...-oj11-openldap/files/etc/supervisord.conf → ...-oj17-openldap/files/etc/supervisord.conf
View file
Open in desktop
File renamed without changes.
0 ...enldap/files/etc/supervisord.d/slapd.conf → ...enldap/files/etc/supervisord.d/slapd.conf
View file
Open in desktop
File renamed without changes.
0 ...-openldap/files/usr/bin/wait-for-slapd.sh → ...-openldap/files/usr/bin/wait-for-slapd.sh
View file
Open in desktop
File renamed without changes.
0 ...s7-oj11-openldap/generate-certificates.md → ...s7-oj17-openldap/generate-certificates.md
View file
Open in desktop
File renamed without changes.
14 changes: 6 additions & 8 deletions testing/centos7-oj11/Dockerfile → testing/centos7-oj17/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ RUN \
wget \
&& \
\
# install Zulu JDK
rpm -i https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \
# Install additional Zulu JDK 17.0.3
rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \
# Set JDK 11 as a default one
alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
# Install Zulu JDK 17.0.4 \
rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \
# Set JDK 17 as a default one
alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
\
# install supervisor
yum --enablerepo=extras install -y setuptools epel-release && \
Expand All @@ -48,5 +46,5 @@ RUN \
yum -y clean all && rm -rf /tmp/* /var/tmp/*

ENV PATH="/usr/local/bin:${PATH}"
ENV JAVA_HOME=/usr/lib/jvm/zulu-11
ENV JAVA_HOME=/usr/lib/jvm/zulu-17
ENV LANG=en_US.UTF-8
0 ...j11/files/opt/trinodev/site-override.xslt → ...j17/files/opt/trinodev/site-override.xslt
View file
Open in desktop
File renamed without changes.
0 ...sr/local/bin/apply-all-site-xml-overrides → ...sr/local/bin/apply-all-site-xml-overrides
View file
Open in desktop
File renamed without changes.
0 ...les/usr/local/bin/apply-site-xml-override → ...les/usr/local/bin/apply-site-xml-override
View file
Open in desktop
File renamed without changes.
12 changes: 5 additions & 7 deletions testing/hdp2.6-hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ RUN \
set -xeu && \
# Remove unaccessible HDP2 repos so yum is still usable
rm /etc/yum.repos.d/hdp*.repo && \
# Install additional Zulu JDK 17.0.3
rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \
# Upgrade Zulu JDK to 11.0.15
rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \
# Set JDK 11 as a default one
alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
# Install Zulu JDK 17.0.4
rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \
# Set JDK 17 as a default one
alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
echo "Done"

# HDFS ports
Expand Down
12 changes: 5 additions & 7 deletions testing/hdp3.1-hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ RUN \
set -xeu && \
# Remove unaccessible HDP3 repos so yum is still usable
rm /etc/yum.repos.d/hdp*.repo && \
# Install additional Zulu JDK 17.0.3
rpm -i https://cdn.azul.com/zulu/bin/zulu17.34.19-ca-jdk17.0.3-linux.x86_64.rpm && \
# Upgrade Zulu JDK to 11.0.15
rpm -Ui https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux.x86_64.rpm && \
# Set JDK 11 as default one
alternatives --set java /usr/lib/jvm/zulu-11/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-11/bin/javac && \
# Install Zulu JDK 17.0.4
rpm -i https://cdn.azul.com/zulu/bin/zulu17.36.13-ca-jdk17.0.4-linux.x86_64.rpm && \
# Set JDK 17 as a default one
alternatives --set java /usr/lib/jvm/zulu-17/bin/java && \
alternatives --set javac /usr/lib/jvm/zulu-17/bin/javac && \
echo "Done"

# HDFS ports
Expand Down
4 changes: 2 additions & 2 deletions testing/hive3.1-hive/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

ARG JAVA8_ZULU_VERSION=8.56.0.21-ca-jdk8.0.302

Expand All @@ -31,7 +31,7 @@ RUN yum install -y \
alternatives --set javac /usr/lib/jvm/zulu-8/bin/javac \
&& yum -q clean all && rm -rf /var/cache/yum

# Override JAVA_HOME inherited from testing/centos7-oj11
# Override JAVA_HOME inherited from testing/centos7-oj17
ENV JAVA_HOME=/usr/lib/jvm/zulu-8

ARG HADOOP_VERSION=3.1.2
Expand Down
2 changes: 1 addition & 1 deletion testing/kerberos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

# INSTALL KERBEROS
RUN yum install -y krb5-libs krb5-server krb5-workstation \
Expand Down
2 changes: 1 addition & 1 deletion testing/phoenix5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

ARG HBASE_VERSION=2.4.7
ARG ZOOKEEPER_VERSION=3.5.7
Expand Down
2 changes: 1 addition & 1 deletion testing/spark3-delta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

ARG SPARK_VERSION=3.2.1
ARG HADOOP_VERSION=3.2
Expand Down
2 changes: 1 addition & 1 deletion testing/spark3.0-iceberg/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM testing/centos7-oj11:unlabelled
FROM testing/centos7-oj17:unlabelled

ARG SPARK_VERSION=3.2.1
ARG HADOOP_VERSION=3.2
Expand Down