From 2dba19a77e4b9d5cc12b062c03df43743bfbd02f Mon Sep 17 00:00:00 2001
From: badbl0cks <4161747+badbl0cks@users.noreply.github.com>
Date: Tue, 6 May 2025 23:14:36 -0700
Subject: [PATCH] Small refactor of scripts, Dockerfile, and docker-compose to
 support load balancing, and mutiple replicas. Various fixes related to
 playwright installation in container environment, static file handling, and
 etc.

---
 Dockerfile                                    | 79 ++++++++-----------
 deploy.sh                                     |  5 --
 docker-compose.yml                            | 17 +++-
 docker-compose_prod.yml                       | 26 ++++--
 package-lock.json                             | 21 -----
 package.json                                  |  5 --
 scripts/deploy.sh                             |  5 ++
 scripts/entrypoint.sh                         | 34 ++++----
 scripts/prebuild.sh                           | 12 +++
 scripts/rebuild-and-run.sh                    |  9 +++
 scripts/reset-db_make-migrations_seed-data.sh | 23 +-----
 staticfiles/.gitkeep                          |  0
 12 files changed, 109 insertions(+), 127 deletions(-)
 delete mode 100755 deploy.sh
 delete mode 100644 package-lock.json
 delete mode 100644 package.json
 create mode 100755 scripts/deploy.sh
 create mode 100755 scripts/prebuild.sh
 create mode 100755 scripts/rebuild-and-run.sh
 create mode 100644 staticfiles/.gitkeep

diff --git a/Dockerfile b/Dockerfile
index 2db38aa..5dd6f4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,16 @@
 # syntax=docker/dockerfile:1.9
-FROM python3.13-slim-bookworm AS build
+### Start build prep.
+### This should be a separate build container for better reuse.
+FROM python:3.13-slim-bookworm AS build
 
 # The following does not work in Podman unless you build in Docker
 # compatibility mode: <https://github.com/containers/podman/issues/8477>
 # You can manually prepend every RUN script with `set -ex` too.
 SHELL ["sh", "-exc"]
 
-# Ensure apt-get doesn't open a menu on you.
+# Ensure apt-get doesn't open a menu
 ENV DEBIAN_FRONTEND=noninteractive
 
-### Start build prep.
-### This should be a separate build container for better reuse.
-
-# RUN <<EOT
-# apt-get update -qy
-# apt-get install -qyy \
-#     -o APT::Install-Recommends=false \
-#     -o APT::Install-Suggests=false \
-#     nodejs npm
-# EOT
-
 COPY --from=ghcr.io/astral-sh/uv:0.7.2 /uv /usr/local/bin/uv
 
 # - Silence uv complaining about not being able to use hard links,
@@ -32,8 +23,6 @@ ENV UV_LINK_MODE=copy \
     UV_PYTHON=python3.13 \
     UV_PROJECT_ENVIRONMENT=/app
 
-### End build prep -- this is where your app Dockerfile should start.
-
 # Synchronize DEPENDENCIES without the application itself.
 # This layer is cached until uv.lock or pyproject.toml change, which are
 # only temporarily mounted into the build container since we don't need
@@ -60,7 +49,7 @@ RUN --mount=type=cache,target=/root/.cache \
 #         --no-dev \
 #         --no-editable
 
-
+### End build prep
 ##########################################################################
 
 FROM python:3.13-slim-bookworm
@@ -68,64 +57,58 @@ SHELL ["sh", "-exc"]
 
 ARG ENV_FILE=.env.production
 
-# Optional: add the application virtualenv to search path.
 ENV PATH=/app/bin:$PATH
-ENV PYTHONPATH=/code
-ENV PYTHONUNBUFFERED 1
-ENV HOME /code
+ENV PYTHONPATH=/app
+ENV PYTHONUNBUFFERED=1
+ENV HOME=/code
+ENV DJANGO_SETTINGS_MODULE=django_project.settings
 
-# Don't run your app as root.
+WORKDIR /app
+
+# Don't run app as root
 RUN <<EOT
-groupadd -r app
-useradd -r -d /app -g app -N app
+groupadd -r app -g 10003
+useradd -r -d /app -u 10003 -s /sbin/nologin -g app -N app
 EOT
 
-# Note how the runtime dependencies differ from build-time ones.
-# Notably, there is no uv either!
+# Runtime dependencies
 RUN <<EOT
 apt-get update -qy
 apt-get install -qyy \
     -o APT::Install-Recommends=false \
     -o APT::Install-Suggests=false \
-    nodejs xvfb curl
-
-RUN playwright install-deps && playwright install
-
+    xvfb curl
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 EOT
 
