diff --git a/build/Dockerfile b/build/Dockerfile index ce382624..ceaa6495 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -83,6 +83,7 @@ ARG TARGETARCH ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 +ENV TZ=Asia/Shanghai RUN cp /tmp/lib/* /lib/*-linux-*/ \ && pip install --no-cache-dir --root-user-action=ignore --disable-pip-version-check /tmp/wheel/*.whl \ @@ -99,8 +100,8 @@ RUN if [ ${TARGETARCH} = arm ]; then ARCH=armhf; elif [ ${TARGETARCH} = arm64 ]; && chmod +x /usr/local/bin/ttyd \ && adduser kvmd --gecos "" --disabled-password \ && ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \ - && mkdir -p /etc/kvmd/override.d /var/lib/kvmd/msd /var/lib/kvmd/pst/data /opt/vc/bin /run/kvmd /tmp/kvmd-nginx \ - && touch /run/kvmd/ustreamer.sock /etc/kvmd/.docker_flag + && mkdir -p /etc/kvmd_backup/override.d /var/lib/kvmd/msd /var/lib/kvmd/pst/data /opt/vc/bin /run/kvmd /tmp/kvmd-nginx \ + && touch /run/kvmd/ustreamer.sock COPY testenv/fakes/vcgencmd /usr/bin/ diff --git a/build/init.sh b/build/init.sh index 56ae084d..0cb01fc6 100755 --- a/build/init.sh +++ b/build/init.sh @@ -12,6 +12,7 @@ echo -e "${GREEN}One-KVM pre-starting...${NC}" if [ ! -f /etc/kvmd/.init_flag ]; then cp -r /etc/kvmd_backup/* /etc/kvmd/ + touch /etc/kvmd/.docker_flag #生成 ssl 证书 和 vnc 证书 /usr/share/kvmd/kvmd-gencert --do-the-thing diff --git a/configs/kvmd/supervisord.conf b/configs/kvmd/supervisord.conf index 283509ad..1ce0fa43 100644 --- a/configs/kvmd/supervisord.conf +++ b/configs/kvmd/supervisord.conf @@ -8,9 +8,6 @@ user=root [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface -[inet_http_server] -port=127.0.0.1:9001 - [supervisorctl] serverurl=unix:///tmp/supervisor.sock