Skip to content

Commit 6559cd2

Browse files
adamretteradamretter
committed
Update to newer JDK 8
1 parent 80fc672 commit 6559cd2

File tree

12 files changed

+84
-18
lines changed

12 files changed

+84
-18
lines changed

‎centos6_x64/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ RUN \
114114

115115
# 6. Finally build the RocksDB Build Environment
116116
FROM centos6_x64-base-be AS centos6_x64-rocksdb-be
117+
COPY bellsoft.repo /etc/yum.repos.d/bellsoft.repo
117118
COPY --from=centos6_x64-git-be /usr/bin/git /usr/bin/git
118119
COPY --from=centos6_x64-git-be /usr/libexec/git-core /usr/libexec/git-core
119120
COPY --from=centos6_x64-git-be /usr/share/git-core /usr/share/git-core
@@ -133,9 +134,9 @@ RUN \
133134
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
134135
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
135136
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
136-
&& yum --setopt=tsflags=nodocs -y install java-1.8.0-openjdk-devel \
137+
&& yum --setopt=tsflags=nodocs -y install bellsoft-java8-full \
137138
&& yum -y clean all
138139

139-
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
140-
ENV PATH=$JAVA_HOME:$PATH
140+
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.x86_64
141+
ENV PATH=$JAVA_HOME/bin:$PATH
141142
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos6_x64/bellsoft.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# bellsoft.repo
2+
# Please see https://docs.bell-sw.com/liberica-jdk/latest/general/install-guide/#yum-repository-rpm-based-linux-distributions
3+
[BELLSOFT]
4+
name=BELLSOFT Repository
5+
baseurl=https://yum.bell-sw.com
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9+
priority=1

‎centos6_x86/Dockerfile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ LABEL name="CentOS 6 (x86) RocksJava Build Environment" \
88
# make: Allow N jobs at once; infinite jobs with no arg
99
ARG JOBS=1
1010

11+
#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
12+
https://vault.centos.org/6.10/os/$basearch/
13+
1114
# 1. Build a base CentOS 6 Build Environment
1215
COPY CentOS-buildlogs-devtoolset-8.repo /etc/yum.repos.d/CentOS-buildlogs-devtoolset-8.repo
1316
RUN curl --fail https://vault.centos.org/6.10/os/i386/Packages/udev-147-2.73.el6_8.2.i686.rpm --output /tmp/udev-147-2.73.el6_8.2.i686.rpm \
@@ -112,6 +115,7 @@ RUN \
112115

113116
# 6. Finally build the RocksDB Build Environment
114117
FROM centos6_x86-base-be AS centos6_x86-rocksdb-be
118+
COPY bellsoft.repo /etc/yum.repos.d/bellsoft.repo
115119
COPY --from=centos6_x86-git-be /usr/bin/git /usr/bin/git
116120
COPY --from=centos6_x86-git-be /usr/libexec/git-core /usr/libexec/git-core
117121
COPY --from=centos6_x86-git-be /usr/share/git-core /usr/share/git-core
@@ -131,9 +135,9 @@ RUN \
131135
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
132136
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
133137
&& linux32 yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
134-
&& linux32 yum --setopt=tsflags=nodocs -y install java-1.8.0-openjdk-devel \
138+
&& linux32 yum --setopt=tsflags=nodocs -y install bellsoft-java8-full \
135139
&& yum -y clean all
136140

137-
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
138-
ENV PATH=$JAVA_HOME:$PATH
141+
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.i386
142+
ENV PATH=$JAVA_HOME/bin:$PATH
139143
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos6_x86/bellsoft.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# bellsoft.repo
2+
# Please see https://docs.bell-sw.com/liberica-jdk/latest/general/install-guide/#yum-repository-rpm-based-linux-distributions
3+
[BELLSOFT]
4+
name=BELLSOFT Repository
5+
baseurl=https://yum.bell-sw.com
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9+
priority=1

‎centos7_arm64v8/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LABEL org.opencontainers.image.authors="Evolved Binary Ltd <[email protected]
55
LABEL name="CentOS 7 (arm64v8) RocksJava Build Environment" \
66
vendor="Evolved Binary Ltd"
77

