Browse Source

Delete php5 as reached EOL (#4986)

* Delete php5 as reached EOL
Also can't connect to mysql 8.0

* Small change to rerun travis
Joan Miquel 6 years ago
parent
commit
3ca4a6f6db

+ 0 - 42
frameworks/PHP/php/benchmark_config.json

@@ -154,48 +154,6 @@
       "notes": "ngx_php",
       "versus": "php"
     },
-    "php5": {
-      "json_url": "/json.php",
-      "plaintext_url": "/plaintext.php",
-      "db_url": "/dborm.php",
-      "query_url": "/dborm.php?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "None",
-      "language": "PHP",
-      "flavor": "PHP5",
-      "orm": "Full",
-      "platform": "FPM/FastCGI",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "PHP5-activerecord",
-      "notes": "",
-      "versus": "php5-raw"
-    },
-    "php5-raw": {
-      "db_url": "/dbraw.php",
-      "query_url": "/dbquery.php?queries=",
-      "fortune_url": "/fortune.php",
-      "update_url": "/updateraw.php?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "MySQL",
-      "framework": "None",
-      "language": "PHP",
-      "flavor": "PHP5",
-      "orm": "Raw",
-      "platform": "FPM/FastCGI",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "PHP-raw",
-      "notes": "",
-      "versus": "php"
-    },
     "pools": {
       "json_url": "/json.php",
       "plaintext_url": "/plaintext.php",

+ 0 - 67
frameworks/PHP/php/deploy/nginx5.conf

@@ -1,67 +0,0 @@
-user www-data;
-worker_processes  auto;
-error_log stderr error;
-timer_resolution 1000ms;
-#worker_rlimit_nofile 2000000;
-pcre_jit on;
-
-events {
-    worker_connections 16384;
-	multi_accept off;
-	 
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log off;
-    server_tokens off;
-
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    keepalive_disable none;
-    #fastcgi_ignore_client_abort on;
-    keepalive_requests 10000;
-
-    #the bench don't use any static file
-    #open_file_cache max=2000 inactive=20s;
-    #open_file_cache_valid 60s;
-    #open_file_cache_min_uses 5;
-    #open_file_cache_errors off;
-
-    #FastCGI optimizations
-    fastcgi_buffers 256 16k;
-    fastcgi_buffer_size 128k;
-    fastcgi_connect_timeout 30s;
-    fastcgi_send_timeout 60s;
-    fastcgi_read_timeout 60s;
-    fastcgi_busy_buffers_size 256k;
-    fastcgi_temp_file_write_size 256k;
-    reset_timedout_connection on;
-    server_names_hash_bucket_size 100;
-
-
-    upstream fastcgi_backend {
-        server unix:/var/run/php/php5.6-fpm.sock;
-        keepalive 40;
-    }
-
-    server {
-        listen       8080 reuseport;
-        server_name  localhost;
-
-        root /php/;
-        index  index.php;
-
-        location ~ \.php$ {
-             
-            fastcgi_pass   fastcgi_backend;
-            fastcgi_keep_conn on;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /etc/nginx/fastcgi_params;
-        }
-    }
-}

+ 0 - 21
frameworks/PHP/php/php-php5-raw.dockerfile

@@ -1,21 +0,0 @@
-FROM ubuntu:19.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql  > /dev/null
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.3-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
-
-ADD ./ /php
-WORKDIR /php
-
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/5.6/fpm/php-fpm.conf ; fi;
-
-RUN chmod -R 777 /php
-
-CMD service php5.6-fpm start && \
-    nginx -c /php/deploy/nginx5.conf -g "daemon off;"

+ 0 - 26
frameworks/PHP/php/php-php5.dockerfile

@@ -1,26 +0,0 @@
-FROM ubuntu:19.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql  > /dev/null
-
-RUN apt-get install -yqq composer > /dev/null
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.3-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
-
-ADD ./ /php
-WORKDIR /php
-
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/5.6/fpm/php-fpm.conf ; fi;
-
-COPY deploy/activerecord/composer* ./
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-
-RUN chmod -R 777 /php
-
-CMD service php5.6-fpm start && \
-    nginx -c /php/deploy/nginx5.conf -g "daemon off;"

+ 1 - 1
frameworks/PHP/php/php-unit.dockerfile

@@ -10,4 +10,4 @@ WORKDIR /php
 
 RUN unitd --control unix:/var/run/control.unit.sock && \
     curl -X PUT --data-binary @/php/deploy/nginx-unit.json --unix-socket \
-        /var/run/control.unit.sock http://localhost/config 
+        /var/run/control.unit.sock http://localhost/config

+ 0 - 23
frameworks/PHP/slim/benchmark_config.json

@@ -23,29 +23,6 @@
       "display_name": "slim",
       "notes": "",
       "versus": "php"
-    },
-    "php5": {
-      "plaintext_url": "/plaintext",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/dbs?queries=",
-      "update_url": "/updates?queries=",
-      "fortune_url": "/fortunes",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Micro",
-      "database": "MySQL",
-      "framework": "slim",
-      "language": "PHP",
-      "flavor": "PHP5",
-      "orm": "Raw",
-      "platform": "FPM/FastCGI",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "slim",
-      "notes": "",
-      "versus": "php"
     }
   }]
 }

+ 0 - 66
frameworks/PHP/slim/deploy/nginx-fpm-5.conf

@@ -1,66 +0,0 @@
-user www-data;
-worker_processes  auto;
-error_log stderr error;
-worker_rlimit_nofile 200000;
-
-events {
-    worker_connections 16384;
-	multi_accept off;
-	 
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log off;
-    server_tokens off;
-
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    keepalive_disable none;
-    keepalive_requests 10000;
-
-    #the bench don't use any static file
-    #open_file_cache max=2000 inactive=20s;
-    #open_file_cache_valid 60s;
-    #open_file_cache_min_uses 5;
-    #open_file_cache_errors off;
-
-    #FastCGI optimizations
-    fastcgi_buffers 256 16k;
-    fastcgi_buffer_size 128k;
-    fastcgi_connect_timeout 30s;
-    fastcgi_send_timeout 60s;
-    fastcgi_read_timeout 60s;
-    fastcgi_busy_buffers_size 256k;
-    fastcgi_temp_file_write_size 256k;
-    reset_timedout_connection on;
-    server_names_hash_bucket_size 100;
-
-
-    upstream fastcgi_backend {
-        server unix:/var/run/php/php5.6-fpm.sock;
-        keepalive 40;
-    }
-
-    server {
-        listen       8080;
-        server_name  localhost;
-
-        root /slim/;
-        index  index.php;
-
-        location / {
-            try_files $uri /index.php?$uri&$args;
-        }
-
-        location = /index.php {
-            fastcgi_pass   fastcgi_backend;
-            fastcgi_keep_conn on;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /etc/nginx/fastcgi_params;
-        }
-    }
-}

+ 0 - 25
frameworks/PHP/slim/slim-php5.dockerfile

@@ -1,25 +0,0 @@
-FROM ubuntu:19.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt  > /dev/null
-
-RUN apt-get install -yqq composer > /dev/null
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.3-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
-
-ADD ./ /slim
-WORKDIR /slim
-
-RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/5.6/fpm/php-fpm.conf ; fi;
-
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-
-RUN chmod -R 777 /slim
-
-CMD service php5.6-fpm start && \
-    nginx -c /slim/deploy/nginx-fpm-5.conf -g "daemon off;"