php 8.3

.github/workflows/docker-multi.yml

@@ -18,6 +18,11 @@ jobs:
           - '8.2-full'
           - '8.2-debug'
           - '8.2-full-nginx'
+          - '8.3'
+          - '8.3-fpm'
+          - '8.3-full'
+          - '8.3-debug'
+          - '8.3-full-nginx'
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1

.github/workflows/docker-publish.yml

@@ -18,13 +18,6 @@ jobs:
           - '8.1-full'
           - '8.1-debug'
           - '8.1-full-nginx'
-
-          - '8.0'
-          - '8.0-fpm'
-          - '8.0-full'
-          - '8.0-debug'
-          - '8.0-full-nginx'
-
           - '7.4'
           - '7.4-fpm'
           - '7.4-full'

Puppetfile

@@ -5,7 +5,6 @@ mod 'puppet/archive'
 mod 'puppetlabs/stdlib'
 mod 'puppetlabs-apt', '9.0.2'
 mod 'puppetlabs/inifile'
-mod 'luckyraul/php', :git => 'https://github.com/luckyraul/puppet-php.git'
-
 mod 'puppetlabs/concat'
-mod 'luckyraul/nginx', :git => 'https://github.com/luckyraul/puppet-nginx.git'
+mod 'luckyraul/php', :git => 'https://github.com/luckyraul/puppet-php.git', :ref => 'master'
+mod 'luckyraul/nginx', :git => 'https://github.com/luckyraul/puppet-nginx.git', :ref => 'master'

hieradata/nodes/php:8.0-debug.yaml → hieradata/nodes/php:8.3-debug.yaml

@@ -1,10 +1,10 @@
-php::globals::php_version: '8.0'
-php::dev: true
-php::pear: true
+php::globals::php_version: '8.3'
+php::dev: false
+php::pear: false
 php::newrelic: false
 php::extensions:
   xdebug:
-    prefix: 'php8.0-'
+    prefix: 'php8.3-'
     settings:
       zend_extension: xdebug.so
       xdebug.mode: debug,develop
@@ -13,9 +13,10 @@ php::extensions:
       xdebug.show_local_vars: 0
       xdebug.cli_color: 1
       xdebug.output_buffering: off
+  igbinary:
+    prefix: 'php8.3-'
   redis:
-    provider: 'pecl'
-    ensure: '5.3.4'
+    prefix: 'php8.3-'
 php::settings:
   'PHP':
     'max_input_vars': 5000

hieradata/nodes/php:8.0-fpm.yaml → hieradata/nodes/php:8.3-fpm.yaml

@@ -1,4 +1,4 @@
-php::globals::php_version: '8.0'
+php::globals::php_version: '8.3'
 php::settings:
   'PHP':
     'max_input_vars': 5000

hieradata/nodes/php:8.0-full-nginx.yaml → hieradata/nodes/php:8.3-full-nginx.yaml

@@ -1,10 +1,9 @@
 ---
 classes:
-    - 'php'
-    - 'php::globals'
-    - 'nginx'
+  - 'php'
+  - 'php::globals'
+  - 'nginx'
 
-nginx::backports: true
 nginx::service_ensure: 'stopped'
 nginx::service_enable: false
 nginx::backports: false
@@ -16,14 +15,13 @@ nginx::daemon_mode: 'off'
 
 php::docker: false
 php::docker_combo: true
-php::globals::php_version: '8.0'
-php::dev: true
-php::pear: true
-php::newrelic: true
-php::extensions:
-  redis:
-    provider: 'pecl'
-    ensure: '5.3.4'
+php::globals::php_version: '8.3'
+php::dev: false
+php::pear: false
+php::newrelic: false #not available on arm
+# php::extensions:
+#   redis:
+#     prefix: 'php8.2-'
 php::settings:
   'PHP':
     'max_input_vars': 5000

hieradata/nodes/php:8.3-full.yaml

@@ -0,0 +1,12 @@
+php::globals::php_version: '8.3'
+php::dev: false
+php::pear: false
+php::newrelic: false #not available on arm
+php::extensions:
+  igbinary:
+    prefix: 'php8.3-'
+  redis:
+    prefix: 'php8.3-'
+php::settings:
+  'PHP':
+    'max_input_vars': 5000

hieradata/nodes/php:8.3.yaml

@@ -0,0 +1,2 @@
+php::globals::php_version: '8.3'
+php::fpm: false

manifests/init.pp

@@ -1,2 +1,2 @@
-lookup('classes', {merge => unique}).include
+lookup('classes', { merge => unique }).include
 include 'dummy_service'

metadata/php:8.0-debug.yaml → metadata/php:8.3-debug.yaml

@@ -1,5 +1,6 @@
-image_name: mygento/php:8.0-debug
-cmd: php-fpm8.0
+from: debian:bookworm-slim
+image_name: mygento/php:8.3-debug
+cmd: php-fpm8.3
 expose: 9000
 entrypoint: '/entrypoint.sh'
 env:

metadata/php:8.0-fpm.yaml → metadata/php:8.3-fpm.yaml

@@ -1,7 +1,7 @@
-image_name: mygento/php:8.0-fpm
-cmd: php-fpm8.0
+from: debian:bookworm-slim
+image_name: mygento/php:8.3-fpm
+cmd: php-fpm8.3
 expose: 9000
 entrypoint: '/entrypoint.sh'
 env:
   - DEBIAN_FRONTEND=noninteractive
-  - CODENAME=bullseye

metadata/php:8.0-full-nginx.yaml → metadata/php:8.3-full-nginx.yaml

@@ -1,4 +1,5 @@
-image_name: mygento/php:8.0-full-nginx
+from: debian:bookworm
+image_name: mygento/php:8.3-full-nginx
 cmd: []
 expose: 80
 entrypoint: '/init'

metadata/php:8.0-full.yaml → metadata/php:8.3-full.yaml

@@ -1,5 +1,6 @@
-image_name: mygento/php:8.0-full
-cmd: php-fpm8.0
+from: debian:bookworm-slim
+image_name: mygento/php:8.3-full
+cmd: php-fpm8.3
 expose: 9000
 entrypoint: '/entrypoint.sh'
 env:

metadata/php:8.0.yaml → metadata/php:8.3.yaml

@@ -1,4 +1,5 @@
-image_name: mygento/php:8.0
+from: debian:bookworm-slim
+image_name: mygento/php:8.3
 env:
   - DEBIAN_FRONTEND=noninteractive
   - CODENAME=bullseye