From 9473b5abb046e71820f320870e720825b2bfb9e8 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Tue, 16 Sep 2025 13:43:00 -0400
Subject: [PATCH] feat: docker-compose, small fixes

---
 Dockerfile                           |  2 +-
 HACKING/.env.template                |  4 +--
 HACKING/docker-compose.yml           | 48 ++++++++++++++++++++++++++++
 HACKING/proxstar-postgres/Dockerfile |  2 +-
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 HACKING/docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index 4dacccb..42eff77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-buster
+FROM python:3.9-trixie
 WORKDIR /opt/proxstar
 RUN apt-get update -y && apt-get install -y python3-dev libldap2-dev libsasl2-dev ldap-utils git
 COPY requirements.txt .
diff --git a/HACKING/.env.template b/HACKING/.env.template
index acb3f68..5dde0bb 100644
--- a/HACKING/.env.template
+++ b/HACKING/.env.template
@@ -48,8 +48,8 @@ PROXSTAR_REDIS_HOST=proxstar-redis
 PROXSTAR_REDIS_PORT=6379
 
 # VNC
-PROXSTAR_WEBSOCKIFY_PATH=/opt/app-root/bin/websockify
-PROXSTAR_WEBSOCKIFY_TARGET_FILE=/opt/app-root/src/targets
+PROXSTAR_WEBSOCKIFY_PATH=/usr/local/bin/websockify
+PROXSTAR_WEBSOCKIFY_TARGET_FILE=/opt/proxstar/targets
 
 # SENTRY
 # If you set the sentry dsn locally, make sure you use the local-dev or some
diff --git a/HACKING/docker-compose.yml b/HACKING/docker-compose.yml
new file mode 100644
index 0000000..0ae4855
--- /dev/null
+++ b/HACKING/docker-compose.yml
@@ -0,0 +1,48 @@
+services:
+  proxstar-redis:
+    image: docker.io/library/redis:alpine
+    networks:
+      - proxstar
+    restart: always
+
+  proxstar-postgres:
+    build:
+      context: ./proxstar-postgres
+    environment:
+      POSTGRES_PASSWORD: changeme
+    volumes:
+      - ./proxstar-postgres/volume:/var/lib/postgresql/data:Z
+    networks:
+      - proxstar
+    restart: always
+
+  proxstar-rq-scheduler:
+    build:
+      context: ..
+    env_file: .env
+    entrypoint: ./start_scheduler.sh
+    networks:
+      - proxstar
+    restart: always
+
+  proxstar-rq:
+    build:
+      context: ..
+    env_file: .env
+    entrypoint: ./start_worker.sh
+    networks:
+      - proxstar
+    restart: always
+
+  proxstar:
+    build:
+      context: ..
+    ports:
+      - "8000:8000"
+      - "8001:8001"
+    env_file: .env
+    entrypoint: ["gunicorn", "proxstar:app", "--bind=0.0.0.0:8000"]
+    networks:
+      - proxstar
+networks:
+  proxstar:
diff --git a/HACKING/proxstar-postgres/Dockerfile b/HACKING/proxstar-postgres/Dockerfile
index f0cd5ad..25fa5c4 100644
--- a/HACKING/proxstar-postgres/Dockerfile
+++ b/HACKING/proxstar-postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12
+FROM docker.io/library/postgres:12
 
 RUN apt-get update \
     && apt-get install -y postgresql-plperl-12 postgresql-plpython3-12 libnet-ip-perl libnet-ldap-perl libnet-dns-perl libnet-snmp-perl libnet-server-mail-perl libcrypt-des-perl build-essential cpanminus curl \