Northern_Lights/NapCat-Docker
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCat-Docker.git synced 2025-12-19 06:30:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: use normal users & optimize data dir & reduce image layer

Browse Source
This commit is contained in:
initialencounter 2024-08-23 02:45:16 +08:00
parent 3c90613cb0
commit 31ea80c5be
No known key found for this signature in database
GPG Key ID: E29907C04179B4C6
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfile
View File

@ -1,24 +1,19 @@
FROM mlikiowa/napcat-docker:base FROM mlikiowa/napcat-docker:base
WORKDIR /usr/src/app WORKDIR /app
COPY NapCat.Shell.zip entrypoint.sh ./ COPY NapCat.Shell.zip entrypoint.sh /app/
# 设置时区
ENV TZ=Asia/Shanghai
RUN echo "${TZ}" > /etc/timezone \
&& ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
&& apt update \
&& apt install -y tzdata \
&& rm -rf /var/lib/apt/lists/*
# 安装Linux QQ # 安装Linux QQ
RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
curl -o linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_${arch}_01.deb && \ curl -o linuxqq.deb https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240819_${arch}_01.deb && \
dpkg -i --force-depends linuxqq.deb && rm linuxqq.deb && \ dpkg -i --force-depends linuxqq.deb && rm linuxqq.deb && \
chmod +x entrypoint.sh && \ chmod +x entrypoint.sh && \
echo "(async () => {await import('file:///usr/src/app/napcat/napcat.mjs');})();" > /opt/QQ/resources/app/app_launcher/index.js useradd -m napcat && \
VOLUME /usr/src/app/napcat/config echo "(async () => {await import('file:///app/napcat/napcat.mjs');})();" > /opt/QQ/resources/app/app_launcher/index.js
VOLUME /root/.config/QQ
VOLUME /app/napcat/config
VOLUME /app/.config/QQ
ENTRYPOINT ["bash", "entrypoint.sh"] ENTRYPOINT ["bash", "entrypoint.sh"]

13
base/Dockerfile
View File

@ -1,18 +1,19 @@
FROM ubuntu:22.04 FROM ubuntu:22.04
# 设置环境变量 # 设置环境变量
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive \
TZ=Asia/Shanghai
# 安装必要的软件包 # 安装必要的软件包
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libnss3 \ libnss3 \
libnotify4 \ libnotify4 \
libsecret-1-0 \ libsecret-1-0 \
libgbm1 \ libgbm1 \
xvfb \ xvfb \
libasound2 \ libasound2 \
fonts-wqy-zenhei \ fonts-wqy-zenhei \
gnutls-bin \ gnutls-bin \
libglib2.0-dev \ libglib2.0-dev \
libdbus-1-3 \ libdbus-1-3 \
libgtk-3-0 \ libgtk-3-0 \
@ -23,7 +24,11 @@ RUN apt-get update && apt-get install -y \
ffmpeg \ ffmpeg \
unzip \ unzip \
dbus-user-session \ dbus-user-session \
curl && \ curl \
gosu \
tzdata && \
echo "${TZ}" > /etc/timezone && \
ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
apt autoremove -y && \ apt autoremove -y && \
apt clean && \ apt clean && \
rm -rf \ rm -rf \

21
entrypoint.sh
View File

@ -46,6 +46,8 @@ if [ ! -f "$CONFIG_PATH" ]; then
: ${HTTP_HEART_ENABLE:='false'} : ${HTTP_HEART_ENABLE:='false'}
: ${MUSIC_SIGN_URL:=''} : ${MUSIC_SIGN_URL:=''}
: ${HTTP_SECRET:=''} : ${HTTP_SECRET:=''}
: ${NAPCAT_GID:=1001}
: ${NAPCAT_UID:=911}
HTTP_URLS=$(chech_quotes $HTTP_URLS) HTTP_URLS=$(chech_quotes $HTTP_URLS)
WS_URLS=$(chech_quotes $WS_URLS) WS_URLS=$(chech_quotes $WS_URLS)
cat <<EOF > $CONFIG_PATH cat <<EOF > $CONFIG_PATH
@ -82,17 +84,16 @@ cat <<EOF > $CONFIG_PATH
} }
EOF EOF
fi fi
FILE="/tmp/.X1-lock" rm -rf "/tmp/.X1-lock"
if [ -e "$FILE" ]; then usermod -o -u ${NAPCAT_UID} napcat
rm -rf "$FILE" groupmod -o -g ${NAPCAT_GID} napcat
echo "$FILE has been deleted." usermod -g ${NAPCAT_GID} napcat
else chown -R ${NAPCAT_UID}:${NAPCAT_GID} /app
echo "$FILE does not exist."
fi
Xvfb :1 -screen 0 1080x760x16 +extension GLX +render & gosu napcat Xvfb :1 -screen 0 1080x760x16 +extension GLX +render &
sleep 2
export FFMPEG_PATH=/usr/bin/ffmpeg export FFMPEG_PATH=/usr/bin/ffmpeg
export DISPLAY=:1 export DISPLAY=:1
cd ./napcat cd /app/napcat
qq --no-sandbox -q $ACCOUNT gosu napcat /opt/QQ/qq --no-sandbox -q $ACCOUNT