Merge remote-tracking branch 'github/master'

VSLCatena · Feb 10, 2024 · 170a6ee · 170a6ee
2 parents 6aa87c5 + b99a591
commit 170a6ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM webdevops/php-nginx:8.2-alpine
+FROM webdevops/php-nginx:8.3-alpine
 
 ENV WEB_DOCUMENT_ROOT=/app \
     WEB_DOCUMENT_INDEX=index.php \

diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.from("php-nginx", "8.2-alpine") }}
+{{ docker.from("php-nginx", "8.3-alpine") }}
 
 {{ environment.web() }}
 {{ environment.webPhp() }}

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -270,6 +270,7 @@
         bz2 \
         calendar \
         exif \
+        ftp \
         gmp \
 {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %}
         ffi \
-Original file line number
+Diff line change
@@ Expand Up / @@ -270,6 +270,7 @@ @@
             bz2 \
             calendar \
             exif \
+            ftp \
             gmp \
     {%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' or version == '8.3' %}
             ffi \
@@ Expand Down @@