feature: Add hostname if INSTANCE_ID not set and update README.md

Author: hypolas

README.md

@@ -1,5 +1,8 @@
 # Azure DevOps Docker Agent
 
+**GitHub Repository**: [https://github.com/hypolas/azure-devops-agent](https://github.com/hypolas/azure-devops-agent)
+**Docker Hub Image**: [https://hub.docker.com/r/hypolas/azure-devops-agent](https://hub.docker.com/r/hypolas/azure-devops-agent)
+
 [![Docker](https://img.shields.io/badge/docker-supported-blue.svg)](https://www.docker.com/)
 [![Azure DevOps](https://img.shields.io/badge/azure--devops-agent-blue.svg)](https://azure.microsoft.com/services/devops/)
 [![AWS](https://img.shields.io/badge/aws-secrets--manager-orange.svg)](https://aws.amazon.com/secrets-manager/)
@@ -182,11 +185,12 @@ docker run -d --name azure-agent-3 -e AGENT_NUMBER="3" [other options] azure-age
 
 ### Multi-Agent Deployment Script Example
 
-For a server with 8 vCPUs, following the rule of **2 vCPUs per agent**, you can deploy **4 agents** using this script:
+For a server with 8 vCPUs, following the rule of **2 vCPUs per agent** (this is a subjective recommendation - adjust based on your workload requirements and performance monitoring), you can deploy **4 agents** using this script:
 
 Create a file `deploy-agents.sh`:
 
 ```bash
+
 #!/bin/bash
 # Multi-agent deployment script
 # Rule: 2 vCPUs per agent
@@ -196,7 +200,7 @@ set -e
 
 # Configuration
 TOTAL_VCPUS=$(nproc)
-VCPUS_PER_AGENT=2
+VCPUS_PER_AGENT=2  # Adjust this value based on your workload needs
 MAX_AGENTS=$((TOTAL_VCPUS / VCPUS_PER_AGENT))
 
 echo "Detected $TOTAL_VCPUS vCPUs on this server"
@@ -222,7 +226,7 @@ echo "=========================================="
 
 # Deploy agents in a loop
 for i in $(seq 1 $MAX_AGENTS); do
-    AGENT_NAME="azure-agent-${i}"
+    AGENT_NAME="azure-agent-$i"
 
     echo "Starting agent $i/$MAX_AGENTS: $AGENT_NAME"
 
@@ -240,17 +244,10 @@ for i in $(seq 1 $MAX_AGENTS); do
         -e DEFAULT_CONTAINER_IMAGE="${DEFAULT_CONTAINER_IMAGE:-ubuntu:22.04}" \
         -e DEFAULT_VOLUMES="${DEFAULT_VOLUMES:-/var/run/docker.sock:/var/run/docker.sock,/cache:/cache,/data:/data}" \
         --restart unless-stopped \
-        azure-agent
+        hypolas/azure-devops-agent:latest
 
     echo "✅ Agent $i started: $AGENT_NAME"
 done
-
-echo "=========================================="
-echo "✅ All $MAX_AGENTS agents deployed successfully"
-echo "=========================================="
-
-# Show running agents
-docker ps --filter "name=azure-agent-" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
 ```
 
 **Usage:**
@@ -360,4 +357,17 @@ The image uses IMDSv2 (Instance Metadata Service v2) to securely retrieve AWS in
 
 ---
 
-*Docker image for Azure DevOps agents with AWS Secrets Manager integration - Optimized for modern CI/CD pipelines and DevOps automation.*
+*Docker image for Azure DevOps agents with AWS Secrets Manager integration - Optimized for modern CI/CD pipelines and DevOps automation.*
+
+## Disclaimer
+
+**This software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.**
+
+The developer cannot be held responsible for any problems, data loss, security issues, or any other consequences that may arise from the use of this software. Users are solely responsible for:
+- Proper configuration and deployment
+- Security of credentials and tokens
+- Resource allocation and monitoring
+- Compliance with Azure DevOps and AWS terms of service
+- Any costs incurred from cloud service usage
+
+Use at your own risk.

deploy-agents.sh

@@ -0,0 +1,58 @@
+
+#!/bin/bash
+# Multi-agent deployment script
+# Rule: 2 vCPUs per agent
+# Automatically detects available CPUs
+
+set -e
+
+# Configuration
+TOTAL_VCPUS=$(nproc)
+VCPUS_PER_AGENT=2
+MAX_AGENTS=$((TOTAL_VCPUS / VCPUS_PER_AGENT))
+
+echo "Detected $TOTAL_VCPUS vCPUs on this server"
+echo "Deploying $MAX_AGENTS agents with $VCPUS_PER_AGENT vCPUs each"
+
+# Load environment variables from .env
+if [ -f .env ]; then
+    export $(grep -v '^#' .env | xargs)
+else
+    echo "Error: .env file not found"
+    exit 1
+fi
+
+# Check required variables
+if [ -z "$AZP_URL" ] || [ -z "$AZP_POOL" ] || [ -z "$AZP_AGENT_NAME" ] || [ -z "$INSTALL_FOLDER" ]; then
+    echo "Error: Required variables not set in .env (AZP_URL, AZP_POOL, AZP_AGENT_NAME, INSTALL_FOLDER)"
+    exit 1
+fi
+
+echo "=========================================="
+echo "Deploying $MAX_AGENTS agents (${VCPUS_PER_AGENT} vCPUs each)"
+echo "=========================================="
+
+# Deploy agents in a loop
+for i in $(seq 1 $MAX_AGENTS); do
+    AGENT_NAME="azure-agent-$i"
+
+    echo "Starting agent $i/$MAX_AGENTS: $AGENT_NAME"
+
+    docker run -d \
+        --name "$AGENT_NAME" \
+        -v /var/run/docker.sock:/var/run/docker.sock \
+        -v "${INSTALL_FOLDER}:${INSTALL_FOLDER}" \
+        -e AZP_URL="$AZP_URL" \
+        -e AZP_TOKEN="$AZP_TOKEN" \
+        -e AZP_POOL="$AZP_POOL" \
+        -e AZP_AGENT_NAME="$AZP_AGENT_NAME" \
+        -e AGENT_NUMBER="$i" \
+        -e INSTALL_FOLDER="${INSTALL_FOLDER}" \
+        -e AWS_REGION="$AWS_REGION" \
+        -e DEFAULT_CONTAINER_IMAGE="${DEFAULT_CONTAINER_IMAGE:-ubuntu:22.04}" \
+        -e DEFAULT_VOLUMES="${DEFAULT_VOLUMES:-/var/run/docker.sock:/var/run/docker.sock,/cache:/cache,/data:/data}" \
+        --restart unless-stopped \
+        hypolas/azure-devops-agent:latest
+
+    echo "✅ Agent $i started: $AGENT_NAME"
+done

entrypoint.sh

@@ -85,14 +85,16 @@ if [ -z "$INSTANCE_ID" ]; then
     # Retrieve IMDSv2 token to secure metadata access
     IMDS_TOKEN=$(curl -X PUT "http://169.254.169.254/latest/api/token" \
         -H "X-aws-ec2-metadata-token-ttl-seconds: 21600" \
-        -s 2>/dev/null)
+        -s 2>/dev/null) || true
 
     if [ -n "$IMDS_TOKEN" ]; then
         # Use token to retrieve instance ID
         INSTANCE_ID=$(curl -H "X-aws-ec2-metadata-token: $IMDS_TOKEN" \
-            -s "http://169.254.169.254/latest/meta-data/instance-id" 2>/dev/null)
+            -s "http://169.254.169.254/latest/meta-data/instance-id" 2>/dev/null) || true
     fi
 
+    echo "INSTANCE_ID from IMDSv2: $INSTANCE_ID"
+
     if [ -z "$INSTANCE_ID" ] || [ "$INSTANCE_ID" = "" ]; then
         echo "Warning: Unable to retrieve AWS INSTANCE_ID, using hostname"
         INSTANCE_ID=$(hostname)

scripts/configure-agent.sh

@@ -24,6 +24,9 @@ cp -r "/opt/dl/"* "$INSTALL_FOLDER/$AGENT_NUMBER/"
 # Go to agent directory
 cd "$INSTALL_FOLDER/$AGENT_NUMBER"
 
+./config.sh remove --unattended --auth pat --token "$AZP_TOKEN"
+sleep 5
+
 # Configure the agent
 ./config.sh \
   --unattended \