diff --git a/Dockerfile b/Dockerfile index 58bafe7..09b3357 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN dpkg --add-architecture i386 && \ apt-key add winehq.key && \ apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ jammy main' && \ apt-get update -y && \ - apt-get install -y --install-recommends winehq-stable && \ + apt-get install -y --install-recommends winehq-stable winetricks && \ wine --version # 配置运行环境等信息 @@ -48,17 +48,16 @@ RUN useradd -m app && usermod -aG sudo app && echo 'app ALL=(ALL) NOPASSWD:ALL' USER app WORKDIR /home/app -# 安装wine-mono +# 安装wine-mono和中文字体 COPY install-wine-mono.sh ./ +COPY install-wine-chinese.sh ./ RUN bash -c 'sudo -E supervisord -c /etc/supervisord.conf -l /var/log/supervisord.log &' && \ sleep 5 && \ - sudo chown -R app:app ./install-wine-mono.sh && \ + sudo chown -R app:app ./install-*.sh && \ ./install-wine-mono.sh && \ - sudo rm -rf ./install-wine-mono.sh - -# 处理中文字体 -RUN sudo apt install -y winetricks && winetricks cjkfonts + ./install-wine-chinese.sh && \ + sudo rm -rf ./install-*.sh COPY entrypoint.sh /entrypoint.sh diff --git a/install-wine-chinese.sh b/install-wine-chinese.sh new file mode 100644 index 0000000..2201e36 --- /dev/null +++ b/install-wine-chinese.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo "开始安装中文字体" + +id + +winetricks cjkfonts \ No newline at end of file