Update setup.sh

setuper/setup.sh

@@ -5,7 +5,7 @@
 
 set +e
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT_DIR="$SCRIPT_DIR/.."
 
 # Read .env for SERVICES_DIR, CONTROLLER_API, SECRET_TOKEN
@@ -70,6 +70,16 @@ NET_INTERFACE=eth0
 PACKMATE_LOCAL_IP=10.60.0.1
 WEB_LOGIN=admin
 WEB_PASSWORD=admin123
+POSTGRES_USER=packmate
+POSTGRES_PASSWORD=K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb
+POSTGRES_DB=packmate
+DB_PASSWORD=K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb
+INTERFACE=eth0
+LOCAL_IP=10.60.0.1
+MODE=LIVE
+OLD_STREAMS_CLEANUP_ENABLED=true
+OLD_STREAMS_CLEANUP_INTERVAL=5
+OLD_STREAMS_CLEANUP_THRESHOLD=240
 ENVEOF
     cat > Packmate_stuff/postgresql.conf <<'PGEOF'
 port = 65001
@@ -86,21 +96,11 @@ SHEOF
 version: '3.8'
 services:
   packmate:
-    environment:
-      DB_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb}
-      INTERFACE: ${NET_INTERFACE:-}
-      LOCAL_IP: ${PACKMATE_LOCAL_IP}
-      MODE: LIVE
-      WEB_LOGIN: ${WEB_LOGIN:-admin}
-      WEB_PASSWORD: ${WEB_PASSWORD:-admin123}
-      OLD_STREAMS_CLEANUP_ENABLED: true
-      OLD_STREAMS_CLEANUP_INTERVAL: 5
-      OLD_STREAMS_CLEANUP_THRESHOLD: 240
     env_file:
       - .env
     container_name: packmate-app
     network_mode: "host"
-    image: registry.gitlab.com/packmate/packmate:${BUILD_TAG:-latest}
+    image: registry.gitlab.com/packmate/packmate:latest
     volumes:
       - "./pcaps/:/app/pcaps/:ro"
       - "./rsa_keys/:/app/rsa_keys/:ro"
@@ -109,10 +109,8 @@ services:
         condition: service_healthy
   db:
     container_name: packmate-db
-    environment:
+    env_file:
-      POSTGRES_USER: packmate
+      - .env
-      POSTGRES_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb}
-      POSTGRES_DB: packmate
     network_mode: "host"
     image: postgres:15.2
     volumes:
@@ -156,6 +154,9 @@ WEB_PASSWORD=farmadmin
 NUM_TEAMS=10
 IP_TEAM_BASE=10.60.
 API_TOKEN=farm-api-token-123
+POSTGRES_USER=farm
+POSTGRES_PASSWORD=farmpassword123
+POSTGRES_DB=farm
 ENVEOF
     cat > docker-compose.yml <<'DCEOF'
 version: '3.8'
@@ -165,18 +166,6 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    environment:
-      - DB_PORT=${DB_PORT}
-      - DB_HOST=${DB_HOST}
-      - DB_USER=${DB_USER}
-      - DB_PASS=${DB_PASS}
-      - DB_NAME=${DB_NAME}
-      - BOARD_URL=${BOARD_URL}
-      - TEAM_TOKEN=${TEAM_TOKEN}
-      - WEB_PASSWORD=${WEB_PASSWORD}
-      - NUM_TEAMS=${NUM_TEAMS}
-      - IP_TEAM_BASE=${IP_TEAM_BASE}
-      - API_TOKEN=${API_TOKEN}
     env_file:
       - .env
     container_name: farm-app
@@ -185,12 +174,10 @@ services:
       - "3333:8000"
   postgres:
     image: postgres:18
-    environment:
+    env_file:
-      - POSTGRES_USER=${DB_USER}
+      - .env
-      - POSTGRES_PASSWORD=${DB_PASS}
-      - POSTGRES_DB=${DB_NAME}
     healthcheck:
-      test: pg_isready -U ${DB_USER} -d ${DB_NAME}
+      test: ["CMD-SHELL", "pg_isready -U farm -d farm"]
       interval: 10s
       timeout: 3s
       retries: 3
@@ -230,13 +217,10 @@ services:
     build: .
     env_file:
       - .env
-    environment:
-      - TEAM_TOKEN=${TEAM_TOKEN}
-      - SCOREBOARD_URL=${SCOREBOARD_URL}
     container_name: firegex-app
     restart: always
     ports:
-      - "${FIREGEX_PORT:-5000}:5000"
+      - "5000:5000"
 DCEOF
     fi
     echo "Starting Firegex containers..."
@@ -286,6 +270,4 @@ main() {
     echo ""
 }
 
-if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
 main
-fi