update readme and compose

README.org

@@ -619,6 +619,18 @@
       : Fprintf.ql > right click > run variant analysis
 
 ** Inspect postgres container
+   From host
+   #+BEGIN_SRC sh 
+     docker volume ls
+     DRIVER    VOLUME NAME
+     local     4d1061ac2749d8e22000a40826a821ff22e43458ebed78dd3421b7c759bd978d
+     local     6611a5f26d9e146c68a8a646bdae01646d1501e4e40424a19490359b666bbbca
+     local     17132cc46232508330946a536b4a0edad643d7accb611f1f5e4b48193253e2a0
+     local     e1e57867c7c0cf9ac508835a1d1800770d578ae6766fc935dda40628ce229ce0
+     local     mrva_pgdata
+   #+END_SRC
+
+   In container
    #+BEGIN_SRC sh 
      # Start an interactive bash shell inside the running Docker container
      docker exec -it mrva-postgres bash
@@ -626,7 +638,7 @@
      # Connect to the DB using psql
      psql -U mrva -d mrvadb
      {
-         # inside repl
+         # inspect using pg repl
 
          \dt
          #             List of relations
@@ -648,11 +660,19 @@
 
          SELECT * FROM job_status;
 
-    
+         SELECT last_value FROM session_id_seq;
+
+         SELECT * FROM session_id_seq;
+
+         # # may fail if there isn't one
+         # SELECT nextval('session_id_seq');
+
+
      }
+     # inspect from shell
      pg_dump -U mrva -d mrvadb --data-only |less
 
-
+     # 
    #+END_SRC
 
 * Update Container Images

bin/ma.send-request

@@ -59,19 +59,19 @@ eof
 
 # Submit the MRVA job with the first query
 cd ~/work-gh/mrva/gh-mrva/
-gh-mrva submit --language cpp --session mirva-session-2473 \
+gh-mrva submit --language cpp --session mirva-session-3482 \
           --list mirva-list                                \
           --query ~/work-gh/mrva/gh-mrva/FlatBuffersFunc.ql
 
 # Check the status of the submitted session
-gh-mrva status --session mirva-session-2473
+gh-mrva status --session mirva-session-3482
 
 # Download SARIF files and databases if there are results.  For the current
 # query / database combination there are zero result hence no downloads
 cd ~/work-gh/mrva/gh-mrva/
-gh-mrva download --session mirva-session-2473   \
+gh-mrva download --session mirva-session-3482   \
         --download-dbs                          \
-        --output-dir mirva-session-2473
+        --output-dir mirva-session-3482
 
 
 #*  Set up QLPack for the next query
@@ -106,22 +106,22 @@ eof
 # Submit a new MRVA job with the second query
 cd ~/work-gh/mrva/gh-mrva/
 gh-mrva submit                                      \
-        --language cpp --session mirva-session-2661 \
+        --language cpp --session mirva-session-2899 \
         --list mirva-list                           \
         --query ~/work-gh/mrva/gh-mrva/Fprintf.ql
 
 
 # Check the status of the second session
-gh-mrva status --session mirva-session-2661
+gh-mrva status --session mirva-session-2899
 
-# Download SARIF files and databases for the second query
+# Download databases and sarif for the second query
 cd ~/work-gh/mrva/gh-mrva/
-gh-mrva download --session mirva-session-2661   \
+gh-mrva download --session mirva-session-2899   \
         --download-dbs                          \
-        --output-dir mirva-session-2661
-ls -l mirva-session-2661
+        --output-dir mirva-session-2899
+ls -l *2899*
 
 # Download only SARIF files
-gh-mrva download --session mirva-session-2661   \
-        --output-dir mirva-session-2661
+gh-mrva download --session mirva-session-2899   \
+        --output-dir mirva-session-2899
 

docker-compose-demo.yml

@@ -117,10 +117,15 @@ services:
             - path: ./.env.container
               required: true
         environment:
-            - MRVA_HEPC_ENDPOINT=http://hepc:8070
-            - MRVA_HEPC_CACHE_DURATION=60
-            - SERVER_HOST=server
-            - SERVER_PORT=8080
+            POSTGRES_USER: mrva
+            POSTGRES_PASSWORD: mrvapg
+            POSTGRES_DB: mrvadb
+            POSTGRES_HOST: postgres
+            POSTGRES_PORT: 5432
+            MRVA_HEPC_ENDPOINT: http://hepc:8070
+            MRVA_HEPC_CACHE_DURATION: "60"
+            SERVER_HOST: server
+            SERVER_PORT: "8080"
         networks:
             - backend