chore: publish 0.1.1+6.9.0 release

Reviewed-on: #1

.env.sample

@@ -5,13 +5,14 @@ ENABLE_BACKUPS=true
 
 DOMAIN=taiga.example.com
 ## Domain aliases
-#EXTRA_DOMAINS=', `www.nextcloud.example.com`'
+#EXTRA_DOMAINS=', `www.taiga.example.com`'
 LETS_ENCRYPT_ENV=production
 
+COMPOSE_FILE="compose.yml"
 # Set the subpath that taiga resides
 # TAIGA_SUBPATH=""
 
-#Djano superuser settings to create initial superuser
+# Djano superuser settings to create initial superuser
 DJANGO_SUPERUSER_USERNAME=admin
 DJANGO_SUPERUSER_EMAIL=admin@example.com
 SECRET_DJANGO_PASSWORD_VERSION=v1
@@ -25,23 +26,24 @@ POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
 TAIGA_SECRET_KEY_FILE=/run/secrets/taiga_secret
 RABBITMQ_PASS_FILE=/run/secrets/rabbitmq_password
 
-
-# Taiga's SMTP settings - Variables to send Taiga's emails to the users
-#EMAIL_BACKEND=console # use an SMTP server or display the emails in the console (either "smtp" or "console")
-#EMAIL_HOST=smtp.host.example.com  # SMTP server address
-#EMAIL_PORT=587   # default SMTP port
-#EMAIL_HOST_USER=user  # user to connect the SMTP server
-#EMAIL_HOST_PASSWORD=password  # SMTP user's password
-#EMAIL_DEFAULT_FROM=changeme@example.com  # default email address for the automated emails
-#EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive (only set one of those to True)
-#EMAIL_USE_TLS=True  # use TLS (secure) connection with the SMTP server
-#EMAIL_USE_SSL=False  # use implicit TLS (secure) connection with the SMTP server
-
 # Taiga's RabbitMQ settings - Variables to leave messages for the realtime and asynchronous events
-#RABBITMQ_ERLANG_COOKIE=secret-erlang-cookie  # unique value shared by any connected instance of RabbitMQ
+# RABBITMQ_ERLANG_COOKIE=secret-erlang-cookie  # unique value shared by any connected instance of RabbitMQ
 
 # Taiga's Attachments - Variable to define how long the attachments will be accesible
 ATTACHMENTS_MAX_AGE=360  # token expiration date (in seconds)
 
 # Taiga's Telemetry - Variable to enable or disable the anonymous telemetry
 ENABLE_TELEMETRY=True
+
+# COMPOSE_FILE="$COMPOSE_FILE:compose.email.yml"
+# Taiga's SMTP settings - Variables to send Taiga's emails to the users
+
+# EMAIL_BACKEND=console # use an SMTP server or display the emails in the console (either "smtp" or "console")
+# EMAIL_HOST=smtp.host.example.com  # SMTP server address
+# EMAIL_PORT=587   # default SMTP port
+# EMAIL_HOST_USER=user  # user to connect the SMTP server
+# EMAIL_HOST_PASSWORD=password  # SMTP user's password
+# EMAIL_DEFAULT_FROM=changeme@example.com  # default email address for the automated emails
+# EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive (only set one of those to True)
+# EMAIL_USE_TLS=True  # use TLS (secure) connection with the SMTP server
+# EMAIL_USE_SSL=False  # use implicit TLS (secure) connection with the SMTP server

README.md

@@ -6,7 +6,7 @@
 
 * **Category**: Apps
 * **Status**: 0
