chenzl il y a 10 mois
Parent
commit
56fbd191e0
4 fichiers modifiés avec 1 ajouts et 69 suppressions
  1. 0 35
      DockerfileBack
  2. 0 33
      DockerfileBack2
  3. 0 0
      DockerfileTest
  4. 1 1
      test-compose.yml

+ 0 - 35
DockerfileBack

@@ -1,35 +0,0 @@
-FROM ubuntu:20.04
-MAINTAINER chenjh "842761733@qq.com"
-# 内置一些常用的中文字体,避免普遍性乱码
-EXPOSE 8012
-RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" > /etc/apt/sources.list &&\
-    apt-get clean && apt-get update &&\
-	apt-get install -y --reinstall ca-certificates &&\
-	apt-get clean && apt-get update &&\
-	apt-get install -y locales language-pack-zh-hans &&\
-	localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
-    export DEBIAN_FRONTEND=noninteractive &&\
-	apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
-	apt-get install -y fontconfig ttf-mscorefonts-installer ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy &&\
-	apt-get install -y wget &&\
-    cd /tmp &&\
-
-# 安装 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 &&\
-
-#  清理临时文件
-	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
-
-ENV JAVA_HOME /usr/local/jdk1.8.0_251
-ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
-ENV PATH $PATH:$JAVA_HOME/bin
-ENV LANG zh_CN.UTF-8
-ENV LC_ALL zh_CN.UTF-8
-CMD ["/bin/bash"]
-
-
-COPY server/target/kkFileView-4.4.0-SNAPSHOT.jar file-preview.jar
-EXPOSE 8012

+ 0 - 33
DockerfileBack2

@@ -1,33 +0,0 @@
-FROM ubuntu:20.04
-# 准备 kkFileView、LibreOffice 和 JDK
-COPY server/target/kkFileView-4.4.0-SNAPSHOT.tar.gz /opt/
-COPY server/tool/jdk-8u202-linux-x64.tar.gz /opt/
-COPY server/tool/LibreOffice_7.6.4_Linux_x86-64_deb.tar.gz /opt/
-# 升级系统,安装相关的依赖包和字体、安装 JDK、LibreOffice
-RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" > /etc/apt/sources.list &&\
-    apt-get clean && apt-get update &&\
-    apt-get install -y locales && apt-get install -y language-pack-zh-hans &&\
-    localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
-    apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
-    apt-get install -y libxrender1 && apt-get install -y libxt6 && apt-get install -y libxext-dev && apt-get install -y libfreetype6-dev &&\
-    apt-get install -y wget && apt-get install -y ttf-mscorefonts-installer && apt-get install -y fontconfig &&\
-    apt-get install ttf-wqy-microhei &&\
-    apt-get install ttf-wqy-zenhei &&\
-    apt-get install xfonts-wqy && \
-    apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1 && \
-    cd /opt && tar -xvf jdk-8u202-linux-x64.tar.gz && mv jdk1.8.0_202 /usr/local/ &&\
-    tar -xvf kkFileView-4.4.0-SNAPSHOT.tar.gz &&\
-    tar -xvf LibreOffice_7.6.4_Linux_x86-64_deb.tar.gz &&\
-    cd LibreOffice_7.6.4.1_Linux_x86-64_deb/DEBS &&\
-    dpkg -i *.deb &&\
-    cd ~ && rm -rf /var/lib/apt/lists/*
-# 设置环境变量
-ENV JAVA_HOME /usr/local/jdk1.8.0_202
-ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
-ENV PATH $PATH:$JAVA_HOME/bin
-ENV LANG zh_CN.UTF-8
-ENV LC_ALL zh_CN.UTF-8
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.4.0-SNAPSHOT/bin
-ENV KK_OFFICE_HOME=/opt/libreoffice7.6
-# 容器的入口,启动后需要执行的程序
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0-SNAPSHOT/config/application.properties","-jar","/opt/kkFileView-4.4.0-SNAPSHOT/bin/kkFileView-4.4.0-SNAPSHOT.jar"]

+ 0 - 0
Dockerfile → DockerfileTest


+ 1 - 1
compose.yml → test-compose.yml

@@ -9,7 +9,7 @@ services:
     network_mode: "host"
     build:
       context: ./         # 指定设定上下文根目录,然后以该目录为准寻找Dockerfile
-      dockerfile: Dockerfile  #DockerFile 真正所在位置
+      dockerfile: DockerfileTest  #DockerFile 真正所在位置
     image: file-preview:1.0.0
     volumes:
       # 挂载日志 -v A:B ,A指宿主机位置,B指容器位置