-# COPY docker-entrypoint.sh /
-# ENTRYPOINT ["/docker-entrypoint.sh"]
 # See <https://hynek.me/articles/docker-signals/>.
 STOPSIGNAL SIGINT
 
-# Copy the pre-built `/app` directory to the runtime container
-# and change the ownership to user app and group app in one step.
 COPY --from=build --chown=app:app /app /app
 
+RUN playwright install --with-deps
+
 # If your application is NOT a proper Python package that got
 # pip-installed above, you need to copy your application into
-# the container HERE:
-COPY . /code
-
-USER app
-#WORKDIR /app # If python-packaged
-WORKDIR /code # If not python-packaged
-
-# Strictly optional, but I like it for introspection of what I've built
-# and run a smoke test that the application can, in fact, be imported.
-# RUN <<EOT
-# python -V
-# python -Im site
-# python -Ic 'import the_app'
-# EOT`
+# the container HERE and set the WORKDIR:
+COPY --chown=app:app ./ /code
+WORKDIR /code 
+ENV PYTHONPATH=/code
+# WORKDIR /app # if python-packaged
 
 RUN rm -f .env
 COPY ${ENV_FILE} .env
 
+COPY --chown=app:app --chmod=700 /scripts/entrypoint.sh /entrypoint.sh
+COPY --chown=app:app --chmod=700 /scripts/deploy.sh /deploy.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+USER app
+
 EXPOSE 8000
 
 HEALTHCHECK CMD curl --fail http://localhost:8000/health/ || exit 1
 
-CMD ["granian", "--interface", "wsgi", "django_project.wsgi", "--host", "0.0.0.0", "--port", "8000", "--workers", "4"]
+CMD ["granian", "--interface", "wsgi", "django_project.wsgi", "--host", "0.0.0.0", "--port", "8000", "--workers", "1", "--respawn-failed-workers", "--workers-kill-timeout", "60"]
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index 1169cad..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-uv run manage.py makemigrations --check && uv run manage.py migrate --noinput
-uv run manage.py clear_cache
-uv run manage.py collectstatic -c --no-input
-NODE_ENV=production uv run node ./theme/static_src/node_modules/@tailwindcss/cli/dist/index.mjs -m -i ./theme/static_src/src/styles.css -o ./theme/static/css/dist/styles.css
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index c17f309..9ef12fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,13 @@
 services:
+  loba:
+    image: lucaslorentz/caddy-docker-proxy:2.9
+    ports:
+      - 8000:8000
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - caddy_data:/data
+    depends_on:
+      - web
   web:
     build:
       context: .
@@ -7,8 +16,9 @@ services:
         ENV_FILE: .env.dev
     volumes:
       - .:/code:z
-    ports:
-      - 8000:8000
+    labels:
+      caddy: ":8000"
+      caddy.reverse_proxy: "{{upstreams 8000}}"
     depends_on:
       - db
   db:
@@ -23,4 +33,5 @@ services:
 volumes:
   postgres_data:
     labels:
-      - "db_is_resettable_via_script"
\ No newline at end of file
+      - "db_is_resettable_via_script"
+  caddy_data:
\ No newline at end of file
diff --git a/docker-compose_prod.yml b/docker-compose_prod.yml
index f7723a7..9dc8e53 100644
--- a/docker-compose_prod.yml
+++ b/docker-compose_prod.yml
@@ -1,15 +1,25 @@
 services:
+  loba:
+    image: lucaslorentz/caddy-docker-proxy:2.9
+    ports:
+      - 8000:8000
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - caddy_data:/data
+    depends_on:
+      - web
   web:
     build:
       context: .
       dockerfile: Dockerfile
       args:
-        ENV_FILE: .env.production
-    volumes:
-      - .:/code:z
-    ports:
-      - 8000:8000
-volumes:
-  postgres_data:
+        ENV_FILE: .env.dev
+    deploy:
+      mode: replicated
+      replicas: 4
     labels:
