Review Changes

dbpolito · dbpolito · commit 5684e0e09860 · 2026-01-25T12:01:16.000-03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -229,8 +229,8 @@ jobs:
       - name: Tests (Debian) - Gosu user switching
         run: |
           docker run kooldev/php:8.4-debian${{ matrix.type }} gosu --version
-          # Verify gosu works for user switching
-          docker run -e ASUSER=1000 kooldev/php:8.4-debian${{ matrix.type }} id | grep -E "uid=1000|uid=1337"
+          # Verify gosu works for user switching - should be uid=1000 when ASUSER=1000
+          docker run -e ASUSER=1000 kooldev/php:8.4-debian${{ matrix.type }} id | grep "uid=1000"
 
       - name: Tests (Debian) - PHP Extensions
         run: |
diff --git a/8.1-nginx-prod/default.tmpl b/8.1-nginx-prod/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.1-nginx/default.tmpl b/8.1-nginx/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.2-nginx-prod/default.tmpl b/8.2-nginx-prod/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.2-nginx/default.tmpl b/8.2-nginx/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.3-nginx-prod/default.tmpl b/8.3-nginx-prod/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.3-nginx/default.tmpl b/8.3-nginx/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.4-debian-nginx-prod/default.tmpl b/8.4-debian-nginx-prod/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.4-debian-nginx/default.tmpl b/8.4-debian-nginx/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.4-debian-nginx/entrypoint b/8.4-debian-nginx/entrypoint
@@ -2,11 +2,8 @@
 set -e
 
 if [ "$ENABLE_XDEBUG" = "true" ]; then
-    docker-php-ext-enable xdebug >> /dev/null 2>&1
-
-    if [ $? != "0" ]; then
+    if ! docker-php-ext-enable xdebug >> /dev/null 2>&1; then
         echo "[ERROR] An error happened enabling xdebug"
-
         exit 1
     fi
 fi
diff --git a/8.4-debian/entrypoint b/8.4-debian/entrypoint
@@ -2,11 +2,8 @@
 set -e
 
 if [ "$ENABLE_XDEBUG" = "true" ]; then
-    docker-php-ext-enable xdebug >> /dev/null 2>&1
-
-    if [ $? != "0" ]; then
+    if ! docker-php-ext-enable xdebug >> /dev/null 2>&1; then
         echo "[ERROR] An error happened enabling xdebug"
-
         exit 1
     fi
 fi
diff --git a/8.4-nginx-prod/default.tmpl b/8.4-nginx-prod/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/8.4-nginx/default.tmpl b/8.4-nginx/default.tmpl
@@ -5,7 +5,7 @@ server {
     listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     {{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 {{ end }}
     root {{ .Env.NGINX_ROOT }};
diff --git a/template/default-tmpl.blade.php b/template/default-tmpl.blade.php
@@ -5,7 +5,7 @@
     listen @{{ .Env.NGINX_LISTEN_HTTPS }} ssl http2;
     ssl_certificate     @{{ .Env.NGINX_HTTPS_CERT }};
     ssl_certificate_key @{{ .Env.NGINX_HTTPS_CERT_KEY }};
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+    ssl_protocols       TLSv1.2 TLSv1.3;
     ssl_ciphers         HIGH:!aNULL:!MD5;
 @{{ end }}
     root @{{ .Env.NGINX_ROOT }};
diff --git a/template/entrypoint-debian.blade.php b/template/entrypoint-debian.blade.php
@@ -3,11 +3,8 @@
 
 @unless ($prod)
 if [ "$ENABLE_XDEBUG" = "true" ]; then
-    docker-php-ext-enable xdebug >> /dev/null 2>&1
-
-    if [ $? != "0" ]; then
+    if ! docker-php-ext-enable xdebug >> /dev/null 2>&1; then
         echo "[ERROR] An error happened enabling xdebug"
-
         exit 1
     fi
 fi
