Onprem release test

docker-compose.yml

@@ -67,8 +67,6 @@ services:
       - reports-net
     env_file:
       - ./.env
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
     volumes:
       - ./logs/reports-acumulator:/logs
     restart: unless-stopped
@@ -81,8 +79,6 @@ services:
       - reports-net
     env_file:
       - ./.env
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
     restart: unless-stopped
 
   # Running on port 3030
@@ -93,6 +89,8 @@ services:
       - reports-net
     env_file:
       - ./.env
+    ports:
+      - 3030:3030
     depends_on:
       - reports_cruncher
     volumes:
@@ -210,7 +208,7 @@ services:
       - ./.env
     command: ["-ca", "/depot/ca.pem",
               "-api", "nanomdm",
-              "-webhook-url", "http://shepherd_mdm:8000/mdm/osx/webhook",
+              "-webhook-url", "${SUBCOM_ADM_URL}/mdm/osx/webhook",
               "-storage", "pgsql",
               "-dsn", $DATABASE_URL,
               "-debug",

setup-debian.sh

@@ -167,9 +167,9 @@ setup_git() {
     sudo git fetch origin main
     if [ "$(git rev-parse HEAD)" != "$(git rev-parse FETCH_HEAD)" ]; then
         # Ignore all local changes(comitted & non-comitted)
-        git reset --hard origin/main
+        sudo git reset --hard origin/main
         # TODO: Change this to main branch
-        git pull origin main --force
+        sudo git pull origin main --force
         echo "Repository updated. Applying updates..."
         # Ensure the scripts are executable after a potential update
         chmod +x "$SCRIPT_PATH"
@@ -238,18 +238,34 @@ setup_env() {
     echo "$BASIC_BEARER_TOKEN" > "$ENV_ALERTMANAGER_SECRET_PATH"
 
     # Update this to rollout new update
-    update_env_variable "WEBZERO_VERSION" "0.4.8" "$ENV_SHEPHERD_PATH"
-    update_env_variable "REPORTS_ACCUMULATOR_VERSION" "0.1.0" "$ENV_SHEPHERD_PATH"
-    update_env_variable "REPORTS_CRUNCHER_VERSION" "0.1.0" "$ENV_SHEPHERD_PATH"
-    update_env_variable "REPORTS_ENGINE_VERSION" "0.2.0" "$ENV_SHEPHERD_PATH"
+    update_env_variable "WEBZERO_VERSION" "0.4.10" "$ENV_SHEPHERD_PATH"
+    update_env_variable "REPORTS_ACCUMULATOR_VERSION" "0.2.0" "$ENV_SHEPHERD_PATH"
+    update_env_variable "REPORTS_CRUNCHER_VERSION" "0.2.0" "$ENV_SHEPHERD_PATH"
+    update_env_variable "REPORTS_ENGINE_VERSION" "0.3.0" "$ENV_SHEPHERD_PATH"
     update_env_variable "TAG" "0.5.1" "$ENV_SHEPHERD_PATH"
-    update_env_variable "ONEAPI_VERSION" "2.1.3" "$ENV_SHEPHERD_PATH"
+    update_env_variable "ONEAPI_VERSION" "2.1.4" "$ENV_SHEPHERD_PATH"
 
     update_env_variable "NANOMDM_SCEP_URL" "http://0.0.0.0:8080" "$ENV_SHEPHERD_PATH"
     update_env_variable "NANOMDM_MDM_URL" "http://0.0.0.0:9001" "$ENV_SHEPHERD_PATH"
 
-    echo "NANODEP_URL=" >> "$ENV_CLIENT_PATH"
-    echo "NANODEP_BASIC_AUTH=" >> "$ENV_CLIENT_PATH" 
+    # accessed by reportsengine
+    update_env_variable "REPORTS_CRUNCHER_API" "http://reports_cruncher:3000" "$ENV_SHEPHERD_PATH"
+    # accessed by dashboard
+    update_env_variable "REPORTS_URL" "http://0.0.0.0:3030" "$ENV_SHEPHERD_PATH"
+
+    # NOTE: Only need to be updated once
+    # ADM required variables
+    # echo "NANODEP_URL=" >> "$ENV_CLIENT_PATH"
+    # echo "NANODEP_BASIC_AUTH=" >> "$ENV_CLIENT_PATH"
+
+    # Reports required variables
+    echo "SENTRY_URL=" >> "$ENV_SHEPHERD_PATH"
+    echo "SENTRY_ENV=" >> "$ENV_SHEPHERD_PATH"
+
+    # OneAPI required variables
+    echo "NTFY_WS_URL=wss://ntfy.sh" >> "$ENV_SHEPHERD_PATH"
+    echo "NTFY_AUTH_TOKEN=tk_9tsigcvm13h4de81w3o19zf30ayxa" >> "$ENV_SHEPHERD_PATH"
+    echo "NTFY_API_URL=https://ntfy.sh" >> "$ENV_SHEPHERD_PATH"
     
     # Caddy file replace
     echo "Generating caddyfile..."