chore: publish 1.0.1+v4.7.0 release

README.md

@@ -17,13 +17,13 @@
 
 ## Quick start
 
-- `abra app new liberaforms`
-- Generate secrets 
-    - `abra app secret g <domain-name> --all`
+- `abra app new liberaforms --secrets`
 - Set an admin email address 
     - `abra app config <domain-name>`
-- Deploy
+- Deploy 
+    > note, the deployment will need to be interuppted to run **Create tables**
     - `abra app deploy <domain-name>`
+    - *Note: The deploy may hang, if so, perform the next step in another terminal and wait for the deploy to complete.*
 - Create tables 
     - `abra app cmd <domain-name> app setup_db` 
 > more info in [liberaforms docs](https://codeberg.org/LiberaForms/server/src/branch/main/docs/docker.md#create-the-database)

abra.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export ENTRYPOINT_VERSION=v2
-export NGINX_CONFIG_VERSION=v1
+export NGINX_CONFIG_VERSION=v2
 export PG_BACKUP_VERSION=v1
 
 file_env() {

compose.yml

@@ -59,7 +59,7 @@ services:
       - CRYPTO_KEY_VERSION
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=1.0.0+v4.7.0"
+        - "coop-cloud.${STACK_NAME}.version=1.0.1+v4.7.0"
         - "backupbot.backup=true"
         - "backupbot.backup.volumes.uploads=true"
         - "backupbot.backup.volumes.log=false"
@@ -73,7 +73,9 @@ services:
       - db_password
       - secret_key
     networks:
-      - internal
+      internal:
+        aliases:
+          - "${STACK_NAME}-app"
 
   proxy:
     image: nginx:stable
@@ -83,6 +85,8 @@ services:
     volumes:
       - uploads:/liberaforms/uploads:ro
       - static:/liberaforms/static:ro
+    environment:
+      - STACK_NAME
     configs:
       - source: nginx_conf
         mode: 555
@@ -159,6 +163,7 @@ configs:
   nginx_conf:
     name: ${STACK_NAME}_nginx_conf_${NGINX_CONFIG_VERSION}
     file: nginx.conf
+    template_driver: golang
   pg_backup:
     name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
     file: pg_backup.sh

nginx.conf

@@ -10,7 +10,7 @@ server {
     add_header X-Content-Type-Options nosniff;
 
     location / {
-        set $upstream_app http://app:5000;
+        set $upstream_app http://{{ env "STACK_NAME" }}-app:5000;
         
         location /static/ {
             alias  /liberaforms/static/;