Merge pull request 'infra/bumpversion' (#208) from infra/bumpversion into main

Reviewed-on: #208

backend/Dockerfile

@@ -4,6 +4,8 @@ WORKDIR /app
 
 COPY requirements.txt .
 
+RUN apk install sqlite3
+
 RUN pip install -r requirements.txt
 
 COPY /src .

backend/Dockerfile.prod

@@ -6,6 +6,8 @@ RUN apt-get -y update && apt-get -y upgrade
 
 COPY requirements.txt .
 
+RUN apk install sqlite3
+
 RUN pip install -r requirements.txt
 
 COPY /src .

docker-compose.prod.yml

@@ -8,6 +8,8 @@ services:
   backend-prod:
     image: caminsha/bt-backend
     container_name: backend-prod
+    volumes:
+      - "./database.db:/app/database.db:z"
     environment:
       DEBUG: "no"
       PORT: 5050
@@ -20,6 +22,6 @@ services:
     environment:
       - MONGO_URI=mongodb://mongodb:27017/behametrics
   mongodb:
-    image: mongo:4.0.1
+    image: mongo:4.0.25
     container_name: "behametrics-mongo"
     command: mongod --smallfiles

docker-compose.yml

@@ -35,6 +35,6 @@ services:
     environment:
       - MONGO_URI=mongodb://mongodb:27017/behametrics
   mongodb:
-    image: mongo:4.0.1
+    image: mongo:4.0.25
     container_name: "behametrics-mongo"
     command: mongod --smallfiles

frontend/src/components/pages/Study.jsx

@@ -110,11 +110,9 @@ export default function Study() {
     setState(STATES.NORMAL);
     handleLoggerOn();
     // map username and session with the logs
-    _logger.current.logCustomEvent(
-      {
+    _logger.current.logCustomEvent({
       name: serverUsername,
-      },
-    );
+    });
   };
 
   const resetInputValues = () => {

requests.sh

@@ -2,7 +2,7 @@
 
 ACTION=$1
 VALUE=$2
-ACTIONS=(login register rcvpw username data csv)
+ACTIONS=(login register rcvpw username data csv prod_data prod_csv)
 
 print_help(){
     echo "Usage: $0 ACTION [TOKEN|INPUT_TYPE]"
@@ -41,9 +41,17 @@ case $ACTION in
         curl localhost:5000/data
         ;;
     "${ACTIONS[5]}") # get all data from behametricsserver
-        echo "get data action"
+        echo "get csv from input action"
         curl localhost:5000/data/csv/"${VALUE}"
         ;;
+    "${ACTIONS[6]}") # get all data from behametricsserver
+        echo "get prod data action"
+        curl behavior.marcocamenzind.ch:5000/data
+        ;;
+    "${ACTIONS[7]}") # get all data from behametricsserver
+        echo "get prod csv from input action"
+        curl behavior.marcocamenzind.ch:5000/data/csv/"${VALUE}"
+        ;;
     *)
         echo "Error: Action not available"
         echo