Browse Source

update linux libreoffice version to 7.5.3

陈精华 1 year ago
parent
commit
f57e0bcf12

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM keking/kkfileview-jdk:4.1.1
+FROM keking/kkfileview-jdk:4.3.0
 MAINTAINER chenjh "842761733@qq.com"
 ADD server/target/kkFileView-*.tar.gz /opt/
 ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.3.0-SNAPSHOT/bin

+ 2 - 2
docker/kkfileview-jdk/Dockerfile

@@ -19,8 +19,8 @@ RUN apt-get clean && apt-get update &&\
 
 # 安装 libreoffice
     apt-get install -y libxrender1 libxinerama1 libxt6 libxext-dev libfreetype6-dev libcairo2 libcups2 libx11-xcb1 libnss3 &&\
-    wget https://kkview.cn/resource/LibreOffice_7.3.7_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
-    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_deb/DEBS &&\
+    wget https://kkview.cn/resource/LibreOffice_7.5.3_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
+    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.5.3.2_Linux_x86-64_deb/DEBS &&\
     dpkg -i *.deb &&\
 
 #  清理临时文件

+ 1 - 1
docker/kkfileview-jdk/docker build.txt

@@ -1,2 +1,2 @@
 # 执行如下命令构建基础镜像,加快kkfileview docker镜像构建与发布
-docker build --tag keking/kkfileview-jdk:4.1.1 .
+docker build --tag keking/kkfileview-jdk:4.3.0 .

+ 2 - 2
server/src/main/bin/install.sh

@@ -2,7 +2,7 @@
 cd /tmp
 
 install_redhat() {
-   wget https://kkview.cn/resource/LibreOffice_7.3.7_Linux_x86-64_rpm.tar.gz -cO LibreOffice_7_rpm.tar.gz && tar -zxf /tmp/LibreOffice_7_rpm.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_rpm/RPMS
+   wget https://kkview.cn/resource/LibreOffice_7.5.3_Linux_x86-64_rpm.tar.gz -cO LibreOffice_7_rpm.tar.gz && tar -zxf /tmp/LibreOffice_7_rpm.tar.gz && cd /tmp/LibreOffice_7.5.3.2_Linux_x86-64_rpm/RPMS
    echo $?
    if [ $? -eq 0 ];then
      yum install -y libSM.x86_64 libXrender.x86_64  libXext.x86_64
@@ -15,7 +15,7 @@ install_redhat() {
 }
 
 install_ubuntu() {
-   wget  https://kkview.cn/resource/LibreOffice_7.3.7_Linux_x86-64_deb.tar.gz  -cO LibreOffice_7_deb.tar.gz && tar -zxf /tmp/LibreOffice_7_deb.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_deb/DEBS
+   wget  https://kkview.cn/resource/LibreOffice_7.5.3_Linux_x86-64_deb.tar.gz  -cO LibreOffice_7_deb.tar.gz && tar -zxf /tmp/LibreOffice_7_deb.tar.gz && cd /tmp/LibreOffice_7.5.3.2_Linux_x86-64_deb/DEBS
    echo $?
  if [ $? -eq 0 ];then
      apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1