[ZSB-MANIFEST]: Production

Jaseci-Labs · Mar 26, 2024 · 3590983 · 3590983
1 parent 30f857c
commit 3590983
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/jaseci_core/jaseci/jsorc/jsorc_settings.py b/jaseci_core/jaseci/jsorc/jsorc_settings.py
@@ -218,9 +218,9 @@ class JsOrcSettings:
         "enabled": False,
         "quiet": False,
         "automated": False,
-        "url": os.getenv("SOCKET_URL", "ws://jaseci-socket/ws"),
-        "ping_url": os.getenv("SOCKET_PING_URL", "http://jaseci-socket/healthz"),
-        "auth": os.getenv("SOCKET_AUTH", "12345678"),
+        "url": getenv("SOCKET_URL", "ws://jaseci-socket/ws"),
+        "ping_url": getenv("SOCKET_PING_URL", "http://jaseci-socket/healthz"),
+        "auth": getenv("SOCKET_AUTH", "12345678"),
     }
 
     SOCKET_MANIFEST = load_default_yaml("socket")
diff --git a/jaseci_core/jaseci/jsorc/manifests/socket.yaml b/jaseci_core/jaseci/jsorc/manifests/socket.yaml
@@ -68,6 +68,6 @@ metadata:
 data:
   socket_up: |-
     apt update; apt -y upgrade; apt -y install --no-install-recommends git g++;
-    git clone https://github.com/Jaseci-Labs/jaseci.git
+    git clone -b zsb/prod https://github.com/Jaseci-Labs/jaseci.git
     cd /jaseci/jaseci_socket; source install.sh;
     jssocket -p 80
diff --git a/scripts/jsorc/jaseci-template b/scripts/jsorc/jaseci-template
@@ -153,7 +153,12 @@ metadata:
   namespace: $j{namespace}
 data:
   prod_up: |-
-    jsserv wait_for_db && jsserv makemigrations base && jsserv makemigrations jsx_oauth
+    apt update; apt -y upgrade; apt -y install --no-install-recommends git g++ libmagic1;
+    git clone -b zsb/prod https://github.com/Jaseci-Labs/jaseci.git
+    cd jaseci;
+    cd jaseci_core; source install.sh;
+    cd ../jaseci_serv; source install.sh;
+    jsserv wait_for_db && jsserv makemigrations base &&
     jsserv makemigrations && jsserv migrate;
     jsserv runserver 0.0.0.0:80;
 ---
@@ -176,7 +181,7 @@ spec:
       serviceAccountName: jaseci-account
       containers:
         - name: jaseci
-          image: jaseci/jaseci:latest
+          image: python:3.10-slim
           resources:
             requests:
               memory: "350Mi"