update generate to be safe to call from anywhere

qpoint-io · May 24, 2024 · 8e05b1e · 8e05b1e
1 parent 6911df0
commit 8e05b1e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/apps/.tools/generate.sh b/apps/.tools/generate.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
 
+# Get the directory of the current script
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+
+# Move to one directory above the script directory
+cd "$SCRIPT_DIR/.."
+
 # Read the templates from files
-DOCKER_COMPOSE_HEADER=$(cat .tools/compose-header.yml)
-QTAP_LOCAL_SERVICE=$(cat .tools/qtap-service.yml)
-SERVICE_TEMPLATE=$(cat .tools/service-template.yml)
+DOCKER_COMPOSE_HEADER=$(cat "$SCRIPT_DIR/compose-header.yml")
+QTAP_LOCAL_SERVICE=$(cat "$SCRIPT_DIR/qtap-service.yml")
+SERVICE_TEMPLATE=$(cat "$SCRIPT_DIR/service-template.yml")
 
 # Initialize the services array and port
 services=()

diff --git a/apps/curl-geoweather/docker-compose.yml b/apps/curl-geoweather/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     depends_on:
       - qtap.local
   qtap.local:
-    image: "qpoint:dev"
+    image: "us-docker.pkg.dev/qpoint-edge/public/qpoint:head"
     environment:
       - TOKEN=${TOKEN}
     command: >

diff --git a/apps/docker-compose.yml b/apps/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     depends_on:
       - qtap.local
   qtap.local:
-    image: "qpoint:dev"
+    image: "us-docker.pkg.dev/qpoint-edge/public/qpoint:head"
     environment:
       - TOKEN=${TOKEN}
     command: >

diff --git a/apps/go-geoweather/docker-compose.yml b/apps/go-geoweather/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     depends_on:
       - qtap.local
   qtap.local:
-    image: "qpoint:dev"
+    image: "us-docker.pkg.dev/qpoint-edge/public/qpoint:head"
     environment:
       - TOKEN=${TOKEN}
     command: >

diff --git a/apps/php-geoweather/docker-compose.yml b/apps/php-geoweather/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     depends_on:
       - qtap.local
   qtap.local:
-    image: "qpoint:dev"
+    image: "us-docker.pkg.dev/qpoint-edge/public/qpoint:head"
     environment:
       - TOKEN=${TOKEN}
     command: >

diff --git a/apps/python-geoweather/docker-compose.yml b/apps/python-geoweather/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     depends_on:
       - qtap.local
   qtap.local:
-    image: "qpoint:dev"
+    image: "us-docker.pkg.dev/qpoint-edge/public/qpoint:head"
     environment:
       - TOKEN=${TOKEN}
     command: >