fix the streamlit app to work on docker-compose + upload new images w…

…ith fixes to docker hub
genia-dev · Apr 8, 2024 · 9eeb841 · 9eeb841
1 parent 7622646
commit 9eeb841
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
@@ -31,7 +31,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: vibranium
+      MYSQL_DATABASE: vibraniumdome
     ports:
       - "3306:3306"
     command: --default-authentication-plugin=mysql_native_password
@@ -59,6 +59,8 @@ services:
       - "8501:8501"
     depends_on:
       - vibraniumdome-app
+    env_file:
+      - ./vibraniumdome-shields/examples/.env.example
 
   vibraniumdome-opensearch-node-1:
     image: opensearchproject/opensearch:2.9.0

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
   vibraniumdome-app:
     container_name: vibraniumdome-app
-    image: vibraniumdome/vibraniumdome-app:0.1.0
+    image: vibraniumdome/vibraniumdome-app:0.3.0
     ports:
       - "3000:3000"
     env_file:
@@ -20,14 +20,14 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
-      MYSQL_DATABASE: vibranium
+      MYSQL_DATABASE: vibraniumdome
     ports:
       - "3306:3306"
     command: --default-authentication-plugin=mysql_native_password
 
   vibraniumdome-shields:
     container_name: vibraniumdome-shields
-    image: vibraniumdome/vibraniumdome-shields:0.1.0
+    image: vibraniumdome/vibraniumdome-shields:0.3.0
     ports:
       - "5001:5001"
     env_file:
@@ -39,11 +39,13 @@ services:
 
   vibraniumdome-streamlit-app:
     container_name: vibraniumdome-streamlit-app
-    image: vibraniumdome/vibraniumdome-streamlit-app:0.1.0
+    image: vibraniumdome/vibraniumdome-streamlit-app:0.3.0
     ports:
       - "8501:8501"
     depends_on:
       - vibraniumdome-app
+    env_file:
+      - ./vibraniumdome-shields/examples/.env.example
 
   vibraniumdome-opensearch-node-1:
     image: opensearchproject/opensearch:2.9.0

diff --git a/vibraniumdome-app/docker-deploy.sh b/vibraniumdome-app/docker-deploy.sh
@@ -12,4 +12,4 @@ docker buildx build --platform linux/amd64,linux/arm64 \
                     --build-arg OPENSEARCH_JWT_HMAC_SIGNING_KEY=${OPENSEARCH_JWT_HMAC_SIGNING_KEY} \
                     --build-arg OPENSEARCH_DASHBOARD_URL=${OPENSEARCH_DASHBOARD_URL} \
                     --build-arg OPENSEARCH_GOVERNANCE_URL=${OPENSEARCH_GOVERNANCE_URL} \
-                    --tag=vibraniumdome/vibraniumdome-app:0.1.0 --push .
+                    --tag=vibraniumdome/vibraniumdome-app:0.3.0 --push .
diff --git a/vibraniumdome-shields/docker-deploy.sh b/vibraniumdome-shields/docker-deploy.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 docker buildx create --use
-docker buildx build --platform linux/amd64,linux/arm64 -t vibraniumdome/vibraniumdome-shields:0.1.0 --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t vibraniumdome/vibraniumdome-shields:0.3.0 --push .
diff --git a/vibraniumdome-shields/docker-entrypoint.sh b/vibraniumdome-shields/docker-entrypoint.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PROMETHEUS_MULTIPROC_DIR=/tmp/ exec $POETRY_HOME/bin/poetry run gunicorn --bind 0.0.0.0:5001 --threads 4 --workers 4 --preload vibraniumdome_shields.main:app -k gthread
+PROMETHEUS_MULTIPROC_DIR=/tmp/ exec $POETRY_HOME/bin/poetry run gunicorn --bind 0.0.0.0:5001 --threads 1 --workers 1 --preload vibraniumdome_shields.main:app -k gthread
diff --git a/vibraniumdome-shields/examples/.env.example b/vibraniumdome-shields/examples/.env.example
@@ -0,0 +1,3 @@
+OPENAI_API_KEY=
+VIBRANIUM_DOME_BASE_URL="http://vibraniumdome-shields:5001"
+VIBRANIUM_DOME_API_KEY="vibranium_elgstr7i53e3vpy0pbc8175fp6eaj4k3fjzd"
diff --git a/vibraniumdome-shields/examples/Dockerfile b/vibraniumdome-shields/examples/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
 
 COPY streamlit_app.py .
 
-RUN pip3 install streamlit streamlit_extras openai vibraniumdome-sdk
+RUN pip3 install streamlit streamlit_extras openai vibraniumdome-sdk termcolor
 
 EXPOSE 8501
 

diff --git a/vibraniumdome-shields/examples/docker-deploy.sh b/vibraniumdome-shields/examples/docker-deploy.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker buildx create --use
+docker buildx build --platform linux/amd64,linux/arm64 -t vibraniumdome/vibraniumdome-streamlit-app:0.3.0 --push .