From 1995283c73ecafeb2648bc875a3467499b4c736b Mon Sep 17 00:00:00 2001
From: hygienic-books <hygienic-books@tentic.net>
Date: Tue, 13 Jun 2023 02:11:23 +0200
Subject: [PATCH] docs(docker-compose): Minor consistency changes

---
 .../README.md                                 | 24 +++++++++++++------
 .../env/fqdn_context.env.example              | 10 +-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/README.md b/docker-compose/{{ cookiecutter.__project_slug }}/README.md
index c395ae2..62fe8bb 100644
--- a/docker-compose/{{ cookiecutter.__project_slug }}/README.md	
+++ b/docker-compose/{{ cookiecutter.__project_slug }}/README.md	
@@ -11,7 +11,7 @@ When everything's ready start {{ cookiecutter.__service_slug.capitalize() }} wit
 ## Environment
 ```
 export COMPOSE_DIR='/opt/containers/{{ cookiecutter.__project_slug }}'
-export COMPOSE_CTX='{{ cookiecutter.__context_slug }}'
+export COMPOSE_CTX='ux_vilnius'
 export COMPOSE_PROJECT='{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"
 export COMPOSE_FILE="${COMPOSE_DIR}"'/docker-compose.yml'{% if cookiecutter.build == "yes" %}
 export COMPOSE_OVERRIDE="${COMPOSE_DIR%/}"'/docker-compose.override.yml'{% endif %}
@@ -55,18 +55,28 @@ Create ZFS datasets and set permissions as needed.
 {%- if ',' in cookiecutter.__component_list_slug -%}
 {%- set components = cookiecutter.__component_list_slug.split(',') -%}
 {%- for component in components %}
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ component }}/data/db'
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ component }}/data/logs'
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ component }}/config'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ component }}/data/db'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ component }}/data/logs'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ component }}/config'
 {%- endfor -%}
 {%- else %}
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ cookiecutter.__service_slug }}/data/db'
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ cookiecutter.__service_slug }}/data/logs'
-    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-${COMPOSE_CTX}/{{ cookiecutter.__service_slug }}/config'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ cookiecutter.__service_slug }}/data/db'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ cookiecutter.__service_slug }}/data/logs'
+    zfs create -p 'zpool/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ cookiecutter.__service_slug }}/config'
 {%- endif %}
     ```
     When changing bind mount locations to real ones remember to also update `volumes:` in [docker-compose.yml](docker-compose.yml).
 
+* Create subdirs
+    ```
+{%- set components = cookiecutter.__component_list_slug.split(',') -%}
+{% for component in components %}
+{%- if loop.first %}
+    mkdir -p '/opt/docker-data/{{ cookiecutter.__service_slug }}-'"${COMPOSE_CTX}"'/{{ cookiecutter.__service_slug }}/'{'.ssh','config','data','projects'}
+{%- endif %}
+{%- endfor %}
+    ```
+
 * Change ownership
     ```
 {%- set components = cookiecutter.__component_list_slug.split(',') -%}
diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example b/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example
index 78f62a3..ddd4b4d 100644
--- a/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example	
+++ b/docker-compose/{{ cookiecutter.__project_slug }}/env/fqdn_context.env.example	
@@ -1,4 +1,4 @@
-CONTEXT={{ cookiecutter.__context_slug }}
+CONTEXT=ux_vilnius
 
 
 
@@ -16,14 +16,6 @@ CONTEXT={{ cookiecutter.__context_slug }}
 
 
 
-# A ${LOCATION} var is usually not needed. It may be helpful when a ${CONTEXT}
-# extends over more than one location e.g. to bind-mount location-specific
-# config files or certificates into a container.
-# ---
-# LOCATION=
-
-
-
 # Feel free to leave defaults. They apply while these vars are commented out
 # ---
 # RESTARTPOLICY=unless-stopped