feat: whitenoise for statics, compose refactor

.github/workflows/docker-CI.yml

@@ -1,9 +1,9 @@
 name: Docker Buildx CI
 
 on:
-  push:
-    branches:
-      - main
+  # push:
+  #   branches:
+  #     - main
   pull_request:
     branches:
       - main

.github/workflows/docker-ci-cd.yml

@@ -0,0 +1,43 @@
+name: Docker CI/CD (prod)
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PAT }}
+
+      - name: Extract commit hash as tag
+        run: |
+          VERSION=$(git rev-parse --short HEAD)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Build and push image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            haniel56/hanz-web:${{ env.VERSION }}
+            haniel56/hanz-web:latest
+          platforms: linux/amd64,linux/arm64

deployment/compose/docker-compose.yml

@@ -10,12 +10,11 @@ services:
     networks:
       - hanz-nw
     depends_on:
-      - db
       - redis
     environment:
-      - DATABASE_URL=postgres://user:dbpassword@db:5432/hanz-db
       - REDIS_URL=redis://redis:6379/1
       - RUN_MIGRATION=true
+      - COLLECT_STATIC=true
       - UID=${UID:-1000}
       - GID=${GID:-1000}
     env_file:
@@ -24,26 +23,26 @@ services:
       "granian --interface wsgi hanz.wsgi:application \
        --host 0.0.0.0 --port 8000 --workers 3 --log-level info"
 
-  static_build:
-    build:
-      context: ../../
-      dockerfile: Dockerfile
-    container_name: hanz_prod_static_build
-    networks:
-      - hanz-nw
-    depends_on:
-      - db
-      - redis
-    environment:
-      - DATABASE_URL=postgres://user:dbpassword@db:5432/hanz-db
-      - REDIS_URL=redis://redis:6379/1
-      - COLLECT_STATIC=true
-      - UID=${UID:-1000}
-      - GID=${GID:-1000}
-    env_file:
-      - .env
-    volumes:
-      - ../../static:/app/src/static/
+  # static_build:
+  #   build:
+  #     context: ../../
+  #     dockerfile: Dockerfile
+  #   container_name: hanz_prod_static_build
+  #   networks:
+  #     - hanz-nw
+  #   depends_on:
+  #     - db
+  #     - redis
+  #   environment:
+  #     - DATABASE_URL=postgres://user:dbpassword@db:5432/hanz-db
+  #     - REDIS_URL=redis://redis:6379/1
+  #     - COLLECT_STATIC=true
+  #     - UID=${UID:-1000}
+  #     - GID=${GID:-1000}
+  #   env_file:
+  #     - .env
+  #   volumes:
+  #     - ../../static:/app/src/static/
 
   celery_worker:
     container_name: hanz_celery_worker
@@ -52,7 +51,6 @@ services:
       dockerfile: Dockerfile
     command: celery -A hanz worker -l error
     environment:
-      - DATABASE_URL=postgres://user:dbpassword@db:5432/hanz-db
       - UID=${UID:-1000}
       - GID=${GID:-1000}
     env_file:
@@ -61,7 +59,6 @@ services:
       - hanz-nw
     depends_on:
       - web
-      - db
       - redis
 
   celery_beat:
@@ -71,7 +68,6 @@ services:
       dockerfile: Dockerfile
     command: celery -A hanz beat -l error
     environment:
-      - DATABASE_URL=postgres://user:dbpassword@db:5432/hanz-db
       - UID=${UID:-1000}
       - GID=${GID:-1000}
     env_file:
@@ -80,22 +76,21 @@ services:
       - hanz-nw
     depends_on:
       - web
-      - db
       - redis
 
-  db:
-    image: postgres:15-alpine
-    container_name: hanz_prod_postgres_db
-    restart: unless-stopped
-    networks:
-      - hanz-nw
-    volumes:
-      - /opt/databases/prod/hanz-web/postgresql/db:/var/lib/postgresql/db
-    environment:
-      - POSTGRES_DB=hanz-db
-      - POSTGRES_USER=user
-      - POSTGRES_PASSWORD=dbpassword
-      - PGDATA=/var/lib/postgresql/db
+  # db:
+  #   image: postgres:15-alpine
+  #   container_name: hanz_prod_postgres_db
+  #   restart: unless-stopped
+  #   networks:
+  #     - hanz-nw
+  #   volumes:
+  #     - /opt/databases/prod/hanz-web/postgresql/db:/var/lib/postgresql/db
+  #   environment:
+  #     - POSTGRES_DB=hanz-db
+  #     - POSTGRES_USER=user
+  #     - POSTGRES_PASSWORD=dbpassword
+  #     - PGDATA=/var/lib/postgresql/db
 
   redis:
     image: redis:7-alpine

deployment/nginx/vhost.conf

@@ -64,15 +64,15 @@ server {
         proxy_send_timeout 300;
     }
 
-    location /static {
-        gzip_static on;
-        alias /opt/apps/prod/hanz-web/static/;
-        try_files $uri =404;
-    }
-
-    location /media {
-        alias /opt/apps/prod/hanz-web/media/;
-    }
+    # location /static {
+    #     gzip_static on;
+    #     alias /opt/apps/prod/hanz-web/static/;
+    #     try_files $uri =404;
+    # }
+    #
+    # location /media {
+    #     alias /opt/apps/prod/hanz-web/media/;
+    # }
 
     # Enable Gzip compression
     gzip on;

docker-compose.dev.yml

@@ -1,23 +1,23 @@
 services:
-  nginx:
-    image: nginx:stable
-    container_name: hanz_dev_nginx_server
-    restart: unless-stopped
-    ports:
-      - "8080:80"
-    networks:
-      - hanz-nw
-    volumes:
-      - ./deployment/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./deployment/nginx/vhost.dev.conf:/etc/nginx/conf.d/default.conf
-      - ./media:/app/media
-      - ./static:/app/static
+  # nginx:
+  #   image: nginx:stable
+  #   container_name: hanz_dev_nginx_server
+  #   restart: unless-stopped
+  #   ports:
+  #     - "8080:80"
+  #   networks:
+  #     - hanz-nw
+  #   volumes:
+  #     - ./deployment/nginx/nginx.conf:/etc/nginx/nginx.conf
+  #     - ./deployment/nginx/vhost.dev.conf:/etc/nginx/conf.d/default.conf
+  #     - ./media:/app/media
+  #     - ./static:/app/static
 
   web:
     build:
       context: .
       dockerfile: dev.Dockerfile
-    container_name: hanz_app_dev
+    container_name: hanz_web_dev
     command: "python manage.py runserver 0.0.0.0:8000"
     restart: unless-stopped
     volumes:

hanz/settings/base.py

@@ -74,6 +74,7 @@
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     "wagtailcache.cache.FetchFromCacheMiddleware",  # wagtail cache
 ]

pyproject.toml

@@ -26,6 +26,7 @@ wagtail-storages = "<2,>=1.1"
 celery = "^5.4.0"
 django-celery-beat = "^2.6.0"
 django-plausible = "^0.5.0"
+whitenoise = "^6.7.0"
 
 
 [tool.poetry.group.dev.dependencies]