Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #7082 from JeremieCrinon/fix/show-stopped-containers-api-and-dashboard

Browse Source 
fix: show stopped and failed containers in dashboard and API
This commit is contained in:
FreddleSpl0it 2026-03-03 14:01:03 +01:00 committed by GitHub
commit ce5659f300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/Dockerfiles/dockerapi/main.py
View File

@ -110,12 +110,12 @@ async def get_container(container_id : str):
return Response(content=json.dumps(res, indent=4), media_type="application/json") return Response(content=json.dumps(res, indent=4), media_type="application/json")
@app.get("/containers/json") @app.get("/containers/json")
async def get_containers(): async def get_containers(all: bool = False):
global dockerapi global dockerapi
containers = {} containers = {}
try: try:
for container in (await dockerapi.async_docker_client.containers.list()): for container in (await dockerapi.async_docker_client.containers.list(all=all)):
container_info = await container.show() container_info = await container.show()
containers.update({container_info['Id']: container_info}) containers.update({container_info['Id']: container_info})
return Response(content=json.dumps(containers, indent=4), media_type="application/json") return Response(content=json.dumps(containers, indent=4), media_type="application/json")

2
data/web/inc/functions.docker.inc.php
View File

@ -63,7 +63,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex
break; break;
case 'info': case 'info':
if (empty($service_name)) { if (empty($service_name)) {
curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/json'); curl_setopt($curl, CURLOPT_URL, 'https://dockerapi:443/containers/json?all=true');
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 0); curl_setopt($curl, CURLOPT_POST, 0);
curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT); curl_setopt($curl, CURLOPT_TIMEOUT, $DOCKER_TIMEOUT);

2
docker-compose.yml
View File

@ -597,7 +597,7 @@ services:
- watchdog - watchdog
dockerapi-mailcow: dockerapi-mailcow:
image: ghcr.io/mailcow/dockerapi:2.11 image: ghcr.io/mailcow/dockerapi:2.11a
security_opt: security_opt:
- label=disable - label=disable
restart: always restart: always