Merge branch 'master' of github.com:kool-dev/docker-php into supervisord

dbpolito · dbpolito · commit 6d507b8547dd · 2026-01-25T12:11:37.000-03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -4,16 +4,16 @@ on:
   push:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 0'
+    - cron: "0 0 * * 0"
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        version: ['8.1', '8.2', '8.3', '8.4']
-        type: ['', '-prod']
+        version: ["8.1", "8.2", "8.3", "8.4"]
+        type: ["", "-prod"]
 
     steps:
       - name: Checkout code
@@ -95,6 +95,7 @@ jobs:
           docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m
 
           docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v
+          docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -T
           docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} supervisord --version
 
       - name: Build and push (nginx)
diff --git a/8.1-nginx-prod/default.tmpl b/8.1-nginx-prod/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.1-nginx/default.tmpl b/8.1-nginx/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.2-nginx-prod/default.tmpl b/8.2-nginx-prod/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.2-nginx/default.tmpl b/8.2-nginx/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.3-nginx-prod/default.tmpl b/8.3-nginx-prod/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.3-nginx/default.tmpl b/8.3-nginx/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.4-nginx-prod/default.tmpl b/8.4-nginx-prod/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/8.4-nginx/default.tmpl b/8.4-nginx/default.tmpl
@@ -40,12 +40,11 @@ server {
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
diff --git a/template/default-tmpl.blade.php b/template/default-tmpl.blade.php
@@ -40,12 +40,11 @@
     add_header X-Frame-Options "SAMEORIGIN";
 
     # basic H5BP suggestions
-    include h5bp/internet_explorer/x-ua-compatible.conf;
     include h5bp/security/referrer-policy.conf;
     include h5bp/security/x-content-type-options.conf;
-    include h5bp/security/x-xss-protection.conf;
+    include h5bp/cross-origin/requests.conf;
 
     # performance enhancements (mostly for caching static data)
     include h5bp/web_performance/cache-file-descriptors.conf;
-    include h5bp/web_performance/pre-compressed_content_gzip.conf;
+    include h5bp/web_performance/compression.conf;
 }
