MVPilgrim commited on
Commit
b29ccb2
·
1 Parent(s): 5a8c002
Files changed (3) hide show
  1. Dockerfile +6 -6
  2. app.py +3 -1
  3. startup.sh +5 -4
Dockerfile CHANGED
@@ -79,10 +79,10 @@ WORKDIR /app
79
  #CMD ["/app/startupDbgUI.sh"]
80
  EXPOSE 8501
81
  #CMD /app/startup.sh; /usr/local/bin/streamlit run semsearch.py --server.port=8501 --server.address=0.0.0.0
82
- #CMD streamlit run /app/app.py \
83
- # --server.headless true \
84
- # --server.enableCORS false \
85
- # --server.enableXsrfProtection false \
86
- # --server.fileWatcherType none
87
 
88
- cmd /app/startup.sh
 
79
  #CMD ["/app/startupDbgUI.sh"]
80
  EXPOSE 8501
81
  #CMD /app/startup.sh; /usr/local/bin/streamlit run semsearch.py --server.port=8501 --server.address=0.0.0.0
82
+ CMD streamlit run /app/app.py \
83
+ --server.headless true \
84
+ --server.enableCORS false \
85
+ --server.enableXsrfProtection false \
86
+ --server.fileWatcherType none
87
 
88
+ #cmd /app/startup.sh
app.py CHANGED
@@ -19,6 +19,7 @@ from llama_cpp import Llama
19
 
20
  import streamlit as st
21
  import subprocess
 
22
 
23
 
24
  try:
@@ -38,10 +39,11 @@ try:
38
  logger.info("### Running startup.sh")
39
  result = ""
40
  try:
41
- result = subprocess.run("bash startup.sh 2>&1 /app/startup.log ",shell=True,capture_output=True,text=True,timeout=300)
42
  logger.info(f"startup.sh stdout: {result.stdout}")
43
  logger.info(f"startup.sh stderr: {result.stderr}")
44
  logger.info(f"Return code: {result.returncode}")
 
45
  except Exception as e:
46
  emsg = str(e)
47
  logger.error(f"subprocess.run EXCEPTION. e: {emsg}")
 
19
 
20
  import streamlit as st
21
  import subprocess
22
+ import time
23
 
24
 
25
  try:
 
39
  logger.info("### Running startup.sh")
40
  result = ""
41
  try:
42
+ result = subprocess.run("bash startup.sh 2>&1 /app/startup.log &",shell=True,capture_output=True,text=True,timeout=300)
43
  logger.info(f"startup.sh stdout: {result.stdout}")
44
  logger.info(f"startup.sh stderr: {result.stderr}")
45
  logger.info(f"Return code: {result.returncode}")
46
+ time.sleep(180)
47
  except Exception as e:
48
  emsg = str(e)
49
  logger.error(f"subprocess.run EXCEPTION. e: {emsg}")
startup.sh CHANGED
@@ -62,9 +62,9 @@ export AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=true \
62
 
63
  echo "### ps -ef"; ps -ef
64
 
65
- echo "#### Before sleep."
66
- sleep 120
67
- echo "#### startup.sh exiting."
68
 
69
  #echo "#### Before /app/semsearch.py"
70
  #python /app/semsearch.py & #2>& 1 | tee /data/var/lib/weaviate/ss.log &
@@ -73,6 +73,7 @@ echo "#### startup.sh exiting."
73
  # Display timestamps.
74
  #for (( ; ; )) do date; sleep 60; done &
75
 
76
- #wait
 
77
 
78
 
 
62
 
63
  echo "### ps -ef"; ps -ef
64
 
65
+ #echo "#### Before sleep."
66
+ #sleep 120
67
+ #echo "#### startup.sh exiting."
68
 
69
  #echo "#### Before /app/semsearch.py"
70
  #python /app/semsearch.py & #2>& 1 | tee /data/var/lib/weaviate/ss.log &
 
73
  # Display timestamps.
74
  #for (( ; ; )) do date; sleep 60; done &
75
 
76
+ echo "### Before wait."
77
+ wait
78
 
79