Improving standalone standalone-ness

standalone/.dockerignore

@@ -0,0 +1 @@
+db/

standalone/Caddyfile

@@ -1,3 +1,3 @@
 localhost {
-        reverse_proxy django-helpdesk:8000
+        reverse_proxy django-helpdesk:8080
 }

standalone/Dockerfile

@@ -7,9 +7,9 @@ RUN apt-get install -yqq \
    cron \
    git
 COPY requirements.txt /opt/django-helpdesk/requirements.txt
-COPY standalone/extra-requirements.txt /opt/django-helpdesk/standalone/extra-requirements.txt
+COPY standalone/requirements.txt /opt/django-helpdesk/standalone/requirements.txt
 RUN pip3 install -r /opt/django-helpdesk/requirements.txt
-RUN pip3 install -r /opt/django-helpdesk/standalone/extra-requirements.txt
+RUN pip3 install -r /opt/django-helpdesk/standalone/requirements.txt
 COPY . /opt/django-helpdesk
 WORKDIR /opt/django-helpdesk
 RUN pip3 install -e .

standalone/docker-compose-dev.yml

@@ -0,0 +1,30 @@
+version: '2'
+services:
+ caddy:
+   image: caddy:2
+   restart: unless-stopped
+   volumes:
+     - /tmp/data/caddy/data:/data
+     - /tmp/data/caddy/config:/config
+     - ./Caddyfile:/etc/caddy/Caddyfile:r
+   ports:
+     - "80:80"
+     - "443:443"
+
+ django-helpdesk:
+   build:
+    context: ..
+    dockerfile: standalone/Dockerfile
+   user: root
+   volumes:
+    - /tmp/django-helpdesk-data:/data/
+    - ./custom_navigation_header.html:/opt/django-helpdesk/helpdesk/templates/helpdesk/custom_navigation_header.html:r
+   env_file: docker.env
+   depends_on:
+     - postgres
+
+ postgres:
+   image: postgres:12-bullseye
+   volumes:
+    - ./db:/var/lib/postgresql/data
+   env_file: docker.env

standalone/docker-compose.yml

@@ -12,9 +12,7 @@ services:
      - "443:443"
 
  django-helpdesk:
-   build:
+   image: djangohelpdesk/standalone
-    context: ..
-    dockerfile: standalone/Dockerfile
    user: root
    volumes:
     - /tmp/django-helpdesk-data:/data/

standalone/extra-requirements.txt

@@ -1,3 +0,0 @@
-whitenoise
-gunicorn
-psycopg2-binary

standalone/requirements.txt

@@ -0,0 +1,3 @@
+whitenoise
+gunicorn
+psycopg2-binary