From beb791acc480d4034db0fe6532bd9833d4bc0ac2 Mon Sep 17 00:00:00 2001 From: Benny Tops Date: Thu, 29 May 2025 18:55:13 +0200 Subject: [PATCH] Add concept of environment and reset Supabase ports in public environment --- docker-compose.override.public.supabase.yml | 9 ++++++++ docker-compose.override.public.yml | 9 ++++++++ start_services.py | 23 ++++++++++++++------- 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 docker-compose.override.public.supabase.yml create mode 100644 docker-compose.override.public.yml diff --git a/docker-compose.override.public.supabase.yml b/docker-compose.override.public.supabase.yml new file mode 100644 index 0000000..472a5cb --- /dev/null +++ b/docker-compose.override.public.supabase.yml @@ -0,0 +1,9 @@ +services: + analytics: + ports: !reset null + + kong: + ports: !reset null + + supavisor: + ports: !reset null diff --git a/docker-compose.override.public.yml b/docker-compose.override.public.yml new file mode 100644 index 0000000..472a5cb --- /dev/null +++ b/docker-compose.override.public.yml @@ -0,0 +1,9 @@ +services: + analytics: + ports: !reset null + + kong: + ports: !reset null + + supavisor: + ports: !reset null diff --git a/start_services.py b/start_services.py index 04bd496..67888cc 100644 --- a/start_services.py +++ b/start_services.py @@ -54,20 +54,25 @@ def stop_existing_containers(profile=None): cmd.extend(["-f", "docker-compose.yml", "down"]) run_command(cmd) -def start_supabase(): +def start_supabase(environment=None): """Start the Supabase services (using its compose file).""" print("Starting Supabase services...") - run_command([ - "docker", "compose", "-p", "localai", "-f", "supabase/docker/docker-compose.yml", "up", "-d" - ]) + cmd = ["docker", "compose", "-p", "localai", "-f", "supabase/docker/docker-compose.yml"] + if environment and environment == "public": + cmd.extend(["-f", "docker-compose.override.public.supabase.yml"]) + cmd.extend(["up", "-d"]) + run_command(cmd) -def start_local_ai(profile=None): +def start_local_ai(profile=None, environment=None): """Start the local AI services (using its compose file).""" print("Starting local AI services...") cmd = ["docker", "compose", "-p", "localai"] if profile and profile != "none": cmd.extend(["--profile", profile]) - cmd.extend(["-f", "docker-compose.yml", "up", "-d"]) + cmd.extend(["-f", "docker-compose.yml"]) + if environment and environment == "public": + cmd.extend(["-f", "docker-compose.override.public.yml"]) + cmd.extend(["up", "-d"]) run_command(cmd) def generate_searxng_secret_key(): @@ -214,6 +219,8 @@ def main(): parser = argparse.ArgumentParser(description='Start the local AI and Supabase services.') parser.add_argument('--profile', choices=['cpu', 'gpu-nvidia', 'gpu-amd', 'none'], default='cpu', help='Profile to use for Docker Compose (default: cpu)') + parser.add_argument('--environment', choices=['private', 'public'], default='private', + help='Environment to use for Docker Compose (default: private)') args = parser.parse_args() clone_supabase_repo() @@ -226,14 +233,14 @@ def main(): stop_existing_containers(args.profile) # Start Supabase first - start_supabase() + start_supabase(args.environment) # Give Supabase some time to initialize print("Waiting for Supabase to initialize...") time.sleep(10) # Then start the local AI services - start_local_ai(args.profile) + start_local_ai(args.profile, args.environment) if __name__ == "__main__": main()