-* **Image**: [`taigaio`](https://hub.docker.com/u/taigaio), 6.9, upstream
+* **Image**: [`taigaio`](https://hub.docker.com/u/taigaio), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: Yes
@@ -20,9 +20,6 @@
 - `abra app new taiga --secrets`
 - `abra app config <app-name>`
 - `abra app deploy <app-name>`
-- Create the Django superuser
-    - `abra app run <taiga-domain> taiga-back /create-superuser.sh`
-    - Select the image that corresponds to `taiga-back` and NOT `taiga-back-async`
-    - Your superuser should have the username `admin` and password `admin`
+- You can login to the admin interface. The username is `admin` and the password is the generated secret `django_password`
 
 For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).

compose.email.yml

@@ -0,0 +1,22 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - EMAIL_BACKEND=django.core.mail.backends.${EMAIL_BACKEND}.EmailBackend
+      - EMAIL_DEFAULT_FROM
+      - EMAIL_USE_TLS
+      - EMAIL_USE_SSL
+      - EMAIL_HOST
+      - EMAIL_PORT
+      - EMAIL_HOST_USER
+      - EMAIL_HOST_PASSWORD
+  app-async:
+    environment:
+      - EMAIL_BACKEND=django.core.mail.backends.${EMAIL_BACKEND}.EmailBackend
+      - EMAIL_DEFAULT_FROM
+      - EMAIL_USE_TLS
+      - EMAIL_USE_SSL
+      - EMAIL_HOST
+      - EMAIL_PORT
+      - EMAIL_HOST_USER
+      - EMAIL_HOST_PASSWORD

compose.yml

@@ -42,16 +42,21 @@ services:
         target: /create-superuser.sh
         mode: 0555
     entrypoint: /create-superuser.sh
-    env_file:
-      - .env.sample
     environment:
       - POSTGRES_DB=taiga
       - POSTGRES_USER=taiga
+      - POSTGRES_PASSWORD_FILE
       - POSTGRES_HOST=db
+      - TAIGA_SECRET_KEY_FILE
       - SECRET_KEY_FILE=${TAIGA_SECRET_KEY_FILE}
       - TAIGA_SITES_SCHEME=https
       - TAIGA_SITES_DOMAIN=${DOMAIN}
+      - TAIGA_SUBPATH
       - RABBITMQ_USER=taiga
+      - RABBITMQ_PASS_FILE
+      - DJANGO_SUPERUSER_USERNAME
+      - DJANGO_SUPERUSER_PASSWORD_FILE
+      - DJANGO_SUPERUSER_EMAIL
     networks:
       - internal
     deploy:
@@ -65,9 +70,8 @@ services:
       - taiga_secret
       - postgres_password
       - rabbitmq_password
-    env_file:
-      - .env.sample
     environment:
+      - RABBITMQ_PASS_FILE
       - POSTGRES_DB=taiga
       - POSTGRES_USER=taiga
       - POSTGRES_HOST=db
@@ -92,7 +96,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+6.9.0"
+        - "coop-cloud.${STACK_NAME}.version=0.1.1+6.9.0"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
     healthcheck:
       test: ["CMD-SHELL", "python -m http.client -c 'GET /api/v1/' -H 'Host: localhost' || exit 1"]      
@@ -114,9 +118,10 @@ services:
       - taiga_secret
       - postgres_password
       - rabbitmq_password
-    env_file:
-      - .env.sample
     environment:
+      - TAIGA_SECRET_KEY_FILE
+      - POSTGRES_PASSWORD_FILE
+      - RABBITMQ_PASS_FILE
       - POSTGRES_DB=taiga
       - POSTGRES_USER=taiga
       - POSTGRES_HOST=db
@@ -170,10 +175,10 @@ services:
     secrets:
       - taiga_secret
       - rabbitmq_password
-    env_file:
-      - .env.sample
     environment:
       - RABBITMQ_USER=taiga
+      - RABBITMQ_PASS_FILE
+      - TAIGA_SECRET_KEY_FILE
       - ENTRYPOINT=/taiga-events/docker/entrypoint.sh
     networks:
       - internal 

create-superuser.sh.tmpl

@@ -29,6 +29,8 @@ file_env() {
 file_env "POSTGRES_PASSWORD"
 file_env "RABBITMQ_PASS"
 file_env "TAIGA_SECRET_KEY"
+file_env "SECRET_KEY"
+
 
 echo "Waiting for Postgres..."
 

entrypoint.sh.tmpl

@@ -27,7 +27,7 @@ file_env() {
 file_env "POSTGRES_PASSWORD"
 file_env "RABBITMQ_PASS"
 
-# these two should be the same.. for some reason
+# these two should be the same
 # the naming is different in the services
 file_env "TAIGA_SECRET_KEY"
 file_env "SECRET_KEY"

release/0.1.1+6.9.0

@@ -0,0 +1 @@
+Default to not using email compose as a part of app.