Scripts to interact with aws

Author: yolo h8cker 93

docker/aws/AWSCodeClash.Dockerfile

@@ -7,10 +7,15 @@ RUN apt update && apt install -y \
     git \
     curl \
     unzip \
+    iptables \
+    ca-certificates \
+    gnupg \
+    lsb-release \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Docker
-RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
+# Install Docker with proper setup for Docker-in-Docker
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh \
+    && usermod -aG docker root
 
 # Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
@@ -26,14 +31,22 @@ ARG GITHUB_TOKEN
 RUN git clone https://klieret:${GITHUB_TOKEN}@github.com/emagedoc/CodeClash.git . \
     && python3 -m venv .venv \
     && . .venv/bin/activate \
-    && pip install -e .
+    && pip install -e '.[dev]'
 
 # Set ulimit for open files
 RUN echo "* soft nofile 65536" >> /etc/security/limits.conf \
     && echo "* hard nofile 65536" >> /etc/security/limits.conf
 
+# Create Docker directory and set permissions
+RUN mkdir -p /var/lib/docker && chmod 755 /var/lib/docker
+
+# Set build timestamp as environment variable
+ARG BUILD_TIMESTAMP
+ENV BUILD_TIMESTAMP=${BUILD_TIMESTAMP}
+
 # Entry script
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
+# Note: Container must be run with --privileged flag for Docker-in-Docker
 ENTRYPOINT ["/entrypoint.sh"]

docker/aws/build_and_push_aws.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+set -euo pipefail
+
+# Configuration
+ECR_REGISTRY="039984708918.dkr.ecr.us-east-1.amazonaws.com"
+ECR_REPOSITORY="codeclash"
+IMAGE_TAG="latest"
+REGION="us-east-1"
+DOCKERFILE_PATH="AWSCodeClash.Dockerfile"
+DOCKER_CONTEXT="."
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${GREEN}Starting AWS ECR build and push process...${NC}"
+
+# Check if required tools are installed
+command -v aws >/dev/null 2>&1 || { echo -e "${RED}Error: AWS CLI is required but not installed.${NC}" >&2; exit 1; }
+command -v docker >/dev/null 2>&1 || { echo -e "${RED}Error: Docker is required but not installed.${NC}" >&2; exit 1; }
+
+# Check if GITHUB_TOKEN is set (required for the Dockerfile)
+if [ -z "${GITHUB_TOKEN:-}" ]; then
+    echo -e "${RED}Error: GITHUB_TOKEN environment variable is required for building this container.${NC}"
+    echo "Please set it with: export GITHUB_TOKEN=your_token_here"
+    exit 1
+fi
+
+# Build the Docker image
+echo -e "${YELLOW}Building Docker image...${NC}"
+FULL_IMAGE_NAME="$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+
+# Authenticate with ECR
+echo -e "${YELLOW}Authenticating with AWS ECR...${NC}"
+aws ecr get-login-password --region $REGION | docker login --username AWS --password-stdin $ECR_REGISTRY
+
+docker build \
+    --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" \
+    --build-arg BUILD_TIMESTAMP="$(date -u '+%Y-%m-%d %H:%M:%S UTC')" \
+    --platform linux/amd64 \
+    -f "$DOCKERFILE_PATH" \
+    -t "$FULL_IMAGE_NAME" \
+    "$DOCKER_CONTEXT"
+
+# Push the image to ECR
+echo -e "${YELLOW}Pushing image to ECR...${NC}"
+docker push "$FULL_IMAGE_NAME"
+
+echo -e "${GREEN}Successfully built and pushed image: $FULL_IMAGE_NAME${NC}"
+echo -e "${GREEN}You can now use this image in your AWS services.${NC}"
+echo ""
+echo -e "${YELLOW}IMPORTANT: When running this container on AWS Batch or other services,${NC}"
+echo -e "${YELLOW}make sure to enable privileged mode for Docker-in-Docker functionality.${NC}"
+echo -e "${YELLOW}For AWS Batch, add 'privileged: true' to your job definition.${NC}"

docker/aws/entrypoint.sh

@@ -1,18 +1,54 @@
 #!/bin/bash
-set -e
 
-# Start Docker daemon (if needed)
-dockerd &
-#
-# # Activate venv
+set -euo pipefail
+
+echo "📅 Container built at: $BUILD_TIMESTAMP"
+
+echo "Git pull"
+git pull
+
+# Function to sync logs on exit
+cleanup() {
+    local exit_code=$?
+    echo "Syncing logs to S3..."
+    aws s3 sync logs/ s3://codeclash/logs/ || echo "Warning: Failed to sync logs to S3"
+    exit $exit_code
+}
+
+# Set trap to always sync logs on exit (normal exit, signals, errors)
+trap cleanup EXIT
+
+# Start Docker daemon with proper configuration for AWS Batch
+echo "Starting Docker daemon..."
+# Use vfs storage driver to avoid overlay permission issues
+dockerd --storage-driver=vfs --iptables=false --ip-masq=false --bridge=none &
+
+# Wait for Docker daemon to be ready
+echo "Waiting for Docker daemon to start..."
+for i in {1..30}; do
+    if docker info >/dev/null 2>&1; then
+        echo "Docker daemon is ready!"
+        break
+    fi
+    if [ $i -eq 30 ]; then
+        echo "ERROR: Docker daemon failed to start after 30 seconds"
+        exit 1
+    fi
+    sleep 1
+done
+
+# Smoke test
+docker run hello-world
+
+# Activate venv
 source .venv/bin/activate
-#
-# # Create logs directory and sync from S3
+
+# Create logs directory
 mkdir -p logs
-aws s3 sync s3://codeclash/logs/ logs/
-#
-# # Set ulimit
+# aws s3 sync s3://codeclash/logs/ logs/
+
+# Set ulimit for number of open files, relevant for matrix
 ulimit -n 65536
-#
-# # Execute the command passed to container
+
+# Execute the command passed to container
 exec "$@"