Compare commits

...

5 commits

Author SHA1 Message Date
ae82024e94 Merge pull request 'infra/bumpversion' (#208) from infra/bumpversion into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #208
2021-07-24 22:07:26 +00:00
c5b595ad40 Updated some things for infrastructure
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-07-25 00:05:11 +02:00
8bb37bbc21 Updated to upstream
All checks were successful
continuous-integration/drone/push Build is passing
2021-07-24 02:11:17 +02:00
74ca8d8973 Merge branch 'main' into infra/bumpversion 2021-07-24 02:08:39 +02:00
a97c95f762 Bumped version of mongodb 2021-07-24 01:08:17 +02:00
6 changed files with 21 additions and 9 deletions

View file

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

View file

@ -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 .

View file

@ -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

View file

@ -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

View file

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

View file

@ -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