Octane Swoole support/re-write

Author: hiddehs

.github/workflows/docker-publish.yml

@@ -9,7 +9,7 @@ on:
   schedule:
     - cron: '15 16 * * *'
   push:
-    branches: [ "master" ]
+    branches: [ "master", "octane" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:

Dockerfile

@@ -1,74 +1,56 @@
-ARG ALPINE_VERSION=3.16
-FROM alpine:${ALPINE_VERSION}
-LABEL Maintainer="Tim de Pater <[email protected]>"
-LABEL Description="Lightweight container with Nginx 1.22 & PHP 8.1 based on Alpine Linux. With Laravel support by @hidde.me"
-# Setup document root
+ARG BASE_TAG=php8.1-alpine
+
+# https://hub.docker.com/r/phpswoole/swoole
+FROM phpswoole/swoole:$BASE_TAG
 WORKDIR /var/www/html
 
-# Install packages and remove default server definition
-RUN apk add --no-cache \
-  curl \
-  nginx \
-  redis \
-  php81 \
-  php81-ctype \
-  php81-curl \
-  php81-dom \
-  php81-fpm \
-  php81-gd \
-  php81-intl \
-  php81-mbstring \
-  php81-pdo \
-  php81-pgsql \
-  php81-pdo_pgsql \
-  php81-opcache \
-  php81-openssl \
-  php81-phar \
-  php81-session \
-  php81-xml \
-  php81-xmlreader \
-  php81-xmlwriter \
-  php81-fileinfo \
-  php81-simplexml \
-  php81-tokenizer \
-  php81-exif \
-  php81-pcntl \
-  php81-posix \
-  php81-redis \
-  supervisor
-# Create symlink so programs depending on `php` still function
-RUN ln -s /usr/bin/php81 /usr/bin/php
+RUN set -ex \
+    && apk update \
+    && apk --no-cache add \
+        supervisor \
+        nginx \
+        curl \
+        libmcrypt-dev \
+        libxml2-dev \
+        pcre-dev \
+        zlib-dev \
+        autoconf \
+        oniguruma-dev \
+        curl-dev \
+        openssl \
+        openssl-dev \
+        freetype-dev \
+        libjpeg-turbo-dev \
+        jpeg-dev \
+        libpng-dev \
+        imagemagick-dev \
+        imagemagick \
+        postgresql \
+        postgresql-dev \
+        libzip-dev \
+        gettext-dev \
+        libxslt-dev \
+        libgcrypt-dev \
+        libxml2 && \
+    docker-php-ext-enable redis && \
+    docker-php-ext-install ctype pdo pdo_pgsql pcntl exif && \
+    rm /var/cache/apk/* && rm -rf /tmp/pear
+
 
 # Configure nginx
 COPY config/nginx.conf /etc/nginx/nginx.conf
 
-# Configure PHP-FPM
-COPY config/fpm-pool.conf /etc/php81/php-fpm.d/www.conf
-COPY config/php.ini /etc/php81/conf.d/custom.ini
-
 # Configure supervisord
 COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 # Make sure files/folders needed by the processes are accessable when they run under the nobody user
 RUN chown -R nobody.nobody /var/www/html /run /var/lib/nginx /var/log/nginx
 
-COPY --from=hipages/php-fpm_exporter /php-fpm_exporter /usr/bin/php-fpm_exporter
-RUN chmod +x /usr/bin/php-fpm_exporter
-
 # Switch to use a non-root user from here on
 USER nobody
 
 # Expose the port nginx is reachable on
 EXPOSE 8080
 
-# Expose php-fpm_exporter port
-EXPOSE 9253
-
 # Let supervisord start nginx & php-fpm
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
-
-# Configure a healthcheck to validate that everything is up&running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8080/fpm-ping
-
-# Install composer from the official image
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

config/nginx.conf

@@ -6,6 +6,7 @@ events {
     worker_connections 1024;
 }
 
+
 http {
     include mime.types;
     default_type application/octet-stream;
@@ -28,6 +29,11 @@ http {
     uwsgi_temp_path /tmp/uwsgi_temp;
     scgi_temp_path /tmp/scgi_temp;
 
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
     # Default server definition
     server {
         listen [::]:8080 default_server;
@@ -41,10 +47,12 @@ http {
         root /var/www/html/public;
         index index.php index.html;
 
+        location /index.php {
+          try_files /not_exists @octane;
+        }
+
         location / {
-            # First attempt to serve request as file, then
-            # as directory, then fall back to index.php
-            try_files $uri $uri/ /index.php?q=$uri&$args;
+          try_files $uri $uri/ @octane;
         }
 
         # Redirect server error pages to the static page /50x.html
@@ -53,17 +61,32 @@ http {
             root /var/lib/nginx/html;
         }
 
+        location = /favicon.ico { access_log off; log_not_found off; }
+        location = /robots.txt  { access_log off; log_not_found off; }
+
+
+        error_page 404 /index.php;
+
         client_max_body_size 100M;
 
         # Pass the PHP scripts to PHP-FPM listening on php-fpm.sock
-        location ~ \.php$ {
-            try_files $uri =404;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass unix:/run/php-fpm.sock;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param SCRIPT_NAME $fastcgi_script_name;
-            fastcgi_index index.php;
-            include fastcgi_params;
+        location @octane {
+            set $suffix "";
+
+            if ($uri = /index.php) {
+                set $suffix ?$query_string;
+            }
+
+            proxy_http_version 1.1;
+            proxy_set_header Host $http_host;
+            proxy_set_header Scheme $scheme;
+            proxy_set_header SERVER_PORT $server_port;
+            proxy_set_header REMOTE_ADDR $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+
+            proxy_pass http://127.0.0.1:8000$suffix;
         }
 
         location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
@@ -77,28 +100,19 @@ http {
             deny all;
         }
 
-        # Allow fpm ping and status from localhost
-        location ~ ^/(fpm-status|fpm-ping)$ {
-            access_log off;
-            allow 127.0.0.1;
-            deny all;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include fastcgi_params;
-            fastcgi_pass unix:/run/php-fpm.sock;
-        }
     }
-    
+
     # Hardening
     proxy_hide_header X-Powered-By;
     fastcgi_hide_header X-Powered-By;
     server_tokens off;
-    
+
     gzip on;
     gzip_proxied any;
     gzip_types text/plain application/xml text/css text/js text/xml application/x-javascript text/javascript application/json application/xml+rss;
     gzip_vary on;
     gzip_disable "msie6";
-    
+
     # Include other server configs
     include /etc/nginx/conf.d/*.conf;
 }

config/supervisord.conf

@@ -4,8 +4,8 @@ logfile=/dev/null
 logfile_maxbytes=0
 pidfile=/run/supervisord.pid
 
-[program:php-fpm]
-command=php-fpm81 -F
+[program:octane]
+command=php -d variables_order=EGPCS artisan octane:start --server=swoole --host=0.0.0.0 --port=8000
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
@@ -21,12 +21,3 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 autorestart=false
 startretries=0
-
-[program:php-fpm_exporter]
-command=php-fpm_exporter server --phpfpm.fix-process-count true --phpfpm.scrape-uri unix:///run/php-fpm.sock;/fpm-status
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autorestart=false
-startretries=0