Merge pull request #522 from DDS-Derek/main

This commit is contained in:
jxxghp 2023-09-09 14:57:02 +08:00 committed by GitHub
commit 691beb1186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -311,11 +311,13 @@ class SystemUtils:
# 创建 Docker 客户端 # 创建 Docker 客户端
client = docker.DockerClient(base_url='tcp://127.0.0.1:38379') client = docker.DockerClient(base_url='tcp://127.0.0.1:38379')
# 获取当前容器的 ID # 获取当前容器的 ID
container_hostname = os.environ.get("HOSTNAME") with open('/proc/self/mountinfo', 'r') as f:
if not container_hostname: data = f.read()
return False, "无法获取容器的主机名!" index_resolv_conf = data.find("resolv.conf")
container = client.containers.get(container_hostname) if index_resolv_conf != -1:
container_id = container.id index_second_slash = data.rfind("/", 0, index_resolv_conf)
index_first_slash = data.rfind("/", 0, index_second_slash) + 1
container_id = data[index_first_slash:index_second_slash]
if not container_id: if not container_id:
return False, "获取容器ID失败" return False, "获取容器ID失败"
# 重启当前容器 # 重启当前容器