Update broken challenge

Author: just-luk

chal_types/challenge.py

@@ -10,6 +10,7 @@
 from .utils import WorkDir, get_open_port, logger
 from rich import print
 from rich.status import Status
+from rich.panel import Panel
 
 yaml = ruamel.yaml.YAML()
 
@@ -287,7 +288,7 @@ def create(self):
                 chal_name=self.container_id, chal_run_options=''))
 
         with WorkDir(self.host_dir), Status(f"[cyan] Building Challenge Host", spinner_style="cyan"):
-            subprocess.check_output(['make', 'build'])
+             process = subprocess.Popen(["make", "build"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=True)
         print(f":confetti_ball: Built Challenge Host :confetti_ball:")
 
 
@@ -348,15 +349,12 @@ def build_docker(self, docker_dir):
         with WorkDir(docker_dir), Status(f"[cyan] Building Container for [bold]{self.name}[/bold]", spinner_style="cyan"):
             try:
                 process = subprocess.Popen(["make", "build"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, shell=True)
-                
-                # Read and print standard output line by line
-                for line in process.stdout:
-                    print("Standard Output:", line, end="")
-                
                 # Read and print standard error line by line
+                out = ""
                 for line in process.stderr:
-                    print("Standard Error:", line, end="")
+                    out += line
 
+                print(Panel(out, title="Build Output", border_style="cyan"))
                 # Wait for the command to finish
                 process.wait()
 
@@ -365,9 +363,10 @@ def build_docker(self, docker_dir):
                     print("Command completed successfully.")
                 else:
                     print(f"Command failed with exit code {process.returncode}")
+                print(f":star2: Built Container for [bold]{self.name}[bold] :star2:")
             except Exception as e:
                 print(f"An error occurred: {str(e)}")
-                print(f":star2: Built Container for [bold]{self.name}[bold] :star2:")
+                
 
     def get_value(self, key, required=True):
         if key not in self.config.keys():

chal_types/templates/facebook_django/Dockerfile

@@ -1,7 +1,7 @@
 FROM python:2.7.17-buster as builder
 ADD app /app
 WORKDIR /app
-RUN pip install -r requirements.txt
+RUN pip install --no-build-isolation -r requirements.txt
 RUN echo no | python manage.py syncdb
 RUN python manage.py loaddata fixture.yaml
 
@@ -11,7 +11,7 @@ RUN mkdir /facebook
 WORKDIR /facebook
 
 ADD app/requirements.txt /facebook/requirements.txt
-RUN pip install -r requirements.txt
+RUN pip install --no-build-isolation -r requirements.txt
 
 ADD app/fb /facebook/fb
 ADD app/purepython /facebook/purepython

docs/README.md

@@ -83,7 +83,7 @@ python main.py comp gen -f <relative path of the competition> -r <registry to pu
 
 This command builds all of the Kubernetes files needed to deploy to a prexisting Kubernetes cluster. Upon completion, a graph of the challenges will be generated. The graph will be located at `evidence_graph.png` file in the competition folder.
 
-Note: If you are using an M1 or M2 Macbook, you must put `export DOCKER_DEFAULT_PLATFORM=linux/amd64` in your `~/.zshrc` or `~/.bashrc` file. This is because the docker images must be built for linux/amd64 and not arm64.
+Note: If you are using an M1 or M2 Macbook, you must put `export DOCKER_DEFAULT_PLATFORM=linux/amd64` in your `~/.zshrc` or `~/.bashrc` file. This is because the docker images must be built for linux/amd64 and not arm64. Change this to `export DOCKER_DEFAULT_PLATFORM=linux/arm64` if you are running locally.
 
 ### Build and run a competition locally
 

main.py

@@ -204,7 +204,7 @@ def traverse(tree):
 
 def create_ctfg(comp_folder, reg_url, admin_email, admin_password, local):
     ctfg_folder = join(comp_folder, 'ctfg')
-    template_dir = join('competition_infra', 'ctfg_kube')
+    template_dir = join('competition_infra', 'xctf_kube')
 
     if os.path.exists(ctfg_folder):
         shutil.rmtree(ctfg_folder)