Skip to content

Commit

Permalink
feat: 优化重启
Browse files Browse the repository at this point in the history
  • Loading branch information
DDSRem committed Sep 8, 2023
1 parent 091df01 commit ae3b73a
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ RUN apt-get update \
busybox \
dumb-init \
jq \
haproxy \
&& \
if [ "$(uname -m)" = "x86_64" ]; \
then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \
Expand Down Expand Up @@ -82,5 +83,5 @@ RUN apt-get update \
/var/lib/apt/lists/* \
/var/tmp/*
EXPOSE 3000
VOLUME ["/config", "/var/run/docker.sock"]
VOLUME [ "/config" ]
ENTRYPOINT [ "/entrypoint" ]
2 changes: 1 addition & 1 deletion app/utils/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def restart() -> Tuple[bool, str]:
"""
try:
# 创建 Docker 客户端
client = docker.from_env()
client = docker.DockerClient(base_url='tcp://127.0.0.1:2375')
# 获取当前容器的 ID
container_id = open("/proc/self/cgroup", "r").read().split("/")[-1]
if not container_id:
Expand Down
4 changes: 4 additions & 0 deletions entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ chown moviepilot:moviepilot /etc/hosts /tmp
gosu moviepilot:moviepilot playwright install chromium
# 启动前端nginx服务
nginx
# 启动haproxy
if [ -f "/var/run/docker.sock" ]; then
haproxy -f /etc/haproxy/haproxy.cfg
fi
# 设置后端服务权限掩码
umask ${UMASK}
# 启动后端服务
Expand Down
52 changes: 52 additions & 0 deletions haproxy.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
global
log stdout format raw daemon info

user root
group root

daemon

pidfile /run/haproxy.pid
maxconn 4000

# Turn on stats unix socket
server-state-file /var/lib/haproxy/server-state

defaults
mode http
log global
option httplog
option dontlognull
option http-server-close
option redispatch
retries 3
timeout http-request 10s
timeout queue 1m
timeout connect 10s
timeout client 10m
timeout server 10m
timeout http-keep-alive 10s
timeout check 10s
maxconn 3000

# Allow seamless reloads
load-server-state-from-file global

# Use provided example error pages
errorfile 400 /etc/haproxy/errors/400.http
errorfile 403 /etc/haproxy/errors/403.http
errorfile 408 /etc/haproxy/errors/408.http
errorfile 500 /etc/haproxy/errors/500.http
errorfile 502 /etc/haproxy/errors/502.http
errorfile 503 /etc/haproxy/errors/503.http
errorfile 504 /etc/haproxy/errors/504.http

backend dockerbackend
server dockersocket /var/run/docker.sock

frontend dockerfrontend
bind :2375
http-request allow
http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) }
http-request deny
default_backend dockerbackend

0 comments on commit ae3b73a

Please sign in to comment.