This commit is contained in:
mofeng-git 2024-09-15 11:44:38 +08:00
parent 65d02aaa9d
commit ebcc3ffa45
3 changed files with 4 additions and 5 deletions

View File

@ -83,6 +83,7 @@ ARG TARGETARCH
ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV TZ=Asia/Shanghai
RUN cp /tmp/lib/* /lib/*-linux-*/ \ RUN cp /tmp/lib/* /lib/*-linux-*/ \
&& pip install --no-cache-dir --root-user-action=ignore --disable-pip-version-check /tmp/wheel/*.whl \ && 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 \ && chmod +x /usr/local/bin/ttyd \
&& adduser kvmd --gecos "" --disabled-password \ && adduser kvmd --gecos "" --disabled-password \
&& ln -sf /usr/share/tesseract-ocr/*/tessdata /usr/share/tessdata \ && 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 \ && 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 /etc/kvmd/.docker_flag && touch /run/kvmd/ustreamer.sock
COPY testenv/fakes/vcgencmd /usr/bin/ COPY testenv/fakes/vcgencmd /usr/bin/

View File

@ -12,6 +12,7 @@ echo -e "${GREEN}One-KVM pre-starting...${NC}"
if [ ! -f /etc/kvmd/.init_flag ]; then if [ ! -f /etc/kvmd/.init_flag ]; then
cp -r /etc/kvmd_backup/* /etc/kvmd/ cp -r /etc/kvmd_backup/* /etc/kvmd/
touch /etc/kvmd/.docker_flag
#生成 ssl 证书 和 vnc 证书 #生成 ssl 证书 和 vnc 证书
/usr/share/kvmd/kvmd-gencert --do-the-thing /usr/share/kvmd/kvmd-gencert --do-the-thing

View File

@ -8,9 +8,6 @@ user=root
[rpcinterface:supervisor] [rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[inet_http_server]
port=127.0.0.1:9001
[supervisorctl] [supervisorctl]
serverurl=unix:///tmp/supervisor.sock serverurl=unix:///tmp/supervisor.sock