small fixes, set bonfire version to 1.0.5

.env.sample

@@ -59,10 +59,15 @@ DB_MIGRATE_INDEXES_CONCURRENTLY=false
 # ====================================
 # SEARCH BACKEND
 
+# recommended search backend sonic
 #COMPOSE_FILE="$COMPOSE_FILE:compose.sonic.yml"
 # docker secret cannot be used due to distroless image, threfore add secret here
 #SONIC_PASSWORD=
 
+# alternative search service
+#COMPOSE_FILE="$COMPOSE_FILE:compose.meilisearch.yml"
+#SECRET_MEILI_MASTER_KEY_VERSION=v1
+
 # ====================================
 # MAIL
 

compose.meilisearch.yml

@@ -0,0 +1,51 @@
+---
+version: "3.8"
+
+services:
+  app:
+    depends_on:
+      - search
+    environment:
+      - SEARCH_MEILI_INSTANCE=http://${STACK_NAME}_search:7700
+    secrets:
+      - meili_master_key
+      
+  search:
+    image: getmeili/meilisearch:v1.14 # WIP: upgrade from v1.11 to 1.14
+    secrets:
+      - meili_master_key
+    volumes:
+      - "search-data:/meili_data"
+      - "dump-data:/meili_dumps"
+    networks:
+      - internal
+    entrypoint: ["tini", "--", "/docker-entrypoint.sh", "/bin/meilisearch"]
+    environment:
+      - MEILI_DUMP_DIR=/meili_dumps
+    configs:
+      - source: app_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
+      - source: meili_backup
+        target: /meili_backup.sh
+        mode: 0555
+    labels:
+        backupbot.backup: ${ENABLE_BACKUPS:-true}
+        backupbot.backup.volumes.search-data: "false"
+        backupbot.backup.volumes.dump-data.path: "/meili_dumps/meilisearch_latest.dump"
+        backupbot.backup.pre-hook: "/meili_backup.sh backup"
+        backupbot.restore.post-hook: '/meili_backup.sh restore'
+        
+volumes:
+  search-data:
+  dump-data:
+   
+configs:
+  meili_backup:
+    name: ${STACK_NAME}_meili_backup_${MEILI_BACKUP_VERSION:-v4}
+    file: meili_backup.sh
+
+secrets:
+  meili_master_key:
+    external: true
+    name: ${STACK_NAME}_meili_master_key_${SECRET_MEILI_MASTER_KEY_VERSION:-v1}

compose.sonic.yml

@@ -15,7 +15,7 @@ services:
     #   - sonic_password
       
   search:
-    image: valeriansaliou/sonic:v1.7.4
+    image: valeriansaliou/sonic:v1.5.1
     # secrets:
     #   - sonic_password
     volumes:

compose.yml

@@ -86,7 +86,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=1.0.0+1.0.5-social-amd64"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4000"]
       interval: 30s

meili_backup.sh

@@ -0,0 +1,107 @@
+#!/bin/sh
+
+set -e
+
+backup() {
+  SECRET=$(cat /run/secrets/meili_master_key)
+  # Create dump
+  echo "Creating new Meilisearch dump..."
+  RESPONSE=$(curl -s -X POST 'http://localhost:7700/dumps' -H "Authorization: Bearer $SECRET")
+  echo "Response: $RESPONSE"
+  
+  # More robust extraction of task UID
+  TASK_UID=$(echo "$RESPONSE" | sed -n 's/.*"taskUid":\([0-9]*\).*/\1/p')
+  
+  if [ -z "$TASK_UID" ]; then
+    echo "Failed to extract task UID from response. Aborting."
+    exit 1
+  fi
+  
+  echo "Waiting for dump creation (task $TASK_UID)..."
+  
+  MAX_ATTEMPTS=600
+  ATTEMPT=0
+  while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
+    RESPONSE=$(curl -s "http://localhost:7700/tasks/$TASK_UID" -H "Authorization: Bearer $SECRET")
+    echo "Task status response: $RESPONSE"
+    
+    TASK_STATUS=$(echo "$RESPONSE" | sed -n 's/.*"status":"\([^"]*\)".*/\1/p')
+    
+    if [ -z "$TASK_STATUS" ]; then
+      echo "Failed to extract task status. Retrying..."
+      ATTEMPT=$((ATTEMPT+1))
+      sleep 5
+      continue
+    fi
+    
+    echo "Current status: $TASK_STATUS"
+    
+    if [ "$TASK_STATUS" = "succeeded" ]; then
+      echo "Dump creation succeeded"
+      break
+    elif [ "$TASK_STATUS" = "enqueued" ] || [ "$TASK_STATUS" = "processing" ]; then
+      echo "Dump creation in progress... ($TASK_STATUS)"
+      ATTEMPT=$((ATTEMPT+1))
+      sleep 5
+    else
+      echo "Dump creation in unexpected state: $TASK_STATUS. Giving up."
+      exit 1
+    fi
+  done
+  
+  if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
+    echo "Timed out waiting for dump creation"
+    exit 1
+  fi
+  
+  # Extract dump UID more reliably
+  DUMP_UID=$(echo "$RESPONSE" | sed -n 's/.*"dumpUid":"\([^"]*\)".*/\1/p')
+  
+  if [ -z "$DUMP_UID" ]; then
+    echo "Failed to extract dump UID. Aborting."
+    exit 1
+  fi
+  
+  echo "Using dump $DUMP_UID"
+  
+  # Check if file exists before copying
+  if [ ! -f "/meili_dumps/$DUMP_UID.dump" ]; then
+    echo "Dump file /meili_dumps/$DUMP_UID.dump not found!"
+    ls -la /meili_dumps/
+    exit 1
+  fi
+  
+  cp -f "/meili_dumps/$DUMP_UID.dump" "/meili_dumps/meilisearch_latest.dump"
+  echo "Dump created and copied successfully. You can find it at /meili_dumps/meilisearch_latest.dump"
+}
+
+restore() {
+  echo 'Restarting Meilisearch with imported dump, may take a while to become available...'
+  
+  # Check if dump file exists
+  if [ ! -f "/meili_dumps/meilisearch_latest.dump" ]; then
+    echo "Error: Dump file not found at /meili_dumps/meilisearch_latest.dump"
+    exit 1
+  fi
+  
+  pkill meilisearch || echo "No Meilisearch process found to kill"
+
+  echo "Starting Meilisearch with import dump option..."
+  MEILI_NO_ANALYTICS=true /bin/meilisearch --import-dump /meili_dumps/meilisearch_latest.dump &
+  
+  echo "Meilisearch restore process initiated..."
+}
+
+# Handle command line argument
+case "$1" in
+  backup)
+    backup
+    ;;
+  restore)
+    restore
+    ;;
+  *)
+    echo "Usage: $0 {backup|restore}"
+    exit 1
+    ;;
+esac

release/1.0.0+1.0.5-social-amd64

@@ -1 +0,0 @@
-ATTENTION: this is the first release and contains a couple of breaking changes in comparison to the previously unreleased recipe. There are a lot of secrets, keys and passwords moved to docker secrets, and the .env.sample was completly restructured. It is recommended to start your env file from scratch from the new template to make sure nothing is missing.