GibCasa/GameServerSupervisor
3
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sync_status & remove 'docker' references

Browse Source 
sync_status: fixing path to podman.sock
fix several strings and func names with 'docker' in them

Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
This commit is contained in:
Pratyush Desai 2025-02-01 07:02:09 +05:30
parent c944c58f22
commit 81787bee84
Signed by: pratyush
GPG Key ID: DBA5BB7505946FAD
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@
* create venv `python3 -m venv venv`
* activate `source venv/bin/activate`
* `pip install -r requirements.txt`
* will need docker running
* will need podman running
* `python manage.py migrate`
* Create admin user: `python manage.py createsuperuser`
* `python manage.py runserver`

13
webpanel/admin.py
View File

@ -1,6 +1,6 @@
from django.contrib import admin
from .models import Game, Server
from .utils import launch_docker_container, stop_docker_container, remove_docker_container
from .utils import launch_pod_container, stop_pod_container, remove_pod_container
import podman
@admin.register(Game)
@ -9,7 +9,7 @@ class GameAdmin(admin.ModelAdmin):
search_fields = ('name', 'genre')
ordering = ('name',)
@admin.action(description='Launch Docker Container')
@admin.action(description='Launch Container')
def launch_container(modeladmin, request, queryset):
client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
for server in queryset:
@ -17,7 +17,6 @@ def launch_container(modeladmin, request, queryset):
try:
# Ensure the command is passed as a list of strings
command = server.get_docker_run_command().split() if server.docker_run_command else []
container = client.containers.run(
server.docker_image,
detach=True,
@ -31,19 +30,19 @@ def launch_container(modeladmin, request, queryset):
except Exception as e:
modeladmin.message_user(request, f"Failed to launch {server}: {e}", level="error")
@admin.action(description='Stop Docker Container')
@admin.action(description='Stop Container')
def stop_container(modeladmin, request, queryset):
for server in queryset:
container_name = f"{server.game.name}_{server.ip_address}_{server.port}"
result = stop_docker_container(container_name)
result = stop_pod_container(container_name)
server.sync_status()
modeladmin.message_user(request, f"Stop container result for {server}: {result}")
@admin.action(description='Remove Docker Container')
@admin.action(description='Remove Container')
def remove_container(modeladmin, request, queryset):
for server in queryset:
container_name = f"{server.game.name}_{server.ip_address}_{server.port}"
result = remove_docker_container(container_name)
result = remove_pod_container(container_name)
server.sync_status()
modeladmin.message_user(request, f"Remove container result for {server}: {result}")

2
webpanel/models.py
View File

@ -28,7 +28,7 @@ class Server(models.Model):
def sync_status(self):
"""Check the real-time status of the Docker container and update the field."""
client = podman.PodmanClient(base_url="unix:///run/podman/podman.sock")
client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
container_name = f"{self.game.name}_{self.ip_address}_{self.port}"
try:
container = client.containers.get(container_name)

6
webpanel/utils.py
View File

@ -1,6 +1,6 @@
import podman
def launch_docker_container(image, run_command, name, ports):
def launch_pod_container(image, run_command, name, ports):
client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
try:
container = client.containers.create(
@ -18,7 +18,7 @@ def launch_docker_container(image, run_command, name, ports):
except Exception as e:
return f"Error: {e}"
def stop_docker_container(name):
def stop_pod_container(name):
client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
try:
container = client.containers.get(name)
@ -29,7 +29,7 @@ def stop_docker_container(name):
except Exception as e:
return f"Error stopping container {name}: {e}"
def remove_docker_container(name):
def remove_pod_container(name):
client = podman.PodmanClient(base_url="unix:///run/user/1000/podman/podman.sock")
try:
container = client.containers.get(name)