Remove Dockerfile for CentOS PHP ZTS and update paths for FrankenPHP binary in Ubuntu and CentOS workflows to ensure consistent installation location.

Author: ioaniftimesei

.devcontainer/centos_php_test_zts/Dockerfile

@@ -150,8 +150,8 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local-lib.conf && \
 
 COPY frankenphp-binary/ /tmp/frankenphp-binary/
 RUN if [ -f /tmp/frankenphp-binary/frankenphp ]; then \
-        cp /tmp/frankenphp-binary/frankenphp /usr/local/bin/frankenphp && \
-        chmod +x /usr/local/bin/frankenphp && \
+        cp /tmp/frankenphp-binary/frankenphp /usr/bin/frankenphp && \
+        chmod +x /usr/bin/frankenphp && \
         mkdir -p /etc/frankenphp/caddy.d && \
         mkdir -p /etc/frankenphp/php.d && \
         mkdir -p /usr/lib/frankenphp/modules; \

.github/workflows/Dockerfile.centos-php-test-zts

@@ -143,12 +143,12 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/usr-local-lib.conf && \
 
 COPY frankenphp-binary/ /tmp/frankenphp-binary/
 RUN if [ -f /tmp/frankenphp-binary/frankenphp ]; then \
-        cp /tmp/frankenphp-binary/frankenphp /usr/local/bin/frankenphp && \
-        chmod +x /usr/local/bin/frankenphp && \
-        mkdir -p /etc/frankenphp/caddy.d && \
-        mkdir -p /etc/frankenphp/php.d && \
-        mkdir -p /usr/lib/frankenphp/modules; \
-    fi
+            cp /tmp/frankenphp-binary/frankenphp /usr/bin/frankenphp && \
+            chmod +x /usr/bin/frankenphp && \
+            mkdir -p /etc/frankenphp/caddy.d && \
+            mkdir -p /etc/frankenphp/php.d && \
+            mkdir -p /usr/lib/frankenphp/modules; \
+        fi
 
 
 RUN EXTENSION_DIR=$(php -i | grep "^extension_dir" | awk '{print $3}') && \

.github/workflows/Dockerfile.ubuntu-php-test-zts

@@ -62,16 +62,26 @@ def frankenphp_classic_pre_tests(tests_data):
         for test_data in tests_data:
             f.write("\n" + test_data["site_block"])
 
-    subprocess.Popen(
-        [frankenphp_bin, 'run', '--config', caddyfile_path]
-    )
-    time.sleep(20)
-    
-    result = subprocess.run(['pgrep', '-x', 'frankenphp'], capture_output=True, text=True)
-    if not result.stdout.strip():
-        raise RuntimeError("FrankenPHP classic failed to start!")
+    print(f"Caddyfile prepared for {len(tests_data)} tests with {threads} threads")
 
 def frankenphp_classic_start_server(test_data, test_lib_dir, valgrind):
+    result = subprocess.run(['pgrep', '-x', 'frankenphp'], capture_output=True, text=True)
+    
+    if not result.stdout.strip():
+        print("Starting FrankenPHP classic server...")
+        process = subprocess.Popen(
+            [frankenphp_bin, 'run', '--config', caddyfile_path]
+        )
+        time.sleep(2)
+        
+        result = subprocess.run(['pgrep', '-x', 'frankenphp'], capture_output=True, text=True)
+        if not result.stdout.strip():
+            raise RuntimeError("FrankenPHP classic failed to spawn!")
+        
+        print("FrankenPHP classic process started")
+    else:
+        print("FrankenPHP classic is already running")
+    
     return None
 
 def frankenphp_classic_uninit():

tools/server_tests/frankenphp_classic/main.py

@@ -128,26 +128,35 @@ def frankenphp_worker_pre_tests(tests_data):
 
     total_workers = len(tests_data)
     threads = total_workers * 3
-    
+
     with open(caddyfile_path, 'w') as f:
         base_template = get_caddyfile_base_template()
         if base_template:
             f.write(base_template.format(num_threads=threads, max_threads=threads*2))
         for test_data in tests_data:
             f.write("\n" + test_data["site_block"])
 
-    process = subprocess.Popen(
-        [frankenphp_bin, 'run', '--config', caddyfile_path]
-    )
-    time.sleep(20)
-    
+    print(f"Caddyfile prepared for {len(tests_data)} tests with {threads} threads")
+    return threads
+
+def frankenphp_worker_start_server(test_data, test_lib_dir, valgrind):
     result = subprocess.run(['pgrep', '-x', 'frankenphp'], capture_output=True, text=True)
+    
     if not result.stdout.strip():
-        raise RuntimeError("FrankenPHP worker failed to start!")
+        print("Starting FrankenPHP worker server...")
+        process = subprocess.Popen(
+            [frankenphp_bin, 'run', '--config', caddyfile_path]
+        )
+        time.sleep(2)
+        
+        result = subprocess.run(['pgrep', '-x', 'frankenphp'], capture_output=True, text=True)
+        if not result.stdout.strip():
+            raise RuntimeError("FrankenPHP worker failed to spawn!")
+        
+        print("FrankenPHP worker process started")
+    else:
+        print("FrankenPHP worker is already running")
 
-    print(f"FrankenPHP worker started with {threads} threads for {len(tests_data)} tests")
-
-def frankenphp_worker_start_server(test_data, test_lib_dir, valgrind):
     return None
 
 def frankenphp_worker_uninit():