From cd33d80a8cd435258bb21a3cab0d17efaf2f015a Mon Sep 17 00:00:00 2001
From: opkopk12333 <3024371557@qq.com>
Date: Thu, 27 May 2021 21:14:09 +0800
Subject: [PATCH] =?UTF-8?q?Dockerfile=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20open?=
 =?UTF-8?q?office=20/=20libreoffice=20=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E5=8A=A8=E6=80=81=E5=88=87=E6=8D=A2=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b2c69e5c..5246c794 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,19 @@ RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe m
 	apt-get install xfonts-wqy &&\
     cd /tmp &&\
 	wget https://kkfileview.keking.cn/server-jre-8u251-linux-x64.tar.gz &&\
-	wget https://kkfileview.keking.cn/Apache_OpenOffice_4.1.6_Linux_x86-64_install-deb_zh-CN.tar.gz -cO openoffice_deb.tar.gz &&\
 	tar -zxf /tmp/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\
+
+#	安装 OpenOffice
+	wget https://kkfileview.keking.cn/Apache_OpenOffice_4.1.6_Linux_x86-64_install-deb_zh-CN.tar.gz -cO openoffice_deb.tar.gz &&\
 	tar -zxf /tmp/openoffice_deb.tar.gz && cd /tmp/zh-CN/DEBS &&\
 	dpkg -i *.deb && dpkg -i desktop-integration/openoffice4.1-debian-menus_4.1.6-9790_all.deb &&\
+
+#	安装 libreoffice
+#    apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1 &&\
+#    wget https://mirrors.cloud.tencent.com/libreoffice/libreoffice/stable/7.1.3/deb/x86_64/LibreOffice_7.1.3_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
+#    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.1.3.2_Linux_x86-64_deb/DEBS &&\
+#    dpkg -i *.deb &&\
+
 	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
     cd /usr/share/fonts/chienes &&\
     mkfontscale &&\