Merge pull request #54 from chnm/feature/docker-compose

merge feature/docker-compose into main

docker-compose.yml

@@ -1,9 +1,10 @@
 ---
+name: winterthur
+
 services:
   app:
     build: .
     image: "rrchnm/winterthur"
-    container_name: "winterthur-app"
     ports:
       - 8000:8000
     volumes:
@@ -31,7 +32,6 @@ services:
         condition: service_healthy
   db:
     image: postgres:16
-    container_name: "winterthur-db"
     volumes:
       - pg-data:/var/lib/postgresql/data
     environment:

docker-compose.yml.j2

@@ -1,10 +1,14 @@
 # this is a Jinja2 template file used during the Ansible deployment
 # environment specific configuration can be found in our Ansble scripts
 ---
+name: {{ compose_stack_name }}
+
 services:
+
+  {% set service = 'app' %}
+
   app:
     image: ghcr.io/{{ template.git.package.image_name }}:{{ template.git.package.tag }}
-    container_name: {{ template.name }}_app
     restart: unless-stopped
     ports:
       - "{{ template.env.host_app_port }}:8000"
@@ -26,22 +30,41 @@ services:
     command: >
         sh -c "poetry run python3 manage.py migrate &&
                poetry run python3 manage.py runserver 0.0.0.0:8000"
+    {% if template.volumes is defined %}
+    {% set vols = (template.volumes | selectattr('service', 'eq', service)) %}
+    {% if vols is iterable and vols | length > 0 %}
+
     volumes:
-      - dj-static:/app/staticfiles
+    {% for vol in vols %}
+
+      - {{ vol.name }}:{{ vol.container_path }}
+    {% endfor %}
+    {% endif %}
+    {% endif %}
+
     depends_on:
       db:
         condition: service_healthy
+
   db:
     image: postgres:12
-    container_name: {{ template.name }}_db
     restart: unless-stopped
-    volumes:
-      - pg-data:/var/lib/postgresql/data/
     environment:
       - POSTGRES_DB={{ template.env.db_name }}
       - POSTGRES_USER={{ template.env.db_user }}
       - POSTGRES_PASSWORD={{ template.env.db_pass }}
       - POSTGRES_HOST=db
+    {% if template.volumes is defined %}
+    {% set vols = (template.volumes | selectattr('service', 'eq', service)) %}
+    {% if vols is iterable and vols | length > 0 %}
+
+    volumes:
+    {% for vol in vols %}
+
+      - {{ vol.name }}:{{ vol.container_path }}
+    {% endfor %}
+    {% endif %}
+    {% endif %}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U {{ template.env.db_user }}"]
       interval: 5s
@@ -50,9 +73,9 @@ services:
 
 # external volumes managed and defined by ansible
 volumes:
-  dj-static:
-    name: "{{ template.name }}_app-static-vol"
-    external: true
-  pg-data:
-    name: "{{ template.name }}_db-vol"
+{% for vol in template.volumes %}
+
+  {{ vol.name }}:
+    name: "{{ compose_stack_name }}--{{ vol.name }}"
     external: true
+{% endfor %}