apunkt/plano
1
0
Fork 0
mirror of https://github.com/katanemo/plano.git synced 2026-04-25 08:46:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix compatibility issues with podman system (#415)

Browse source 
- "dokcer inspect" doesn't return State/Status if container is not running
- "docker remove" is not a command supported by podman
- "docker logs" expect -f to be passed before container name
This commit is contained in:
Adil Hafeez 2025-02-20 16:19:48 -08:00 • committed by GitHub
parent 1bbc5d2233
commit ae6b2bef59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/tools/cli/docker_cli.py
View file

@ -15,7 +15,9 @@ def docker_container_status(container: str) -> str:
)
if result.returncode != 0:
return "not found"
return json.loads(result.stdout)[0]["State"]["Status"]
container_status = json.loads(result.stdout)[0]
return container_status.get("State", {}).get("Status", "")
def docker_stop_container(container: str) -> str:
@ -27,7 +29,7 @@ def docker_stop_container(container: str) -> str:
def docker_remove_container(container: str) -> str:
result = subprocess.run(
["docker", "remove", container], capture_output=True, text=True, check=False
["docker", "rm", container], capture_output=True, text=True, check=False
)
return result.returncode
@ -90,9 +92,10 @@ def stream_gateway_logs(follow):
"""
log.info("Logs from arch gateway service.")
options = ["docker", "logs", ARCHGW_DOCKER_NAME]
options = ["docker", "logs"]
if follow:
options.append("-f")
options.append(ARCHGW_DOCKER_NAME)
try:
# Run `docker-compose logs` to stream logs from the gateway service
subprocess.run(