minor configuration updates

Author: Dimitri Korsch

.env.template

@@ -10,3 +10,5 @@ MYSQL_USER=annot8
 MYSQL_PASSWORD=CHANGE_ME
 MYSQL_ROOT_PASSWORD=CHANGE_ME
 MYSQL_HOST=CHANGE_ME
+
+REDIS_HOST=redis

backend/annot8/settings/security.py

@@ -36,6 +36,7 @@
 ]
 
 FRONTEND_PORT = os.environ.get("FRONTEND_PORT", 8080)
+print(f"Used frontend port: {FRONTEND_PORT}")
 
 CORS_ORIGIN_WHITELIST = (
     f'http://localhost:{FRONTEND_PORT}',
@@ -47,6 +48,7 @@
 CSRF_TRUSTED_ORIGINS = (
     'https://api.inf-cv.uni-jena.de',
     'https://annot8.dikorsch.de',
+    'http://localhost:8082',
 )
 
 CORS_ALLOW_HEADERS = list(default_headers) + [

frontend/.env.production

@@ -1,5 +1,4 @@
 BACKEND_URL="https://annot8.dikorsch.de"
-BACKEND_URL="http://127.0.0.1"
-BACKEND_PORT=8000
+BACKEND_PORT=443
 VUE_APP_API_URL="${BACKEND_URL}:${BACKEND_PORT}/annot8/api/v1"
 VUE_APP_MEDIA_URL="${BACKEND_URL}:${BACKEND_PORT}"

scripts/docker/backend.Dockerfile

@@ -21,7 +21,7 @@ WORKDIR /code
 # install dependencies
 COPY ./backend/requirements.txt /code/
 RUN python -m pip install --upgrade pip
-RUN pip install numpy uwsgi
+RUN pip install numpy~=1.23.5 uwsgi
 RUN pip install -r /code/requirements.txt
 RUN rm /code/requirements.txt
 

scripts/docker/frontend.Dockerfile

@@ -6,7 +6,7 @@ ARG GID=root
 # build webui                          #
 ########################################
 
-FROM node:20 as builder
+FROM node:20 AS builder
 
 # copy files
 COPY  ./frontend /code
@@ -25,7 +25,7 @@ RUN npm run build
 # actuall webserver                    #
 ########################################
 
-FROM nginx as annot8_frontend
+FROM nginx AS annot8_frontend
 
 COPY --from=builder /code/dist /usr/share/nginx/html
 USER      ${UID}:${GID}

scripts/screen/backend.sh

@@ -3,4 +3,3 @@
 source ${CONDA_PREFIX:-/data/dima/.miniconda3}/etc/profile.d/conda.sh
 conda activate annot8
 python manage.py $@
-

scripts/screen/rc

@@ -1,14 +1,15 @@
+setenv FRONTEND_PORT 8082
+setenv BACKEND_PORT 8001
 
 chdir backend
-screen -t backend ../scripts/screen/backend.sh runserver 0.0.0.0:8000
+screen -t backend ../scripts/screen/backend.sh runserver 0.0.0.0:${BACKEND_PORT}
 screen -t qcluster ../scripts/screen/backend.sh qcluster
 
 chdir ../frontend
-screen -t frondend npm run serve
+screen -t frondend npm run serve -- --port ${FRONTEND_PORT}
 screen -t redis redis-server
 
 chdir ..
 
 # Statuszeile
 caption always "%{= wk} %-w%{= KW} [%n %t] %{-}%+w %= | @%H | %l | %Y-%m-%d %c "
-