Take database URL as an environment variable

Author: alexreinking

docker-compose.yml

@@ -33,6 +33,7 @@ services:
     environment:
       HALIDE_BB_MASTER_ARTIFACTS_DIR: /artifacts
       HALIDE_BB_MASTER_SECRETS_DIR: /run/secrets
+      HALIDE_BB_MASTER_DB_URL: "postgresql://buildbot:{DB_PASSWORD}@db/buildbot"
     logging:
       driver: local
     restart: unless-stopped

master.sh

@@ -28,12 +28,19 @@ fi
 # Check necessary files are present
 
 secrets_dir="${HALIDE_BB_MASTER_SECRETS_DIR:-secrets}"
-for secret in buildbot_www_pass db_password github_token halide_bb_pass webhook_token; do
+for secret in buildbot_www_pass github_token halide_bb_pass webhook_token; do
   if [ ! -s "$secrets_dir/${secret}.txt" ]; then
     fail "Missing or empty $secrets_dir/${secret}.txt: cannot continue"
   fi
 done
 
+db_url="${HALIDE_BB_MASTER_DB_URL:-sqlite:///state.sqlite}"
+if echo "$db_url" | grep -q '{DB_PASSWORD}'; then
+  if [ ! -s "$secrets_dir/db_password.txt" ]; then
+    fail "Missing or empty $secrets_dir/db_password.txt: required by HALIDE_BB_MASTER_DB_URL"
+  fi
+fi
+
 ##
 # Resolve the buildbot command
 

master/master.cfg

@@ -52,11 +52,15 @@ SECRETS_DIR = REPO_DIR / os.environ.get("HALIDE_BB_MASTER_SECRETS_DIR", "secrets
 # SECRETS
 
 BUILDBOT_WWW_PASS = (SECRETS_DIR / "buildbot_www_pass.txt").read_text().strip()
-DB_PASSWORD = (SECRETS_DIR / "db_password.txt").read_text().strip()
 GITHUB_TOKEN = (SECRETS_DIR / "github_token.txt").read_text().strip()
 HALIDE_BB_PASS = (SECRETS_DIR / "halide_bb_pass.txt").read_text().strip()
 WEBHOOK_TOKEN = (SECRETS_DIR / "webhook_token.txt").read_text().strip()
 
+DB_URL = os.environ.get("HALIDE_BB_MASTER_DB_URL", "sqlite:///state.sqlite")
+if "{DB_PASSWORD}" in DB_URL:
+    DB_PASSWORD = (SECRETS_DIR / "db_password.txt").read_text().strip()
+    DB_URL = DB_URL.replace("{DB_PASSWORD}", DB_PASSWORD)
+
 # LLVM
 
 # At any given time, we test (at least) 3 LLVM versions:
@@ -2323,7 +2327,7 @@ c["buildbotURL"] = "https://buildbot.halide-lang.org/master/"
 # DB URL
 
 c["db"] = {
-    "db_url": f"postgresql://buildbot:{DB_PASSWORD}@db/buildbot",
+    "db_url": DB_URL,
 }
 
 # GitHub Integration