diff --git a/Dockerfile b/Dockerfile index f43adb0..c1f56f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,16 @@ FROM centos:7 ############################################### ## install jdk ############################################### -ARG JAVA_FILE=jdk-8u321-linux-x64.rpm +ARG JAVA_FILE=openjdk-21_linux-x64_bin.tar.gz -COPY ./depends/${JAVA_FILE} /tmp/jdk-8-linux-x64.rpm -RUN yum -y install /tmp/jdk-8-linux-x64.rpm -# JDK stripping -RUN rm -f /usr/java/jdk1.8.0_321-amd64/src.zip /usr/java/jdk1.8.0_321-amd64/javafx-src.zip -RUN rm -rf /usr/java/jdk1.8.0_321-amd64/lib/missioncontrol/ /usr/java/jdk1.8.0_321-amd64/lib/visualvm/ /usr/java/jdk1.8.0_321-amd64/db/ -RUN alternatives --install /usr/bin/java java /usr/java/latest/bin/java 1 -RUN alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 1 -ENV JAVA_HOME /usr/java/latest -RUN rm -f /tmp/jdk-8-linux-x64.rpm; +COPY ./depends/${JAVA_FILE} /tmp/openjdk-21_linux-x64_bin.tar.gz + +RUN mkdir -p /usr/local/java +RUN tar -zxf /tmp/openjdk-21_linux-x64_bin.tar.gz --strip-components 1 -C /usr/local/java +ENV JAVA_HOME /usr/local/java +ENV PATH $PATH:$JAVA_HOME/bin + +RUN rm -f /tmp/openjdk-21_linux-x64_bin.tar.gz; RUN java -version ############################################### @@ -53,18 +52,18 @@ RUN cnpm -v ENV FPM_VERSION 1.14.0 RUN yum install -y centos-release-scl -RUN yum install -y rh-ruby25 rh-ruby25-rubygems rh-ruby25-ruby-devel gcc make rpm-build -RUN echo '/opt/rh/rh-ruby25/root/usr/lib64' > /etc/ld.so.conf.d/rh-ruby.conf +RUN yum install -y rh-ruby26 rh-ruby26-rubygems rh-ruby26-ruby-devel gcc make rpm-build +RUN echo '/opt/rh/rh-ruby26/root/usr/lib64' > /etc/ld.so.conf.d/rh-ruby.conf RUN ldconfig -RUN ln -s /opt/rh/rh-ruby25/root/bin/ruby /usr/bin/ruby \ - && ln -s /opt/rh/rh-ruby25/root/bin/gem /usr/bin/gem +RUN ln -s /opt/rh/rh-ruby26/root/bin/ruby /usr/bin/ruby \ + && ln -s /opt/rh/rh-ruby26/root/bin/gem /usr/bin/gem RUN ruby -v RUN gem sources --add http://mirrors.aliyun.com/rubygems/ \ && gem sources --remove https://rubygems.org/ \ && gem install fpm -v ${FPM_VERSION} \ - && ln -s /opt/rh/rh-ruby25/root/usr/local/bin/fpm /usr/bin/fpm + && ln -s /opt/rh/rh-ruby26/root/usr/local/bin/fpm /usr/bin/fpm RUN fpm -v diff --git a/depends/openjdk-21_linux-x64_bin.tar.gz b/depends/openjdk-21_linux-x64_bin.tar.gz new file mode 100644 index 0000000..cdabd4f Binary files /dev/null and b/depends/openjdk-21_linux-x64_bin.tar.gz differ