-      - "db_is_resettable_via_script"
\ No newline at end of file
+      caddy: ":8000"
+      caddy.reverse_proxy: "{{upstreams 8000}}"
+
+volumes:
+  caddy_data:
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 81cc685..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "code",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "devDependencies": {
-        "daisyui": "^5.0.0-beta.9"
-      }
-    },
-    "node_modules/daisyui": {
-      "version": "5.0.0-beta.9",
-      "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.0.0-beta.9.tgz",
-      "integrity": "sha512-V+To8o1O8AaxSgdk9QrjXyq/e1AhdW1Z6oUI5iwrOjPs8avM7VQNqoTDCAE5rM0NcMbUfmFgQH8h8guiQ5QPOA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/saadeghi/daisyui?sponsor=1"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
deleted file mode 100644
index ded448a..0000000
--- a/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "devDependencies": {
-    "daisyui": "^5.0.0-beta.9"
-  }
-}
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
new file mode 100755
index 0000000..c5bdf0f
--- /dev/null
+++ b/scripts/deploy.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+django-admin makemigrations --noinput --check && django-admin migrate --noinput
+django-admin clear_cache
+django-admin collectstatic -c --no-input
\ No newline at end of file
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 3d1eab3..77fedd7 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -1,23 +1,21 @@
 #!/bin/bash
-# Make the script exit when a command fails.
-set -e
+set -exc
 
-# Define a cleanup function to handle CTRL-C (SIGINT)
-cleanup() {
-    echo "CTRL-C caught! Shutting down Docker Compose services..."
-    docker compose -f docker-compose_db_only.yml down
-    exit 1
-}
+# check if the startup command has been provided
+if [ "$1" == "" ]; then
+ echo "Startup command not set. Exiting"
+ exit;
+fi
 
-# Set trap to call cleanup() when SIGINT (Ctrl-C) is received.
-trap cleanup SIGINT
+# check if the $DJANGO_SETTINGS_MODULE environment variable has been set
+if [ "$DJANGO_SETTINGS_MODULE" == "" ]; then
+ echo "Environment variable 'DJANGO_SETTINGS_MODULE' not set. Exiting."
+ exit;
+else 
+ export DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE
+fi
 
-# Restart compose services.
-echo "Restarting compose services..."
-docker compose -f docker-compose_db_only.yml down
-docker compose -f docker-compose_db_only.yml up -d
+/deploy.sh
 
-cd theme/static_src
-uv run npm run dev & 
-cd ../../
-uv run python manage.py runserver
\ No newline at end of file
+echo "Enviroment is correct and deploy.sh has been run - executing command: '$@'"
+exec "$@" && exit 0
\ No newline at end of file
diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh
new file mode 100755
index 0000000..555b48d
--- /dev/null
+++ b/scripts/prebuild.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Remove all files in staticfiles except .gitkeep
+if [ -d "staticfiles" ]; then
+    find staticfiles -type f ! -name '.gitkeep' -delete
+    find staticfiles -type d -empty -delete
+fi
+
+# Build the tailwind theme css
+cd theme/static_src
+npm install . && npm run build
+cd ../../
\ No newline at end of file
diff --git a/scripts/rebuild-and-run.sh b/scripts/rebuild-and-run.sh
new file mode 100755
index 0000000..7b0c1f7
--- /dev/null
+++ b/scripts/rebuild-and-run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+docker compose down
+
+# run prebuild tasks
+./scripts/prebuild.sh
+
+# Build the docker image
+docker compose build && docker compose up -d
\ No newline at end of file
diff --git a/scripts/reset-db_make-migrations_seed-data.sh b/scripts/reset-db_make-migrations_seed-data.sh
index 35ca433..c954abd 100755
--- a/scripts/reset-db_make-migrations_seed-data.sh
+++ b/scripts/reset-db_make-migrations_seed-data.sh
@@ -4,31 +4,16 @@ set -e
 
 # Reset the database and migrations.
 echo "Resetting database and migrations... "
-docker compose -f docker-compose_db_only.yml down \
-  && docker compose -f docker-compose_entire_app.yml down \
+docker compose down \
   && docker volume prune -a --filter label=db_is_resettable_via_script \
   && find . -path "*/migrations/00*.py" -delete \
-  && docker compose -f docker-compose_db_only.yml up -d
+  && docker compose up -d
 
 # Wait for the database to be ready.
 echo "Waiting for the database to be ready..."
 sleep 10
 
-echo "Resetting static files..."
-uv run python manage.py collectstatic -c --no-input
-
-echo "Running makemigrations..."
-uv run python manage.py makemigrations
-
-echo "Running migrations..."
-uv run python manage.py migrate
-
 echo "Loading seed data..."
-uv run python manage.py loaddata seed/0*
+docker compose exec -it web env DJANGO_SETTINGS_MODULE=django_project.settings django-admin loaddata /code/seed/0*
 
-echo "Running deploy script..."
-./deploy.sh
-
-docker compose -f docker-compose_db_only.yml down
-
-echo "Done!"
+echo "Done & Started!"
diff --git a/staticfiles/.gitkeep b/staticfiles/.gitkeep
new file mode 100644
index 0000000..e69de29