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

fix: port conflict

Browse Source
This commit is contained in:
DDSRem 2023-09-09 10:44:05 +08:00
parent 933c6d838c
commit 0136d9fe06
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -9,6 +9,7 @@ ENV LANG="C.UTF-8" \
UMASK=000 \ UMASK=000 \
MOVIEPILOT_AUTO_UPDATE=true \ MOVIEPILOT_AUTO_UPDATE=true \
MOVIEPILOT_AUTO_UPDATE_DEV=false \ MOVIEPILOT_AUTO_UPDATE_DEV=false \
PORT=3001 \
NGINX_PORT=3000 \ NGINX_PORT=3000 \
CONFIG_DIR="/config" \ CONFIG_DIR="/config" \
API_TOKEN="moviepilot" \ API_TOKEN="moviepilot" \

2
app/utils/system.py
View File

@ -309,7 +309,7 @@ class SystemUtils:
""" """
try: try:
# 创建 Docker 客户端 # 创建 Docker 客户端
client = docker.DockerClient(base_url='tcp://127.0.0.1:2375') client = docker.DockerClient(base_url='tcp://127.0.0.1:38379')
# 获取当前容器的 ID # 获取当前容器的 ID
container_id = open("/proc/self/cgroup", "r").read().split("/")[-1] container_id = open("/proc/self/cgroup", "r").read().split("/")[-1]
if not container_id: if not container_id:

2
entrypoint
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# 使用 `envsubst` 将模板文件中的 ${NGINX_PORT} 替换为实际的环境变量值 # 使用 `envsubst` 将模板文件中的 ${NGINX_PORT} 替换为实际的环境变量值
envsubst '${NGINX_PORT}' < /etc/nginx/nginx.template.conf > /etc/nginx/nginx.conf envsubst '${NGINX_PORT}${PORT}' < /etc/nginx/nginx.template.conf > /etc/nginx/nginx.conf
# 自动更新 # 自动更新
if [ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]; then if [ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]; then
cd / cd /

2
haproxy.cfg
View File

@ -50,7 +50,7 @@ backend dockerbackend
server dockersocket /var/run/docker.sock server dockersocket /var/run/docker.sock
frontend dockerfrontend frontend dockerfrontend
bind :2375 bind :38379
http-request deny unless METH_GET || { env(POST) -m bool } http-request deny unless METH_GET || { env(POST) -m bool }
http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) } { env(ALLOW_RESTARTS) -m bool } http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers/[a-zA-Z0-9_.-]+/((stop)|(restart)|(kill)) } { env(ALLOW_RESTARTS) -m bool }
http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers } { env(CONTAINERS) -m bool } http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/containers } { env(CONTAINERS) -m bool }

2
nginx.conf
View File

@ -100,7 +100,7 @@ http {
upstream backend_api { upstream backend_api {
# 后端API的地址和端口 # 后端API的地址和端口
server 127.0.0.1:3001; server 127.0.0.1:${PORT};
# 可以添加更多后端服务器作为负载均衡 # 可以添加更多后端服务器作为负载均衡
} }