Removed TYPE variable

Changed 'memory' variable to string

Added init to menus

Author: Dtar380

src/assets/scripts/run.sh

@@ -13,7 +13,7 @@ MAX_RAM=${MAX_HEAP_SIZE:-TOTAL_MEM_MB} # Defaulted to total ram on the container
 # Ascii art to give admins a peek at what happens
 echo "─╤═════════╡ *** MINECRAFT SERVER *** ╞══════════─"
 echo " │"
-echo " ├─ SERVER TYPE: ${TYPE}"
+echo " ├─ SERVER NAME: ${CONTAINER_NAME}"
 echo " ├─ TOTAL RAM: ${TOTAL_MEM_MB}MB"
 echo " ├─ ALLOCATED RAM: -Xmx${MAX_RAM}M -Xms${MIN_RAM}M"
 echo " └─ JAVA ARGS: ${JAVA_ARGS}"

src/assets/templates/.env.j2

@@ -3,7 +3,6 @@ SERVER_JAR={{ env.SERVER_JAR | default('server.jar') }}
 JAVA_ARGS="{{ env.JAVA_ARGS | default('') }}"
 MIN_HEAP_SIZE={{ env.MIN_HEAP_SIZE | default(512) }}
 MAX_HEAP_SIZE={{ env.MAX_HEAP_SIZE | default(2048) }}
-TYPE={{ env.TYPE | default('server') }}
 
 {% if env.HOST_PORTS is defined %}
 {% for name, port in env.HOST_PORTS.items() %}

src/assets/templates/docker-compose.yml.j2

@@ -6,14 +6,13 @@ services:
       dockerfile: Dockerfile
     env_file:
       - {{ svc.env_file }}
-    container_name: {{ svc.name }}
+    container_name: ${CONTAINER_NAME}
     environment:
       - CONTAINER_NAME=${CONTAINER_NAME}
       - SERVER_JAR=${SERVER_JAR}
       - JAVA_ARGS=${JAVA_ARGS}
       - MIN_HEAP_SIZE=${MIN_HEAP_SIZE}
       - MAX_HEAP_SIZE=${MAX_HEAP_SIZE}
-      - TYPE=${TYPE}
     volumes:
       - {{ svc.volume }}
 {% if svc.ports is defined %}

src/assets/templates/template.json

@@ -6,7 +6,7 @@
         "build": {
           "context": "./servers/server/"
         },
-        "env_file": ".env.server",
+        "env_file": "./servers/server/.env",
         "volume": "./servers/server:/server",
         "ports": [
           "${HOST_PORT}:${HOST_PORT}"
@@ -20,11 +20,11 @@
         "resources": {
           "limits": {
             "cpus": 1,
-            "memory": 1
+            "memory": "1g"
           },
           "reservations": {
             "cpus": 1,
-            "memory": 1
+            "memory": "1g"
           }
         }
       }
@@ -40,7 +40,6 @@
       "JAVA_ARGS": "",
       "MIN_HEAP_SIZE": "",
       "MAX_HEAP_SIZE": "",
-      "TYPE": "",
       "HOST_PORTS": {
         "HOST_PORT": 25565
       }

src/cli/builder.py

@@ -13,20 +13,23 @@
 
 class Menus:
 
+    def __init__(
+        self, network: str | None = None, update: bool = False
+    ) -> None:
+        self.network = network
+        self.update = update
+
     # Construct service contents for docker-compose
-    def service(self) -> dict[str, Any]:
+    def service(self, name: str) -> dict[str, Any]:
         return {}
 
-    def __get_name(self) -> str:
-        return ""
-
     def __get_ports(self) -> str:
         return ""
 
     def __expose(self) -> bool:
         return True
 
-    def __resources(self) -> dict[str, int]:
+    def __resources(self) -> dict[str, Any]:
         return {}
 
     # Construct env file contents
@@ -50,15 +53,14 @@ class Builder(CustomGroup):
 
     def __init__(self) -> None:
         super().__init__()
-        self.menus = Menus()
 
     def create(self) -> Command:
 
         help = ""
         options = [Option()]
 
-        def callback() -> None:
-            pass
+        def callback() -> dict[str, Any]:
+            return {}
 
         return Command(
             name=inspect.currentframe().f_code.co_name,  # type: ignore
@@ -72,8 +74,8 @@ def update(self) -> Command:
         help = ""
         options = [Option()]
 
-        def callback() -> None:
-            pass
+        def callback() -> dict[str, Any]:
+            return {}
 
         return Command(
             name=inspect.currentframe().f_code.co_name,  # type: ignore