Ref(aws): Cleaner & easier to update way with bootstrap script

Author: yolo h8cker 93

aws/setup/entrypoint.sh aws/docker_and_sync.shaws/setup/entrypoint.sh renamed to aws/docker_and_sync.sh

@@ -55,6 +55,7 @@ done
 # Smoke test
 docker run hello-world
 
+# Pull images from ECR so we don't have to build them
 DOCKER_REGISTRY="039984708918.dkr.ecr.us-east-1.amazonaws.com"
 aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $DOCKER_REGISTRY
 
@@ -63,9 +64,6 @@ for game in battlesnake; do
     docker tag $DOCKER_REGISTRY/codeclash/$game codeclash/$game
 done
 
-# Activate venv
-source .venv/bin/activate
-
 # Create logs directory
 mkdir -p logs
 # aws s3 sync s3://codeclash/logs/ logs/

aws/run_job.py

@@ -13,6 +13,8 @@
 
 import argparse
 import json
+import shlex
+import subprocess
 import sys
 import time
 from typing import Any
@@ -24,6 +26,18 @@
 logger = get_logger("launch", emoji="🚀")
 
 
+def get_current_git_branch() -> str:
+    """Get the current git branch name."""
+    try:
+        result = subprocess.run(
+            ["git", "rev-parse", "--abbrev-ref", "HEAD"], capture_output=True, text=True, check=True
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError as e:
+        logger.error(f"Failed to get git branch: {e}")
+        raise
+
+
 class AWSBatchJobLauncher:
     def __init__(self, job_definition_name: str = "codeclash-yolo-test", job_queue: str = "codeclash-test-queue"):
         self.batch_client = boto3.client("batch")
@@ -54,21 +68,26 @@ def submit_job(self, command: list[str], job_name: str | None = None) -> str:
             timestamp = int(time.time())
             job_name = f"codeclash-{cmd_name}-{timestamp}"
 
+        # Get current git branch and prepend it to the command
+        current_branch = get_current_git_branch()
+        full_command = [current_branch] + command
+
         # Get the latest job definition
         job_definition_arn = self.get_latest_job_definition_arn()
 
         response = self.batch_client.submit_job(
             jobName=job_name,
             jobQueue=self.job_queue,
             jobDefinition=job_definition_arn,
-            containerOverrides={"command": command},
+            containerOverrides={"command": full_command},
         )
 
         job_id = response["jobId"]
         logger.info("Job submitted successfully!")
         logger.info(f"Job ID: {job_id}")
         logger.info(f"Job Name: {job_name}")
-        logger.info(f"Command: {' '.join(command)}")
+        logger.info(f"Original Command: {shlex.join(command)}")
+        logger.info(f"Full Command (passed to container entrypoint/bootstrap.sh): {shlex.join(full_command)}")
         logger.info(f"To retrieve logs later, run: python get_job_log.py {job_id}")
 
         return job_id
@@ -132,12 +151,6 @@ def main():
     parser = argparse.ArgumentParser(
         description="Submit jobs to AWS Batch",
         formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Examples:
-  %(prog)s -- main.py configs/test/battlesnake_pvp_test.yaml
-  %(prog)s --job-name my-test -- main.py @battlesnake_pvp_test.yaml --suffix test-run
-  %(prog)s --wait --show-logs -- python -m pytest tests/
-        """,
     )
     parser.add_argument("--job-name", help="Custom job name (auto-generated if not specified)")
     parser.add_argument(

aws/setup/AWSCodeClash.Dockerfile

@@ -48,9 +48,9 @@ RUN mkdir -p /var/lib/docker /var/run/docker \
 ARG BUILD_TIMESTAMP
 ENV BUILD_TIMESTAMP=${BUILD_TIMESTAMP}
 
-# Entry script
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+# Entry script - replace the existing COPY and ENTRYPOINT lines
+COPY bootstrap.sh /bootstrap.sh
+RUN chmod +x /bootstrap.sh
 
 # Note: Container must be run with --privileged flag for Docker-in-Docker
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/bootstrap.sh"]

aws/setup/bootstrap.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -euo pipefail
+
+echo "📅 Container built at: $BUILD_TIMESTAMP"
+echo "🔄 Updating repository..."
+
+# First parameter is the branch name, rest are the command to execute
+BRANCH_NAME="$1"
+shift  # Remove first argument, leaving the rest for exec
+
+echo "🌿 Checking out branch: $BRANCH_NAME"
+git fetch
+git checkout "$BRANCH_NAME"
+git pull origin "$BRANCH_NAME"
+
+source .venv/bin/activate
+
+# Execute the remaining command arguments
+exec "$@"