Merge remote-tracking branch 'upstream'

.env.example

@@ -53,6 +53,9 @@ SEARXNG_PASSWORD=
 # For the JWT Secret and keys, see: https://supabase.com/docs/guides/self-hosting/docker#generate-api-keys
 # For the other secrets, see: https://supabase.com/docs/guides/self-hosting/docker#update-secrets
 # You can really decide any value for POOLER_TENANT_ID like 1000.
+
+# Note that using special symbols (like '%') can complicate things a bit for your Postgres password.
+# If you use special symbols in your Postgres password, you must remember to percent-encode your password later if using the Postgres connection string, for example, postgresql://postgres.projectref:p%3Dword@aws-0-us-east-1.pooler.supabase.com:6543/postgres
 ############
 
 POSTGRES_PASSWORD=
@@ -234,4 +237,4 @@ DOCKER_SOCKET_LOCATION=/var/run/docker.sock
 
 # Google Cloud Project details
 GOOGLE_PROJECT_ID=GOOGLE_PROJECT_ID
-GOOGLE_PROJECT_NUMBER=GOOGLE_PROJECT_NUMBER
+GOOGLE_PROJECT_NUMBER=GOOGLE_PROJECT_NUMBER

docker-compose.yml

@@ -44,8 +44,8 @@ services:
     profiles: ["flowise"]
     environment:
       - PORT=3001
-      - FLOWISE_USERNAME
-      - FLOWISE_PASSWORD
+      - FLOWISE_USERNAME=${FLOWISE_USERNAME}
+      - FLOWISE_PASSWORD=${FLOWISE_PASSWORD}
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:

start_services.py

@@ -193,7 +193,7 @@ def check_and_fix_docker_compose_for_searxng():
                 # Check if uwsgi.ini exists inside the container
                 container_check = subprocess.run(
                     ["docker", "exec", container_name, "sh", "-c", "[ -f /etc/searxng/uwsgi.ini ] && echo 'found' || echo 'not_found'"],
-                    capture_output=True, text=True, check=True
+                    capture_output=True, text=True, check=False
                 )
                 
                 if "found" in container_check.stdout:
@@ -252,4 +252,4 @@ def main():
     start_local_ai()
 
 if __name__ == "__main__":
-    main()
+    main()