fixed proxyng and moved frontend install and build on entrypoint

backend/Dockerfile

@@ -19,7 +19,7 @@ WORKDIR /code
 RUN git clone https://github.com/parruc/librephotos .
 RUN pip install -r requirements.txt
 RUN python -m spacy download en_core_web_sm
-EXPOSE 80
+EXPOSE 8001
 
 # TODO: prod vs dev requirements using docker-compose args
 # TODO: in dev copiare anche i vscode settings

backend/entrypoint.sh

 #! /bin/bash
 export PYTHONUNBUFFERED=TRUE
-pip install torch==1.7.1+cpu torchvision==0.8.2+cpu faiss-cpu django-picklefield
 
 mkdir -p /logs
 
@@ -17,6 +16,6 @@ echo "Running backend server..."
 python manage.py rqworker default 2>&1 | tee /logs/rqworker.log &
 if [ $(ps -ef | grep -c "myApplication") -eq 1 ]; then echo "true"; fi
 
-[ "$DEBUG" = 1 ] && RELOAD=" --reload" || RELOAD=""
+[ "$DEBUG" = 1 ] && RELOAD="--reload" || RELOAD=""
 
 gunicorn --worker-class=gevent --timeout $WORKER_TIMEOUT $RELOAD --bind backend:8001 --log-level=info ownphotos.wsgi 2>&1 | tee /logs/gunicorn_django.log 

docker-compose.dev.yml

@@ -21,6 +21,8 @@ services:
     build:
       context: .
       dockerfile: frontend/Dockerfile
+    volumes:
+      - ${codedir}/frontend:/usr/src/app
 
   backend:
     tty: true
@@ -34,11 +36,10 @@ services:
       - ${myPhotos}:/data
       - ${proMedia}:/protected_media
       - ${logLocation}:/logs
-      - ${codedir}:/code
+      - ${codedir}/backend:/code
       - ${cachedir}:/root/.cache
 
   pgadmin:
-    container_name: librephotos_pgadmin
     image: dpage/pgadmin4
     environment:
       PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-admin@admin.com}

frontend/Dockerfile

@@ -5,12 +5,10 @@ RUN apt-get update && apt-get install -y curl git xsel
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 RUN npm install -g npm
+RUN npm install -g serve
 ENV CLI_WIDTH 80
 RUN git clone https://github.com/LibrePhotos/librephotos-frontend.git /usr/src/app
-RUN npm ci
-RUN npm install -g serve
-EXPOSE 3000
 
-RUN npm run build
+EXPOSE 3000
 
 RUN ["chmod", "+x", "./run.sh" ]
\ No newline at end of file

frontend/entrypoint.sh

 #!/usr/bin/env bash
 
-#echo "building frontend"
-#npm run build
+echo "building frontend"
+npm install
+npm run build
+
 echo "serving frontend"
 serve build -d -l 3000
 

librephotos.env

@@ -56,7 +56,7 @@ mapApiKey=
 tag=dev
 
 # You can set the database name. Did you know Libre Photos was forked from OwnPhotos?
-dbName=ownphotos
+dbName=librephotos
 
 # Here you can change the user name for the database.
 dbUser=docker

proxy/nginx.conf

@@ -19,7 +19,11 @@ http {
       proxy_pass http://frontend:3000/;
     }
     location /api {
-      proxy_pass http://backend/api;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Host $host;
+      include uwsgi_params;
+      proxy_pass http://backend:8001;
     }
   }
-}
+}
\ No newline at end of file