Merge remote-tracking branch 'upstream/main'

Makefile

@@ -139,9 +139,6 @@ runall:
 ## stopall: stop prem-gateway and prem-box
 stopall:
 	chmod +x ./script/stop_all.sh
-	export PREMD_IMAGE=$(PREMD_IMAGE); \
-	export PREMAPP_IMAGE=$(PREMAPP_IMAGE); \
-	export BASIC_AUTH_CREDENTIALS=$(BASIC_AUTH_CREDENTIALS); \
 	./script/stop_all.sh
 
 #### Go lint ####

README.md

@@ -53,16 +53,10 @@ make up LETSENCRYPT_PROD=true SERVICES=premd,premapp
 
 #### Run prem-gateway with prem-app and prem-daemon:
 ```bash
-make runall PREMD_IMAGE={IMG} PREMAPP_IMAGE={IMG} BASIC_AUTH_CREDENTIALS={CREDENTIALS}
+make runall PREMD_IMAGE={IMG} PREMAPP_IMAGE={IMG}
 ```
 
 #### Stop prem-gateway, prem-app and prem-daemon:
 ```bash
-make stopall PREMD_IMAGE={IMG} PREMAPP_IMAGE={IMG} BASIC_AUTH_CREDENTIALS={CREDENTIALS}
+make stopall PREMD_IMAGE={IMG} PREMAPP_IMAGE={IMG}
 ```
-
-#### To generate proper credentials for basic auth, use bellow command.
-```bash
-echo $(htpasswd -nB {USER}) | sed -e s/\\$/\\$\\$/g
-```
-

docker-compose.yml

@@ -29,7 +29,9 @@ services:
       - prem-gateway
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.dnsd.rule=HeadersRegexp(`X-Host-Override`,`dnsd`) && PathPrefix(`/`)"
+      - "traefik.http.routers.dnsd.rule=PathPrefix(`/dnsd`)"
+      - "traefik.http.middlewares.dnsd-strip-prefix.stripprefix.prefixes=/dnsd"
+      - "traefik.http.routers.dnsd.middlewares=dnsd-strip-prefix"
     depends_on:
       - dnsd-db-pg
       - authd

script/docker-compose-box.yml

@@ -11,9 +11,12 @@ services:
       - PREM_REGISTRY_URL=https://raw.githubusercontent.com/premAI-io/prem-registry/main/manifests.json
       - SENTRY_DSN=https://75592545ad6b472e9ad7c8ff51740b73@o1068608.ingest.sentry.io/4505244431941632
       - PROXY_ENABLED=True
+      - DOCKER_NETWORK=prem-gateway
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.premd.rule=HeadersRegexp(`X-Host-Override`,`premd`) && PathPrefix(`/`)"
+      - "traefik.http.routers.premd.rule=PathPrefix(`/premd`)"
+      - "traefik.http.middlewares.premd-strip-prefix.stripprefix.prefixes=/premd"
+      - "traefik.http.routers.premd.middlewares=premd-strip-prefix"
     ports:
       - "8084:8000"
 

script/run_all.sh

@@ -20,7 +20,22 @@ done
 # Navigate back to the ./script directory to run 'docker-compose'
 cd ./script || { echo "Directory ./script does not exist. Exiting."; exit 1; }
 
+if ! command -v openssl &> /dev/null
+then
+    sudo apt-get update -qq
+    sudo apt-get install -y openssl
+fi
+
+BASIC_AUTH_USER="admin"
+BASIC_AUTH_PASS=$(openssl rand -base64 4)
+HASH=$(openssl passwd -apr1 $BASIC_AUTH_PASS)
+BASIC_AUTH_CREDENTIALS="$BASIC_AUTH_USER:$HASH"
+export BASIC_AUTH_CREDENTIALS
+
 # Run the 'docker-compose' command with environment variables
 export PREMD_IMAGE
 export PREMAPP_IMAGE
 docker-compose -f docker-compose-box.yml up -d --build
+
+echo "Basic auth user: $BASIC_AUTH_USER"
+echo "Basic auth pass: $BASIC_AUTH_PASS"

script/stop_all.sh

@@ -1,9 +1,23 @@
 #!/bin/bash
 
-make down
+# Get all container IDs connected to the 'prem-gateway' network
+CONTAINERS=($(docker ps -aq --filter network=prem-gateway))
 
-cd ./script
+# Check if CONTAINERS is empty (no containers on the network)
+if [ ${#CONTAINERS[@]} -eq 0 ]; then
+    echo "No containers found on the 'prem-gateway' network."
+else
+    # Stop all containers
+    echo "Stopping containers on 'prem-gateway' network..."
+    for CONTAINER in "${CONTAINERS[@]}"; do
+        docker stop "$CONTAINER"
+    done
 
-export PREMD_IMAGE
-export PREMAPP_IMAGE
-docker-compose -f docker-compose-box.yml down -v
+    # Remove all containers and their anonymous volumes
+    echo "Removing containers and cleaning up volumes..."
+    for CONTAINER in "${CONTAINERS[@]}"; do
+        docker rm -v "$CONTAINER"
+    done
+
+    echo "Containers stopped and removed. Volumes cleaned."
+fi