Configure and test Game Server Launch
Connected to hld2m-server successfully. Hardcoded `network_mode='host'` Which isn't viable moving forwards. Current Status: Frontend : Active Servers show Backend: Have configured admin.py utils.py and models.py to grant us the ability to launch a docker image with a command and tested client connection. Server Online status works launch, stop, remove (with force stop) works. Signed-off-by: Pratyush Desai <pratyush.desai@liberta.casa>
This commit is contained in:
parent
5da520bc9d
commit
10592cb2d2
@ -13,8 +13,9 @@ def launch_container(modeladmin, request, queryset):
|
|||||||
for server in queryset:
|
for server in queryset:
|
||||||
container_name = f"{server.game.name}_{server.ip_address}_{server.port}"
|
container_name = f"{server.game.name}_{server.ip_address}_{server.port}"
|
||||||
result = launch_docker_container(
|
result = launch_docker_container(
|
||||||
image=server.docker_image,
|
run_command=server.docker_run_command,
|
||||||
name=container_name,
|
name=container_name,
|
||||||
|
image=server.docker_image,
|
||||||
ports={f"{server.port}/tcp": server.port},
|
ports={f"{server.port}/tcp": server.port},
|
||||||
)
|
)
|
||||||
server.sync_status()
|
server.sync_status()
|
||||||
@ -38,7 +39,11 @@ def remove_container(modeladmin, request, queryset):
|
|||||||
|
|
||||||
@admin.register(Server)
|
@admin.register(Server)
|
||||||
class ServerAdmin(admin.ModelAdmin):
|
class ServerAdmin(admin.ModelAdmin):
|
||||||
list_display = ('game', 'ip_address', 'port', 'status', 'docker_image')
|
list_display = ('game', 'name', 'ip_address', 'port', 'status', 'docker_image', 'docker_run_command', 'command_args')
|
||||||
|
search_fields = ('game__name', 'ip_address', 'port')
|
||||||
|
|
||||||
|
def save_model(self, request, obj, form, change):
|
||||||
|
super().save_model(request, obj, form, change)
|
||||||
|
|
||||||
def get_queryset(self, request):
|
def get_queryset(self, request):
|
||||||
"""Sync status of all servers before rendering the admin list view."""
|
"""Sync status of all servers before rendering the admin list view."""
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 5.1.5 on 2025-01-20 13:21
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("webpanel", "0003_remove_game_description_alter_server_docker_image_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="server",
|
||||||
|
name="name",
|
||||||
|
field=models.CharField(default="hello world", max_length=100),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="server",
|
||||||
|
name="ip_address",
|
||||||
|
field=models.GenericIPAddressField(null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="server",
|
||||||
|
name="port",
|
||||||
|
field=models.PositiveIntegerField(null=True),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 5.1.5 on 2025-01-20 15:21
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("webpanel", "0004_server_name_alter_server_ip_address_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="server",
|
||||||
|
name="command_args",
|
||||||
|
field=models.TextField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="server",
|
||||||
|
name="docker_run_command",
|
||||||
|
field=models.CharField(blank=True, max_length=500, null=True),
|
||||||
|
),
|
||||||
|
]
|
@ -15,9 +15,12 @@ class Server(models.Model):
|
|||||||
]
|
]
|
||||||
|
|
||||||
game = models.ForeignKey(Game, on_delete=models.CASCADE)
|
game = models.ForeignKey(Game, on_delete=models.CASCADE)
|
||||||
ip_address = models.GenericIPAddressField()
|
name = models.CharField(max_length=100)
|
||||||
port = models.PositiveIntegerField()
|
ip_address = models.GenericIPAddressField(null=True)
|
||||||
|
port = models.PositiveIntegerField(null=True)
|
||||||
docker_image = models.CharField(max_length=200, null=True)
|
docker_image = models.CharField(max_length=200, null=True)
|
||||||
|
docker_run_command = models.CharField(max_length=500, blank=True, null=True)
|
||||||
|
command_args = models.TextField(blank=True, null=True)
|
||||||
status = models.CharField(max_length=10, choices=STATUS_CHOICES, default='offline')
|
status = models.CharField(max_length=10, choices=STATUS_CHOICES, default='offline')
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -38,3 +41,16 @@ class Server(models.Model):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.status = "offline" # Fallback in case of unexpected errors
|
self.status = "offline" # Fallback in case of unexpected errors
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
|
def get_docker_run_command(self):
|
||||||
|
"""Returns the docker run command, falling back to default image if not set."""
|
||||||
|
if self.docker_run_command:
|
||||||
|
# If a custom command is provided, use it
|
||||||
|
return self.docker_run_command
|
||||||
|
else:
|
||||||
|
# Otherwise, use the default image with any provided args TODO: Fixes reqd
|
||||||
|
# add ports or remove the else logic.
|
||||||
|
base_command = f"docker run -d {self.image}"
|
||||||
|
if self.command_args:
|
||||||
|
base_command += " " + self.command_args
|
||||||
|
return base_command
|
@ -1,14 +1,15 @@
|
|||||||
import docker
|
import docker
|
||||||
|
|
||||||
def launch_docker_container(image, name, ports=None, environment=None):
|
def launch_docker_container(image, run_command, name, ports):
|
||||||
client = docker.from_env()
|
client = docker.from_env()
|
||||||
try:
|
try:
|
||||||
container = client.containers.run(
|
container = client.containers.run(
|
||||||
image,
|
|
||||||
name=name,
|
name=name,
|
||||||
ports=ports,
|
image=image,
|
||||||
environment=environment,
|
# ports=ports,
|
||||||
detach=True
|
command=run_command,
|
||||||
|
detach=True,
|
||||||
|
network_mode='host'
|
||||||
)
|
)
|
||||||
return f"Container launched successfully: {container.id}"
|
return f"Container launched successfully: {container.id}"
|
||||||
except docker.errors.APIError as e:
|
except docker.errors.APIError as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user