upgrade to v3.5 and add OIDC

.env.sample

@@ -1,10 +1,14 @@
 TYPE=rallly
+TIMEOUT=300
+ENABLE_AUTO_UPDATE=true
 
 DOMAIN=rallly.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.rallly.example.com`'
 
+COMPOSE_FILE="compose.yml"
+
 LETS_ENCRYPT_ENV=production
 
 SECRET_SECRET_KEY_VERSION=v1
@@ -16,3 +20,10 @@ SMTP_HOST=mail.example.com
 SMTP_PORT=465
 SMTP_SECURE=true
 SMTP_USER=noreply@example.com
+
+#COMPOSE_FILE="$COMPOSE_FILE:compose.oidc.yml"
+#OIDC_ENABLED=1
+#OIDC_NAME= #The user-facing name of your provider as it will be shown on the login page
+#OIDC_DISCOVERY_URL= #URL of the .well-known/openid-configuration endpoint for your OIDC provider
+#OIDC_CLIENT_ID=
+#SECRET_OIDC_CLIENT_SECRET_VERSION=v1

README.md

@@ -1,6 +1,6 @@
 # rallly
 
-> One line description of the recipe
+> [Rally](https://github.com/lukevella/rallly) is a tool to schedule group meetings. Create meeting polls to find the best date and time to organize an event based on participants' availability. Save time and avoid back-and-forth emails.
 
 <!-- metadata -->
 

abra.sh

@@ -1 +1 @@
-export APP_ENTRYPOINT_VERSION=v1
+export APP_ENTRYPOINT_VERSION=v2

compose.oidc.yml

@@ -0,0 +1,16 @@
+---
+version: "3.8"
+
+services:
+  app:
+    secrets:
+      - oidc_client_secret
+    environment:
+      - OIDC_ENABLED
+      - OIDC_NAME
+      - OIDC_DISCOVERY_URL
+      - OIDC_CLIENT_ID
+secrets:
+  oidc_client_secret:
+    name: ${STACK_NAME}_oidc_client_secret_${SECRET_OIDC_CLIENT_SECRET_VERSION}
+    external: true

compose.yml

@@ -3,7 +3,8 @@ version: "3.8"
 
 services:
   app:
-    image: lukevella/rallly:2.1.1
+    image: lukevella/rallly:3.5.0
+    hostname: 0.0.0.0
     networks:
       - proxy
       - internal
@@ -12,9 +13,13 @@ services:
     secrets:
       - secret_key
       - smtp_pwd
+      - db_password
     environment:
-      - DATABASE_URL=postgres://postgres:postgres@rallly_db:5432/db
-      - NEXT_PUBLIC_BASE_URL=${DOMAIN}
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+      - DATABASE=rallly_db:5432/db
+      - NEXT_PUBLIC_BASE_URL=https://${DOMAIN}
+      - NEXT_PUBLIC_APP_BASE_URL=https://${DOMAIN}
+      - NEXTAUTH_URL=$NEXT_PUBLIC_BASE_URL
       - SECRET_PASSWORD_FILE=/run/secrets/secret_key
       - SUPPORT_EMAIL
       - SMTP_HOST
@@ -40,7 +45,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+2.1.1"
+        - "coop-cloud.${STACK_NAME}.version=0.4.1+2.11.1"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3000"]
       interval: 30s
@@ -48,7 +53,12 @@ services:
       retries: 10
       start_period: 1m
   rallly_db:
-    image: postgres:14.2
+    image: postgres:14.8
+    deploy:
+        labels:
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: "PGPASSWORD=$$(cat /run/secrets/db_password) pg_dump -U postgres $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
+          backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
     volumes:
       - db-data:/var/lib/postgresql/data
     secrets:

entrypoint.sh.tmpl

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+{{ if eq (env "OIDC_ENABLED") "1" }}
+export OIDC_CLIENT_SECRET=$(cat /run/secrets/oidc_client_secret)
+{{ end }}
+
 set -eu
 
 file_env() {
@@ -25,5 +29,9 @@ file_env() {
 
 file_env "SECRET_PASSWORD"
 file_env "SMTP_PWD"
+file_env "POSTGRES_PASSWORD"
+file_env "OIDC_CLIENT_SECRET"
 
-/usr/src/app/scripts/docker-start.sh
+export DATABASE_URL=postgres://postgres:$POSTGRES_PASSWORD@$DATABASE
+
+/app/docker-start.sh