Skip to content

Commit

Permalink
添加中文字体 && 修复 EXIT 参数 (#199)
Browse files Browse the repository at this point in the history
1. 修复 usr/local/bin/start.sh 中 EXIT 无效的问题
2. 将 Dockerfile 中调用的 apt 改为 apt-get
3. 添加中文字体
  • Loading branch information
dhy2000 authored Jan 18, 2023
1 parent 63abcac commit 5b52478
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ RUN if [ "${BUILD_ENV}" = "local" ]; then sed -i s/deb.debian.org/mirrors.aliyun
apt-get install -y --no-install-recommends --no-install-suggests \
libgtk2.0-0 libx11-xcb1 libxtst6 libnss3 libasound2 libdbus-glib-1-2 iptables xclip\
dante-server tigervnc-standalone-server tigervnc-common psmisc flwm x11-utils\
busybox libssl-dev iproute2 tinyproxy-bin
busybox libssl-dev iproute2 tinyproxy-bin \
fonts-wqy-microhei

RUN groupadd -r socks && useradd -r -g socks socks

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.vncless
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ RUN if [ "${BUILD_ENV}" = "local" ]; then sed -i s/deb.debian.org/mirrors.aliyun
apt-get update && \
apt-get install -y --no-install-recommends --no-install-suggests \
libgtk2.0-0 libx11-xcb1 libxtst6 libnss3 libasound2 libdbus-glib-1-2 iptables \
dante-server psmisc libxaw7 xclip busybox libssl-dev iproute2 tinyproxy-bin
dante-server psmisc libxaw7 xclip busybox libssl-dev iproute2 tinyproxy-bin \
fonts-wqy-microhei

RUN groupadd -r socks && useradd -r -g socks socks

RUN cd tmp && apt update && apt download x11-utils && dpkg -x x11-utils_*.deb x11-utils &&\
RUN cd tmp && apt-get update && apt-get download x11-utils && dpkg -x x11-utils_*.deb x11-utils &&\
mkdir -p /usr/local/bin && cp x11-utils/usr/bin/xmessage /usr/local/bin && rm -r x11-utils*

ARG EC_URL
Expand Down
2 changes: 1 addition & 1 deletion docker-root/usr/local/bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [ -n "$_EC_CLI" ]; then
exec start-sangfor.sh
fi

[ -n "$EXIT" ] && MAX_RETRY=0
[ -n "$EXIT" ] && export MAX_RETRY=0

# 登录信息持久化处理
## 持久化配置文件夹 感谢 @hexid26 https://github.com/Hagb/docker-easyconnect/issues/21
Expand Down

0 comments on commit 5b52478

Please sign in to comment.