From bd6f6d66875918c54ce46d4554cd159143f30284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=9C=E8=8A=BD?= <46080660+e5sub@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:34:53 +0800 Subject: [PATCH 1/2] Update libreoffice-nogui --- docker/kkfileview-jdk/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/kkfileview-jdk/Dockerfile b/docker/kkfileview-jdk/Dockerfile index f4e873cab..6c8e559ad 100644 --- a/docker/kkfileview-jdk/Dockerfile +++ b/docker/kkfileview-jdk/Dockerfile @@ -19,12 +19,11 @@ 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://downloadarchive.documentfoundation.org/libreoffice/old/7.5.3.2/deb/x86_64/LibreOffice_7.5.3.2_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 &&\ + wget http://security.ubuntu.com/ubuntu/pool/universe/libr/libreoffice/libreoffice-nogui_7.6.7-0ubuntu0.23.10.3_amd64.deb &&\ + dpkg -i libreoffice*.deb &&\ # 清理临时文件 - rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\ + rm -rf libreoffice*.deb && rm -rf /var/lib/apt/lists/* &&\ cd /usr/share/fonts/chinese &&\ mkfontscale &&\ mkfontdir &&\ From 29c1a64590c561dccce50a8e49951f40fe510162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=9C=E8=8A=BD?= <46080660+e5sub@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:44:45 +0800 Subject: [PATCH 2/2] Update ubuntu 24.04 --- docker/kkfileview-jdk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/kkfileview-jdk/Dockerfile b/docker/kkfileview-jdk/Dockerfile index 6c8e559ad..e41f49333 100644 --- a/docker/kkfileview-jdk/Dockerfile +++ b/docker/kkfileview-jdk/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 MAINTAINER chenjh "842761733@qq.com" # 内置一些常用的中文字体，避免普遍性乱码 COPY fonts/* /usr/share/fonts/chinese/