Merge pull request #13 from julianfl0w/main

Adds conditions necessary to keep arkavo.org from filling up its memory with Ollama
arkavo-org · Jan 2, 2025 · 946ce9b · 946ce9b
2 parents 1210a26 + 811dcc7
commit 946ce9b
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 57,580 deletions.
diff --git a/bluesky/tree.txt b/bluesky/tree.txt
diff --git a/bluesky/pds.env.template → discourse/config/app.yml b/bluesky/pds.env.template → discourse/config/app.yml
diff --git a/keycloak/run_keycloak.sh b/keycloak/run_keycloak.sh
diff --git a/keycloak/run_keycloak_db.sh b/keycloak/run_keycloak_db.sh
diff --git a/keycloak/start.sh b/keycloak/start.sh
diff --git a/nginx/all-ca-certificates.crt b/nginx/all-ca-certificates.crt
diff --git a/nginx/refreshConf.sh b/nginx/refreshConf.sh
@@ -1,2 +1,2 @@
+# this doesn't seem to work
 docker exec -it nginx-proxy nginx -s reload
-
diff --git a/nginx/start.sh b/nginx/start.sh
diff --git a/run.py b/run.py
@@ -37,42 +37,54 @@
 
 # --- WEB APP ---
 # theoretically has no dependencies
-utils_docker.run_container(env.webapp)
+if "webapp" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.webapp)
 
 # --- KEYCLOAK ---
-utils_docker.run_container(env.keycloakdb)
-utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="keycloakdb:5432")
-utils_docker.run_container(env.keycloak)
+if "keycloak" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.keycloakdb)
+    utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="keycloakdb:5432")
+    utils_docker.run_container(env.keycloak)
 
 # --- NGINX ---
-if not os.path.isfile("certs/ca.crt"):
-    if env.USER_WEBSITE == "localhost":
-        utils_docker.generateDevKeys(outdir=env.certs_dir)
-    else:
-        pass
-        #utils_docker.generateProdKeys(outdir=env.certs_dir, website=env.USER_WEBSITE)
-utils_docker.run_container(env.nginx)
+if "nginx" in env.SERVICES_TO_RUN:
+    if not os.path.isfile("certs/ca.crt"):
+        if env.USER_WEBSITE == "localhost":
+            utils_docker.generateDevKeys(outdir=env.certs_dir)
+        else:
+            pass
+            #utils_docker.generateProdKeys(outdir=env.certs_dir, website=env.USER_WEBSITE)
+    utils_docker.run_container(env.nginx)
 
 # --- OPENTDF ---
-utils_docker.run_container(env.opentdfdb)
-utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="opentdfdb:5432")
-utils_docker.wait_for_url(env.KEYCLOAK_INTERNAL_AUTH_URL, network=env.NETWORK_NAME)
-utils_docker.run_container(env.opentdf)
+if "opentdf" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.opentdfdb)
+    utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="opentdfdb:5432")
+    utils_docker.wait_for_url(env.KEYCLOAK_INTERNAL_AUTH_URL, network=env.NETWORK_NAME)
+    utils_docker.run_container(env.opentdf)
 
 # --- ORG ---
-utils_docker.run_container(env.org)
+if "org" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.org)
 
 # --- MATRIX SYNAPSE ---
-utils_docker.run_container(env.synapsedb)
-utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="synapsedb:5432")
-utils_docker.run_container(env.synapse)
-
-# --- Element web app ---
-utils_docker.run_container(env.element)
+if "synapse" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.synapsedb)
+    utils_docker.wait_for_db(network=env.NETWORK_NAME, db_url="synapsedb:5432")
+    utils_docker.run_container(env.synapse)
+if "element" in env.SERVICES_TO_RUN:
+    # --- Element web app ---
+    utils_docker.run_container(env.element)
+
+# --- Discourse ---
+if "discourse" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.discourse)
 
 # --- OLLAMA !!! ---
-utils_docker.run_container(env.ollama)
-utils_docker.pullModels(["llama3.2", "ALIENTELLIGENCE/sigmundfreud"])
+if "ollama" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.ollama)
+    utils_docker.pullModels(["llama3.2", "ALIENTELLIGENCE/sigmundfreud"])
 
 # --- BLUESKY PDS --- 
-utils_docker.run_container(env.bluesky)
+if "bluesky" in env.SERVICES_TO_RUN:
+    utils_docker.run_container(env.bluesky)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		# this doesn't seem to work
		docker exec -it nginx-proxy nginx -s reload