Separate workflow (#9)

* seprarating the build process to build_environment

* updates

* remove db containers after testing; check and remove old containers, and restart new container if old container exists

* remove init_sql from mysql/config

* extract build-relevant function to build.py; add build command

* update readme

Author: CelestaLiu

.gitignore

@@ -4,5 +4,5 @@ sqlancer-logs/
 __pycache__/
 **/__pycache__/
 
-
+Dockerfile
 .env

README.md

@@ -8,8 +8,37 @@ A suite of automation scripts that streamline the sqlancer testing process.
 - Docker
 
 ## Using Auto-sqlancer
-### 1. Test all DBMSs
+### 1. Build Images
+#### Build all DBMS images
+```bash
+python3 start.py build --dbms all 
+```
+
+- --dbms all: build all the database images
+
+
+#### Build a single DBMS
+
+```bash
+python3 start.py build --dbms <dbms_name> 
+
+```
+
+- <dbms_name>: e.g., mysql, postgres, sqlite, etc.
+
+
+- Example: 
+```
+python3 start.py build --dbms mysql 
+```
+
+#### Build sqlancer image
+```bash
+python3 start.py build --sqlancer
+```
 
+### 2. Test 
+#### Test all DBMSs
 ```bash
 python3 start.py test --dbms all [--cache]
 ```
@@ -18,7 +47,7 @@ python3 start.py test --dbms all [--cache]
 
 - --cache(optional): skip pulling/building Docker image
 
-### 2. Test a single DBMS
+#### Test a single DBMS
 
 ```bash
 python3 start.py test --dbms <dbms_name> --config <path/to/config.json> [--cache]
@@ -34,7 +63,7 @@ python3 start.py test --dbms <dbms_name> --config <path/to/config.json> [--cache
 python3 start.py test --dbms mysql --config mysql/config.json
 ```
 
-### 3. Test a Custom Dockerfile-Based DBMS Container
+#### Test a Custom Dockerfile-Based DBMS Container
 ```bash
 python3 start.py test --dockerfile <path/to/Dockerfile> --config <path/to/config.json> [--cache]
 ```
@@ -45,5 +74,5 @@ python3 start.py test --dockerfile <path/to/Dockerfile> --config <path/to/config
 
 - Example: 
 ```
-python3 start.py test --dockerfile ./Dockerfile --config mysql/config.json
+python3 start.py test --dockerfile ./Dockerfile --config ./config.json
 ```

build.py

@@ -2,18 +2,58 @@
 import sys
 import subprocess
 
-def build_sqlancer():
-    subprocess.run(["docker", "build", "-t", "sqlancer:latest", "./sqlancer"], check=True)
+def run_command(cmd, **kwargs):
+    print("[CMD]", " ".join(cmd))
+    subprocess.run(cmd, check=True, **kwargs)
 
-def build_db(dbms, version):
-    tag = f"{dbms}:{version}"
-    subprocess.run(["docker", "pull", tag], check=True)
+def build_sqlancer_image(force_rebuild=False):
+    if force_rebuild:
+        print("[INFO] Rebuilding SQLancer image due to --cache not specified...")
+        run_command(["docker", "build", "--no-cache", "-t", "sqlancer:latest", "./sqlancer"])
+        return
 
-if __name__ == "__main__":
-    cmd = sys.argv[1]
-    if cmd == "sqlancer":
-        build_sqlancer()
-    elif cmd == "db":
-        dbms = sys.argv[2]
-        version = sys.argv[4]
-        build_db(dbms, version)
+    result = subprocess.run(
+        ["docker", "images", "--format", "{{.Repository}}:{{.Tag}}"],
+        capture_output=True, text=True
+    )
+    images = result.stdout.strip().splitlines()
+    if "sqlancer:latest" in images:
+        print("[INFO] SQLancer image already exists: sqlancer:latest")
+    else:
+        print("[INFO] SQLancer image not found. Building from ./sqlancer...")
+        run_command(["docker", "build", "-t", "sqlancer:latest", "./sqlancer"])
+
+def build_network(network_name="sqlancer-net"):
+    try:
+        output = subprocess.check_output([
+            "docker", "network", "ls",
+            "--filter", f"name={network_name}",
+            "--format", "{{.Name}}"
+        ])
+        networks = output.decode().splitlines()
+        if network_name not in networks:
+            print(f"[INFO] Creating docker network: {network_name}")
+            subprocess.run(["docker", "network", "create", network_name], check=True)
+        else:
+            print(f"[INFO] Docker network '{network_name}' already exists.")
+    except Exception as e:
+        print(f"[ERROR] Failed to check/create Docker network: {e}")
+        sys.exit(1)
+
+def build_db_image(cfg, use_cache, custom=False, dockerfile_path=""):
+    if not use_cache and not custom:
+        image = cfg["image"]
+        print(f"[INFO] Pulling image {image}")
+        run_command(["docker", "pull", image])
+
+    if custom:
+        build_cmd = ["docker", "build", "-t", cfg["image"], os.path.dirname(dockerfile_path)]
+        if not use_cache:
+            build_cmd.insert(2, "--no-cache")
+        run_command(build_cmd)
+
+def build_environment(cfg, use_cache, custom=False, dockerfile_path=""):
+    build_network()
+    build_sqlancer_image(force_rebuild=not use_cache)
+    build_db_image(cfg, use_cache, custom, dockerfile_path)
+    

config.json

@@ -1,10 +1,18 @@
 {
   "dbms_list": ["mysql", "postgres"],
   "dbms": "mysql",
+  "container_name": "mysql-custom",
+  "image": "mysql-custom",
   "version": "custom",
+  "env": {
+    "MYSQL_ROOT_PASSWORD": "12345678"
+  },
   "username": "root",
   "password": "12345678",
+  "oracle": "FUZZER",
   "num_threads": 4,
-  "timeout_seconds": 60,
-  "oracle": "FUZZER"
+  "timeout_seconds": 60
 }
+
+
+  

mysql/config.json

@@ -9,7 +9,5 @@
   "password": "12345678",
   "oracle": "FUZZER",
   "num_threads": 4,
-  "timeout_seconds": 60,
-  "init_sql": "CREATE DATABASE test;",
-  "init_sql_command": "docker exec {container_name} mysql -u{username} -p{password} -e \"{sql}\""
+  "timeout_seconds": 60
 }

run_test.py

@@ -27,4 +27,4 @@ echo "Running: $CMD" | tee -a "$LOG_FILE"
 # Run the command and tee output to both console and log file
 eval "$CMD" 2>&1 | tee -a "$LOG_FILE"
 
-echo "[INFO] SQLancer finished. Logs saved to $LOG_FILE"
+echo "[INFO] SQLancer finished. Logs saved to $LOG_DIR"