fixes stuff

Author: frinzekt

.env.production.example

@@ -9,7 +9,7 @@ APP_NAME=DjangoAPI
 API_SECRET_KEY= CHANGE THIS TO A RANDOM STRING
 API_ALLOWED_HOSTS=".localhost 127.0.0.1 [::1]"
 
-POSTGRES_HOST=localhost
+POSTGRES_HOST=db
 POSTGRES_NAME=postgres
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=password

docker-compose.prod.yml

@@ -12,23 +12,28 @@ services:
       retries: 5
 
   server:
-    image: ghcr.io/codersforcauses/robodrone-prod-server:latest
+    build:
+      context: .
+      dockerfile: docker/server/Dockerfile
     container_name: robodrone_server
     restart: unless-stopped
     env_file: ./.env.prod
     ports:
-      - 8000:8000
+      - 8081:8081
     entrypoint: /entrypoint.sh
     volumes:
       - ./opt/accesslogs/:/var/log/accesslogs/
-      - ./opt/static_files:/opt/static_files
+      - ./opt/static_files:/app/static_files
     environment:
       - DJANGO_SETTINGS_MODULE=api.settings
     depends_on:
       - db
 
   client:
-    image: ghcr.io/codersforcauses/robodrone-prod-client:latest
+    # image: ghcr.io/codersforcauses/robodrone-prod-client:latest
+    build:
+      context: .
+      dockerfile: docker/client/Dockerfile
     container_name: robodrone_client
     restart: unless-stopped
     env_file: ./.env.prod

docker/client/Dockerfile

@@ -14,12 +14,12 @@ RUN npm install
 # Copy Application code into a directory called `app`
 COPY ./client /app
 
+RUN npm run build
+
 # ========================================
 # ---- Executed at Container Runtime ----
 # ========================================
 
 # CMD commands get executed at container runtime!
 RUN chmod +x /entrypoint.sh
-CMD ["/entrypoint.sh"]
-
-# TODO: Production 
+CMD ["/entrypoint.sh"]

docker/client/entrypoint.sh

@@ -1,36 +1,7 @@
 #!/bin/bash
 
 echo "${APP_NAME^^} - NextJS CONTAINER STARTING..."
-echo $APP_NAME
 
-# Display Docker Image / CI / Release details
-echo "Image Build Date/Time: " "$(cat /app/build_timestamp.txt)" "UTC"
-
-echo "-----------------------------------------------------------"
-echo "APP_ENV: ${APP_ENV}"
-
-# # ====================================================================================
-# # Debug / Sanity check info
-# # ====================================================================================
-# echo "  "
-# echo "======= Current Dir / Files (Debug) ============================================================================="
-# pwd
-# ls -al
-
-# echo "  "
-# echo "======= Env Vars (Debug) ========================================================================================"
-# if [ "${APP_ENV^^}" != "PRODUCTION" ]; then
-#   # Only print environment vars in non-prod environments to prevent sensitive variables being sent to logging system
-#   printenv
-# fi
-
-# echo "  "
-# echo "======= Linux version (Debug) ==================================================================================="
-# cat /etc/os-release
-
-# echo "  "
-# echo "======= Node Path & Version (Debug) ==========================================================================="
-# node -v
 
 # Check for required env vars, exit as failure if missing these critical env vars.
 if [[ -z "${APP_ENV}" ]]; then
@@ -55,4 +26,6 @@ if [ "${APP_ENV^^}" = "DEVELOPMENT" ]; then
     echo "======= Starting inbuilt nextjs webserver ==================================================================="
     npm run dev
     exit
-fi
+fi
+
+npm run start

docker/nginx/custom.conf

@@ -13,7 +13,7 @@ http {
 
     # upstream to the server container
     upstream backend {
-        server server:8000; #name of container:port exposed
+        server server:8081; #name of container:port exposed
     }
 
         # upstream to the server container
@@ -41,7 +41,7 @@ http {
         }
         # serve django static files
         location /static/ {
-            alias /server/staticfiles/;
+            alias /opt/static_files/;
         }
         # proxy to client
         location / {

docker/server/entrypoint.sh

@@ -33,8 +33,8 @@ if [ "${APP_ENV^^}" = "DEVELOPMENT" ]; then
 
     # Run developments
     printf "\n" && echo "Starting inbuilt django webserver"
-    echo "Running: python manage.py runserver 0.0.0.0:8000"
-    python manage.py runserver 0.0.0.0:8000
+    echo "Running: python manage.py runserver 0.0.0.0:8081"
+    python manage.py runserver 0.0.0.0:8081
     exit
 fi
 
@@ -45,6 +45,6 @@ if [ "${APP_ENV^^}" = "PRODUCTION" ]; then
 
     # Run Gunicorn / Django
     printf "\n" && echo " Running Gunicorn / Django"
-    echo "Running: gunicorn api.wsgi -b 0.0.0.0:8000 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50"
-    gunicorn api.wsgi -b 0.0.0.0:8000 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50
+    echo "Running: gunicorn api.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50"
+    gunicorn api.wsgi -b 0.0.0.0:8081 --workers=6 --keep-alive 20 --log-file=- --log-level debug --access-logfile=/var/log/accesslogs/gunicorn --capture-output --timeout 50
 fi