ecr-pull + container reboot/recycle

backend/ng/config.py

@@ -47,3 +47,5 @@
 NOVNC_CONTAINER = "consol/debian-xfce-vnc"
 NOVNC_PORT = 6901
 
+CONTAINER_REGISTRY_USER = ""
+CONTAINER_REGISTRY_PASSWORD = ""

backend/ng/containers/controllers/reboot_containers.py

@@ -0,0 +1,9 @@
+from ..models.ContainerInstance import ContainerInstance
+
+def reboot_containers(challenge_id: int, team_id: int, current_user: int) -> bool:
+    instances = ContainerInstance.get_instance_group(challenge_id, team_id)
+
+    for instance in instances:
+        instance.restart()
+
+    return True

backend/ng/containers/controllers/recycle_containers.py

@@ -0,0 +1,9 @@
+from ..models.ContainerInstance import ContainerInstance
+
+def recycle_containers(challenge_id: int, team_id: int, current_user: int) -> bool:
+    instances = ContainerInstance.get_instance_group(challenge_id, team_id)
+
+    for instance in instances:
+        instance.recycle()
+
+    return True

backend/ng/containers/models/ContainerInstance.py

@@ -173,6 +173,19 @@ def get_service_group(cls, challenge_id: int, team_id: int) -> list[SerializedCo
 
         return [instance.serialize() for instance in instances]
 
+    @classmethod
+    def get_instance_group(cls, challenge_id: int, team_id: int):
+        from ...challenge.models.ContainerBlueprint import ContainerBlueprint
+
+        blueprints = ContainerBlueprint.query.filter_by(challenge_id=challenge_id).all()
+
+        blueprint_ids = [blueprint.id for blueprint in blueprints]
+
+        instances = db.session.scalars(
+            select(cls)
+            .where(cls.blueprint.in_(blueprint_ids), cls.team == team_id)
+        ).all()
+        return instances
 
     @classmethod
     def get_instance_by_id(cls, instance_id: int):

backend/ng/containers/routes/routes.py

@@ -40,3 +40,4 @@ class GetCurrentChallenge(Resource):
     def get(self, current_user):
         current_chall = get_current_connected_challenge(current_user.id)
         return success_response(current_chall)
+

backend/ng/containers/utils/Client.py

@@ -1,9 +1,18 @@
 import docker
-from .. constants import DOCKER_RUNNING
+from ..constants import DOCKER_RUNNING
+from ...config import CONTAINER_REGISTRY_USER, CONTAINER_REGISTRY_PASSWORD
 
 class Client(docker.DockerClient):
     def get_running(self, ctr):
         ctr = self.containers.get(ctr)
         if ctr.status != DOCKER_RUNNING:
             ctr.start()
         return ctr
+
+    def pull_image(self, image):
+        auth = {
+            "username": CONTAINER_REGISTRY_USER,
+            "password": CONTAINER_REGISTRY_PASSWORD,
+        }
+        self.images.pull(image, auth_config=auth)
+

backend/ng/event/routes/user_routes.py

@@ -31,9 +31,11 @@
     get_challenge_progress,
     join_event_controller,
 )
-from ...containers.controllers.start_containers import (
-    start_containers,
-)
+
+from ...containers.controllers.start_containers import start_containers
+from ...containers.controllers.recycle_containers import recycle_containers
+from ...containers.controllers.reboot_containers import reboot_containers
+
 from ...user.models.User import User
 from ...team.models.Team import Team
 from ...team.models.enums import TeamRole
@@ -415,7 +417,48 @@ class EventChallengeStartContainers(Resource):
     @load_event(source = LoaderType.PARAM)
     @load_team_by_user_and_event()
     @check_permissions(PermissionEnum.CAN_PLAY_CHALLENGES, "You do not have permission to play challenges.")
-    def get(self, team: Team, current_user: User, challenge_id: int, event_id: int, event: Event, permissions):
+    def post(self, team: Team, current_user: User, challenge_id: int, event_id: int, event: Event, permissions):
 
         started = start_containers(challenge_id, team.id, current_user)
         return success_response(started)
+
+@events_user_namespace.route("/<int:event_id>/challenge/<int:challenge_id>/containers/restart")
+class EventChallengeRestartContainers(Resource):
+    @events_user_namespace.doc(
+        description="Reboot a challenges containers",
+        params={
+            "event_id": "Event id challenge is in",
+            "challenge_id": "Challenge id to reboot containers for",
+        },
+        responses={
+            200: "Sucess",
+            400: "Bad request",
+        },
+    )
+    @user_endpoint()
+    @load_event(source=LoaderType.PARAM)
+    @load_team_by_user_and_event()
+    def post(self, team: Team, current_user: User, challenge_id: int, event_id: int, event: Event):
+        started = reboot_containers(challenge_id, team.id, current_user)
+        return success_response(started)
+
+@events_user_namespace.route("/<int:event_id>/challenge/<int:challenge_id>/containers/recycle")
+class EventChallengeRecycleContainers(Resource):
+    @events_user_namespace.doc(
+        description="Recycle a challenges containers",
+        params={
+            "event_id": "Event id challenge is in",
+            "challenge_id": "Challenge id to recycle containers for",
+        },
+        responses={
+            200: "Sucess",
+            400: "Bad request",
+        },
+    )
+    @user_endpoint()
+    @load_event(source=LoaderType.PARAM)
+    @load_team_by_user_and_event()
+    def post(self, team: Team, current_user: User, challenge_id: int, event_id: int, event: Event):
+        started = recycle_containers(challenge_id, team.id, current_user)
+        return success_response(started)
+