Skip to content

Commit c184100

Browse files
committed
Update to Java 8 for RocksDB 7
1 parent 08bfb75 commit c184100

File tree

12 files changed

+34
-44
lines changed

12 files changed

+34
-44
lines changed

alpine3_arm64v8/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ RUN apk add \
3737
zstd zstd-dev \
3838
linux-headers
3939

40-
# install OpenJDK7
41-
RUN apk add openjdk7 \
42-
&& apk add java-cacerts \
43-
&& rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
44-
&& ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
40+
# install OpenJDK8
41+
RUN apk add openjdk8 \
42+
&& apk add java-cacerts
4543

4644
# cleanup
4745
RUN rm -rf /var/cache/apk/*
4846

4947
# puts javac in the PATH
50-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7-openjdk PATH=/usr/lib/jvm/java-1.7-openjdk/bin:$PATH
48+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk PATH=/usr/lib/jvm/java-1.8-openjdk/bin:$PATH
5149

5250
# gflags from source
5351
RUN cd /tmp &&\

alpine3_ppc64le/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ RUN apk add \
3737
zstd zstd-dev \
3838
linux-headers
3939

40-
# install OpenJDK7
41-
RUN apk add openjdk7 \
42-
&& apk add java-cacerts \
43-
&& rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
44-
&& ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
40+
# install OpenJDK8
41+
RUN apk add openjdk8 \
42+
&& apk add java-cacerts
4543

4644
# cleanup
4745
RUN rm -rf /var/cache/apk/*
4846

4947
# puts javac in the PATH
50-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7-openjdk PATH=/usr/lib/jvm/java-1.7-openjdk/bin:$PATH
48+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk PATH=/usr/lib/jvm/java-1.8-openjdk/bin:$PATH
5149

5250
# gflags from source
5351
RUN cd /tmp &&\

alpine3_s390x/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ RUN apk add \
3737
zstd zstd-dev \
3838
linux-headers
3939

40-
# install OpenJDK7
41-
RUN apk add openjdk7 \
42-
&& apk add java-cacerts \
43-
&& rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
44-
&& ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
40+
# install OpenJDK8
41+
RUN apk add openjdk8 \
42+
&& apk add java-cacerts
4543

4644
# cleanup
4745
RUN rm -rf /var/cache/apk/*
4846

4947
# puts javac in the PATH
50-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7-openjdk PATH=/usr/lib/jvm/java-1.7-openjdk/bin:$PATH
48+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk PATH=/usr/lib/jvm/java-1.8-openjdk/bin:$PATH
5149

5250
# gflags from source
5351
RUN cd /tmp &&\

alpine3_x64/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ RUN apk add \
3737
zstd zstd-dev \
3838
linux-headers
3939

40-
# install OpenJDK7
41-
RUN apk add openjdk7 \
42-
&& apk add java-cacerts \
43-
&& rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
44-
&& ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
40+
# install OpenJDK8
41+
RUN apk add openjdk8 \
42+
&& apk add java-cacerts
4543

4644
# cleanup
4745
RUN rm -rf /var/cache/apk/*
4846

4947
# puts javac in the PATH
50-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7-openjdk PATH=/usr/lib/jvm/java-1.7-openjdk/bin:$PATH
48+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk PATH=/usr/lib/jvm/java-1.8-openjdk/bin:$PATH
5149

5250
# gflags from source
5351
RUN cd /tmp &&\

alpine3_x86/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,15 @@ RUN apk add \
3737
zstd zstd-dev \
3838
linux-headers
3939

40-
# install OpenJDK7
41-
RUN apk add openjdk7 \
42-
&& apk add java-cacerts \
43-
&& rm /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts \
44-
&& ln -s /etc/ssl/certs/java/cacerts /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
40+
# install OpenJDK8
41+
RUN apk add openjdk8 \
42+
&& apk add java-cacerts
4543

4644
# cleanup
4745
RUN rm -rf /var/cache/apk/*
4846

4947
# puts javac in the PATH
50-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7-openjdk PATH=/usr/lib/jvm/java-1.7-openjdk/bin:$PATH
48+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk PATH=/usr/lib/jvm/java-1.8-openjdk/bin:$PATH
5149

5250
# gflags from source
5351
RUN cd /tmp &&\

centos6_x64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.rep
1919
&& yum --setopt=tsflags=nodocs -y upgrade \
2020
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
2121
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel \
22-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel wget \
22+
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
2323
&& yum -y clean all \
2424
&& 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 \
2525
&& 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 \
2626
&& wget https://github.com/gflags/gflags/archive/v2.0.tar.gz -O gflags-2.0.tar.gz \
2727
&& tar xvfz gflags-2.0.tar.gz; cd gflags-2.0; scl enable devtoolset-7 ./configure; scl enable devtoolset-7 make; scl enable devtoolset-7 'make install'; cd ..; rm -r gflags-2.0*
2828

29-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
29+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
3030
ENV PATH=$JAVA_HOME:$PATH
3131
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

centos6_x86/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ RUN curl --fail https://vault.centos.org/6.10/os/i386/Packages/udev-147-2.73.el6
2323
&& linux32 yum --setopt=tsflags=nodocs -y install wget tar which \
2424
&& linux32 yum --setopt=tsflags=nodocs -y install make perl devtoolset-8 cmake3 \
2525
&& linux32 yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel \
26-
&& linux32 yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel \
26+
&& linux32 yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel \
2727
&& linux32 yum -y clean all \
2828
&& 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 \
2929
&& 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 \
3030
&& curl --fail https://codeload.github.com/gflags/gflags/tar.gz/v2.0 --output /tmp/gflags-2.0.tar.gz \
3131
&& cd /tmp && tar xvfz gflags-2.0.tar.gz; cd gflags-2.0; linux32 scl enable devtoolset-8 ./configure; linux32 scl enable devtoolset-8 make; linux32 scl enable devtoolset-8 'make install'; cd ..; rm -rf gflags-2.0*
3232

33-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
33+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
3434
ENV PATH=$JAVA_HOME:$PATH
3535
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

centos7_arm64v8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ RUN yum --setopt=tsflags=nodocs -y update \
1111
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
1212
&& yum --setopt=tsflags=nodocs -y install make perl which \
1313
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
14-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel wget \
14+
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
1515
&& yum -y clean all \
1616
&& 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 \
1717
&& 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
1818

19-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
19+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
2020
ENV PATH=$JAVA_HOME:$PATH
2121
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

centos7_ppc64le/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ RUN yum --setopt=tsflags=nodocs -y update \
1111
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
1212
&& yum --setopt=tsflags=nodocs -y install make perl which \
1313
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
14-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel wget \
14+
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
1515
&& yum -y clean all \
1616
&& 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 \
1717
&& 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
1818

19-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
19+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
2020
ENV PATH=$JAVA_HOME:$PATH
2121
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

centos7_s390x/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ RUN yum --setopt=tsflags=nodocs -y update \
1111
&& yum --setopt=tsflags=nodocs -y install cmake3 \
1212
&& yum --setopt=tsflags=nodocs -y install gcc-c++ make perl which \
1313
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel gflags-devel \
14-
&& yum --setopt=tsflags=nodocs -y install openssl java-1.7.0-openjdk-devel wget \
14+
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
1515
&& yum -y clean all \
1616
&& 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 \
1717
&& 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
1818

19-
ENV JAVA_HOME=/usr/lib/jvm/java-1.7.0
19+
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
2020
ENV PATH=$JAVA_HOME:$PATH
2121
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

0 commit comments

Comments
 (0)