Merge remote-tracking branch 'github/master'

VSLCatena · Jun 29, 2024 · 56f28df · 56f28df
2 parents 7655cd8 + b5ca3d5
commit 56f28df
Show file tree

Hide file tree

Showing 56 changed files with 330 additions and 679 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/ci/BLACKLIST b/ci/BLACKLIST
@@ -4,4 +4,5 @@
 7.2
 7.3
 7.4
+8.0
 ssh
diff --git a/ci/composer.lock b/ci/composer.lock
diff --git a/conf/console.yml b/conf/console.yml
@@ -43,11 +43,7 @@ dockerTest:
         OS_FAMILY: 'debian'
         OS_VERSION: '9'
         PHP_OFFICIAL: '1'
-      'php[^:]*:8.(0|1|2)':
-        OS_FAMILY: 'debian'
-        OS_VERSION: '10'
-        PHP_OFFICIAL: '1'
-      'php[^:]*:8.3':
+      'php[^:]*:8.(0|1|2|3)':
         OS_FAMILY: 'debian'
         OS_VERSION: '12'
-        PHP_OFFICIAL: '1'
+        PHP_OFFICIAL: '1'
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.3") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache/8.3-alpine/Dockerfile b/docker/php-apache/8.3-alpine/Dockerfile
@@ -28,7 +28,6 @@ RUN set -x \
         s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
         s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
         ' /etc/apache2/httpd.conf \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache/8.3-alpine/Dockerfile.jinja2
@@ -7,7 +7,6 @@
 
 RUN set -x \
     {{ apache.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-dev/8.3-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile
@@ -27,5 +27,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-dev/8.3-alpine/Dockerfile.jinja2
@@ -4,5 +4,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.3") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.0") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.1") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile
@@ -35,5 +35,4 @@ RUN set -x \
     && docker-service enable syslog \
     && docker-service enable postfix \
     && docker-service enable ssh \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2
@@ -8,5 +8,4 @@
 
 RUN set -x \
     {{ php.officialDevelopmentAlpine(version="8.2") }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx/8.3-alpine/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile
@@ -19,7 +19,6 @@ RUN set -x \
     # Install nginx
     && apk-install \
         nginx \
-    && docker-run-bootstrap \
-    && docker-image-cleanup
+    && docker-run-bootstrap
 
 EXPOSE 80 443
diff --git a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2
@@ -8,7 +8,6 @@
 
 RUN set -x \
     {{ nginx.alpine() }} \
-    {{ provision.runBootstrap() }} \
-    {{ docker.cleanup() }}
+    {{ provision.runBootstrap() }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile
@@ -4,7 +4,7 @@
 #+++++++++++++++++++++++++++++++++++++++
 
 
-FROM php:8.0-fpm-buster
+FROM php:8.0-fpm-bookworm
 
 LABEL [email protected] \
       vendor=WebDevOps.io \
@@ -38,7 +38,7 @@ RUN set -x \
     && apt-update \
     && /usr/local/bin/generate-dockerimage-info \
     # Enable non-free
-    && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \    
+    && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \    
     && apt-update \
     # System update
     && /usr/local/bin/apt-upgrade \
@@ -96,9 +96,8 @@ RUN set -x \
         pngquant \
         # Libraries
         libvips42 \
-        librabbitmq4 \        
-        libldap-2.4-2 \
-        zlibc \
+        librabbitmq4 \
+        libldap-2.5-0 \
         libxslt1.1 \
         libldap-common \
         zlib1g \

diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2
@@ -1,5 +1,5 @@
 
-{{ docker.fromOfficial("php", "8.0-fpm-buster") }}
+{{ docker.fromOfficial("php", "8.0-fpm-bookworm") }}
 
 {{ docker.version() }}
 
@@ -14,7 +14,7 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ bootstrap.debian('buster') }}
+    {{ bootstrap.debian('bookworm') }}
 
 RUN set -x \
     {{ base.debian() }} \
@@ -27,7 +27,7 @@ RUN set -x \
     {{ docker.cleanup() }}
 
 RUN set -x \
-    {{ php.official(version='8.0') }} \
+    {{ php.official(version='8.0',distribution='bookworm') }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,5 @@ @@
 .2
 .3
 .4
+.0
     ssh