8+
COPY bellsoft.repo /etc/yum.repos.d/bellsoft.repo
9+
810
RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.repo \
911
&& sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-fasttrack.repo \
1012
&& sed -i s%#baseurl=http://mirror.centos.org/centos/\$releasever/%baseurl=https://vault.centos.org/7.9.2009/%g /etc/yum.repos.d/CentOS-Base.repo \
@@ -20,11 +22,11 @@ RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.rep
2022
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
2123
&& yum --setopt=tsflags=nodocs -y install make perl which \
2224
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
23-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
25+
&& yum --setopt=tsflags=nodocs -y install openssl bellsoft-java8-full wget \
2426
&& yum -y clean all \
2527
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
2628
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3
2729

28-
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
29-
ENV PATH=$JAVA_HOME:$PATH
30+
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.aarch64
31+
ENV PATH=$JAVA_HOME/bin:$PATH
3032
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_arm64v8/bellsoft.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# bellsoft.repo
2+
# Please see https://docs.bell-sw.com/liberica-jdk/latest/general/install-guide/#yum-repository-rpm-based-linux-distributions
3+
[BELLSOFT]
4+
name=BELLSOFT Repository
5+
baseurl=https://yum.bell-sw.com
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9+
priority=1

‎centos7_ppc64le/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LABEL org.opencontainers.image.authors="Evolved Binary Ltd <[email protected]
55
LABEL name="CentOS 7 (ppc64le) RocksJava Build Environment" \
66
vendor="Evolved Binary Ltd"
77

8+
COPY bellsoft.repo /etc/yum.repos.d/bellsoft.repo
9+
810
RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.repo \
911
&& sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-fasttrack.repo \
1012
&& sed -i s%#baseurl=http://mirror.centos.org/centos/\$releasever/%baseurl=https://vault.centos.org/7.9.2009/%g /etc/yum.repos.d/CentOS-Base.repo \
@@ -20,11 +22,11 @@ RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.rep
2022
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
2123
&& yum --setopt=tsflags=nodocs -y install make perl which \
2224
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
23-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
25+
&& yum --setopt=tsflags=nodocs -y install openssl bellsoft-java8-full wget \
2426
&& yum -y clean all \
2527
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
2628
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3
2729

28-
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
29-
ENV PATH=$JAVA_HOME:$PATH
30+
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.ppc64le
31+
ENV PATH=$JAVA_HOME/bin:$PATH
3032
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_ppc64le/bellsoft.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# bellsoft.repo
2+
# Please see https://docs.bell-sw.com/liberica-jdk/latest/general/install-guide/#yum-repository-rpm-based-linux-distributions
3+
[BELLSOFT]
4+
name=BELLSOFT Repository
5+
baseurl=https://yum.bell-sw.com
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9+
priority=1

‎centos7_x64/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LABEL org.opencontainers.image.authors="Evolved Binary Ltd <[email protected]
55
LABEL name="CentOS 7 (x64) RocksJava Build Environment" \
66
vendor="Evolved Binary Ltd"
77

8+
COPY bellsoft.repo /etc/yum.repos.d/bellsoft.repo
9+
810
RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.repo \
911
&& sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-fasttrack.repo \
1012
&& sed -i s%#baseurl=http://mirror.centos.org/centos/\$releasever/%baseurl=https://vault.centos.org/7.9.2009/%g /etc/yum.repos.d/CentOS-Base.repo \
@@ -20,11 +22,11 @@ RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.rep
2022
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
2123
&& yum --setopt=tsflags=nodocs -y install make perl which \
2224
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
23-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
25+
&& yum --setopt=tsflags=nodocs -y install openssl bellsoft-java8-full wget \
2426
&& yum -y clean all \
2527
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
2628
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3
2729

28-
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
29-
ENV PATH=$JAVA_HOME:$PATH
30+
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.x86_64
31+
ENV PATH=$JAVA_HOME/bin:$PATH
3032
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_x64/bellsoft.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# bellsoft.repo
2+
# Please see https://docs.bell-sw.com/liberica-jdk/latest/general/install-guide/#yum-repository-rpm-based-linux-distributions
3+
[BELLSOFT]
4+
name=BELLSOFT Repository
5+
baseurl=https://yum.bell-sw.com
6+
enabled=1
7+
gpgcheck=1
8+
gpgkey=https://download.bell-sw.com/pki/GPG-KEY-bellsoft
9+
priority=1

0 commit comments

Comments
 (0)