codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback cloudflared

Browse Source
This commit is contained in:
jxxghp 2024-03-17 22:32:15 +08:00
parent c1f04f5631
commit a820341ec7
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -40,11 +40,6 @@ RUN apt-get update -y \
then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \ then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \
fi \ fi \
&& curl https://rclone.org/install.sh | bash \ && curl https://rclone.org/install.sh | bash \
&& mkdir -p --mode=0755 /usr/share/keyrings \
&& curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg \
&& echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bullseye main' | tee /etc/apt/sources.list.d/cloudflared.list \
&& apt-get update -y \
&& apt-get install -y cloudflared \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf \ && rm -rf \
@ -72,8 +67,7 @@ RUN cp -f /app/nginx.conf /etc/nginx/nginx.template.conf \
&& cp -f /app/update /usr/local/bin/mp_update \ && cp -f /app/update /usr/local/bin/mp_update \
&& cp -f /app/entrypoint /entrypoint \ && cp -f /app/entrypoint /entrypoint \
&& chmod +x /entrypoint /usr/local/bin/mp_update \ && chmod +x /entrypoint /usr/local/bin/mp_update \
&& mkdir -p ${HOME} ${HOME}/.cloudflared/ /var/lib/haproxy/server-state \ && mkdir -p ${HOME} /var/lib/haproxy/server-state \
&& cp -f /app/cloudflared.yml ${HOME}/.cloudflared/config.yml \
&& groupadd -r moviepilot -g 911 \ && groupadd -r moviepilot -g 911 \
&& useradd -r moviepilot -g moviepilot -d ${HOME} -s /bin/bash -u 911 \ && useradd -r moviepilot -g moviepilot -d ${HOME} -s /bin/bash -u 911 \
&& python_ver=$(python3 -V | awk '{print $2}') \ && python_ver=$(python3 -V | awk '{print $2}') \

4
entrypoint
View File

@ -28,10 +28,6 @@ nginx
if [ -S "/var/run/docker.sock" ]; then if [ -S "/var/run/docker.sock" ]; then
haproxy -f /app/haproxy.cfg haproxy -f /app/haproxy.cfg
fi fi
# 启动cloudflared
if [ -S "/usr/local/bin/cloudflared" ]; then
cloudflared proxy-dns &
fi
# 设置后端服务权限掩码 # 设置后端服务权限掩码
umask "${UMASK}" umask "${UMASK}"
# 启动后端服务 # 启动后端服务