fix: use official ghcr.io/webcodex1/x0-app and x0-db container images

Author: Copilot

README.md

@@ -86,22 +86,23 @@ psql -U postgres -d x0 -f database/03-insert-text.sql
 Copy the `static/` directory so it is served at `/static/github2sf/`:
 
 ```bash
-cp -r static/ /var/www/x0/static/github2sf/
+cp -r static/ /var/www/vhosts/x0/static/github2sf/
 ```
 
 ### 5. Deploy Python backend
 
 Copy the `python/` directory into the x0 Python directory:
 
 ```bash
-cp python/*.py /var/www/x0/python/github2sf/
+cp python/*.py /var/www/vhosts/x0/python/github2sf/
 ```
 
 ### 6. Configure Apache2
 
-Add the WSGI aliases from `docker/apache2.conf` to your Apache virtual host, then reload:
+Copy `docker/apache2.conf` to `/etc/apache2/conf-enabled/github2sf.conf` and reload:
 
 ```bash
+cp docker/apache2.conf /etc/apache2/conf-enabled/github2sf.conf
 apache2ctl graceful
 ```
 
@@ -113,20 +114,26 @@ Navigate to `http://your-server/?appid=github2sf` in your browser.
 
 ## Docker (quick start)
 
+The application uses the official x0 container images:
+
+- **`ghcr.io/webcodex1/x0-app`** — Apache2 + mod_wsgi web application server with the x0 JavaScript framework pre-installed ([packages page](https://github.com/WEBcodeX1/x0/pkgs/container/x0-app))
+- **`ghcr.io/webcodex1/x0-db`** — PostgreSQL 16 database with the x0 schema pre-installed ([packages page](https://github.com/WEBcodeX1/x0/pkgs/container/x0-db))
+
+The `docker/Dockerfile` extends `ghcr.io/webcodex1/x0-app` and adds the github2stackfield Python backend dependencies on top.
+
 ```bash
 cd docker
 docker compose up --build
 ```
 
 Then open [http://localhost:8080/?appid=github2sf](http://localhost:8080/?appid=github2sf).
 
-> **Note:** The Docker image fetches x0 and python-micro-esb from GitHub at build time.  
-> You still need to run the database SQL scripts against the PostgreSQL container:
+> **Database setup:** After the containers are running, execute the SQL scripts against the x0-db container:
 >
 > ```bash
-> docker exec -i github2sf-db psql -U postgres -d x0 < database/01-create-schema.sql
-> docker exec -i github2sf-db psql -U postgres -d x0 < database/02-insert-config.sql
-> docker exec -i github2sf-db psql -U postgres -d x0 < database/03-insert-text.sql
+> docker exec -i github2sf-db psql -U postgres -d x0 -f /dev/stdin < database/01-create-schema.sql
+> docker exec -i github2sf-db psql -U postgres -d x0 -f /dev/stdin < database/02-insert-config.sql
+> docker exec -i github2sf-db psql -U postgres -d x0 -f /dev/stdin < database/03-insert-text.sql
 > ```
 
 ---

docker/Dockerfile

@@ -1,31 +1,13 @@
-FROM python:3.12-slim
+FROM ghcr.io/webcodex1/x0-app
 
-RUN apt-get update && apt-get install -y \
-    apache2 \
-    libapache2-mod-wsgi-py3 \
+# Install github2stackfield Python backend dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    python3-pip \
     git \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Python dependencies
-RUN pip install --no-cache-dir \
+RUN pip3 install --no-cache-dir --break-system-packages \
     requests \
     psycopg2-binary \
-    pgdbpool
-
-# Install python-micro-esb from source
-RUN pip install --no-cache-dir \
+    pgdbpool \
     git+https://github.com/clauspruefer/python-micro-esb.git
-
-# Install x0 framework Python modules
-RUN pip install --no-cache-dir \
-    git+https://github.com/WEBcodeX1/x0.git
-
-WORKDIR /var/www/x0
-
-# Apache configuration
-COPY docker/apache2.conf /etc/apache2/sites-available/github2sf.conf
-RUN a2ensite github2sf && a2dissite 000-default && a2enmod wsgi
-
-EXPOSE 80
-
-CMD ["apache2ctl", "-D", "FOREGROUND"]

docker/apache2.conf

@@ -1,35 +1,17 @@
-<VirtualHost *:80>
-    ServerName github2sf.local
-    DocumentRoot /var/www/x0/www
+# github2stackfield supplementary Apache configuration
+# Mounted into /etc/apache2/conf-enabled/ inside the x0-app container.
+# The x0-app base image already configures Apache2 + mod_wsgi and sets
+# DocumentRoot /var/www/vhosts/x0 with WSGI handling for the python/ tree.
+# This snippet grants explicit directory access to the app-specific paths.
 
-    # Static assets: x0 framework JS/CSS + app-specific JSON config
-    Alias /static /var/www/x0/www/static
-    Alias /static/github2sf /var/www/x0/static/github2sf
+<Directory /var/www/vhosts/x0/static/github2sf>
+    Options -Indexes
+    Require all granted
+</Directory>
 
-    <Directory /var/www/x0/www/static>
-        Options -Indexes
-        Require all granted
-    </Directory>
-
-    <Directory /var/www/x0/static/github2sf>
-        Options -Indexes
-        Require all granted
-    </Directory>
-
-    # x0 framework index / main entry-point
-    WSGIScriptAlias / /var/www/x0/python/Index.py
-
-    # github2stackfield backend service endpoints
-    WSGIScriptAlias /python/VerifyGitHubCredentials.py    /var/www/x0/python/github2sf/VerifyGitHubCredentials.py
-    WSGIScriptAlias /python/VerifyStackfieldCredentials.py /var/www/x0/python/github2sf/VerifyStackfieldCredentials.py
-    WSGIScriptAlias /python/SearchGitHubIssues.py          /var/www/x0/python/github2sf/SearchGitHubIssues.py
-    WSGIScriptAlias /python/GetGitHubIssueDetails.py       /var/www/x0/python/github2sf/GetGitHubIssueDetails.py
-    WSGIScriptAlias /python/CreateStackfieldTask.py        /var/www/x0/python/github2sf/CreateStackfieldTask.py
-
-    <Directory /var/www/x0/python>
-        Require all granted
-    </Directory>
-
-    ErrorLog ${APACHE_LOG_DIR}/github2sf-error.log
-    CustomLog ${APACHE_LOG_DIR}/github2sf-access.log combined
-</VirtualHost>
+<Directory /var/www/vhosts/x0/python/github2sf>
+    AddHandler wsgi-script .py
+    Options ExecCGI
+    AllowOverride None
+    Require all granted
+</Directory>

docker/docker-compose.yml

@@ -1,25 +1,24 @@
 services:
 
   # ---------------------------------------------------------------------------
-  #  PostgreSQL database (shared with x0 framework)
+  #  x0 database container (PostgreSQL with x0 schema pre-installed)
+  #  Official image: https://github.com/WEBcodeX1/x0/pkgs/container/x0-db
   # ---------------------------------------------------------------------------
-  postgres:
-    image: postgres:16-alpine
+  x0-db:
+    image: ghcr.io/webcodex1/x0-db
     container_name: github2sf-db
     restart: unless-stopped
-    environment:
-      POSTGRES_DB: x0
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: changeme
-    volumes:
-      - pg_data:/var/lib/postgresql/data
     ports:
       - "5432:5432"
     networks:
-      - github2sf-net
+      github2sf-net:
+        ipv4_address: 172.20.0.20
+        aliases:
+          - mypostgres
 
   # ---------------------------------------------------------------------------
-  #  x0 application server (Apache2 + mod_wsgi)
+  #  x0 application server (extends official x0-app with github2sf Python deps)
+  #  Official image: https://github.com/WEBcodeX1/x0/pkgs/container/x0-app
   # ---------------------------------------------------------------------------
   x0-app:
     build:
@@ -28,23 +27,23 @@ services:
     container_name: github2sf-app
     restart: unless-stopped
     depends_on:
-      - postgres
-    environment:
-      DB_HOST: postgres
-      DB_NAME: x0
-      DB_USER: postgres
-      DB_PASSWORD: changeme
+      - x0-db
+    extra_hosts:
+      - "mypostgres:172.20.0.20"
     volumes:
-      - ../static:/var/www/x0/static/github2sf:ro
-      - ../python:/var/www/x0/python/github2sf:ro
+      - ../static:/var/www/vhosts/x0/static/github2sf:ro
+      - ../python:/var/www/vhosts/x0/python/github2sf:ro
+      - ../docker/apache2.conf:/etc/apache2/conf-enabled/github2sf.conf:ro
     ports:
       - "8080:80"
     networks:
-      - github2sf-net
-
-volumes:
-  pg_data:
+      github2sf-net:
+        ipv4_address: 172.20.0.10
 
 networks:
   github2sf-net:
     driver: bridge
+    ipam:
+      config:
+        - subnet: 172.20.0.0/24
+          gateway: 172.20.0.1