Skip to content

Commit

Permalink
Merge pull request #61 from NethServer/php83
Browse files Browse the repository at this point in the history
Update PHP versions to include PHP 8.3
  • Loading branch information
stephdl authored Mar 29, 2024
2 parents 5a1b053 + fc8dcf7 commit 762b353
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ Send a test HTTP request to the webserver backend service:

a vhost can be created by the api-cli command

We use a container with nginx and another container for the php-fpm configuration (actually availlable PHP 7.4,8.0,8.1,8.2)
We use a container with nginx and another container for the php-fpm configuration (actually availlable PHP 7.4,8.0,8.1,8.2,8.3)

Launch `create-vhost`, by setting the following parameters:
- `PhpVersion`: Set the version of php needed, can be `''(no php), 7.4,8.0,8.1,8.2`
- `PhpVersion`: Set the version of php needed, can be `''(no php), 7.4,8.0,8.1,8.2,8.3`
- `ServerNames`: set the domain name of the vhost, it must be an array
- `MemoryLimit`: This sets the maximum amount of memory that a script is allowed to allocate. use `MB`
- `AllowUrlfOpen` : This option enables the URL-aware fopen wrappers that enable accessing URL object like files. use `enabled|disabled`
Expand Down Expand Up @@ -184,7 +184,7 @@ The TCP port of the php-fpm port is unique, each virtualhost gets a nex tcp port

Launch `update-vhost`, by setting the following parameters:
- `port`: The tcp port of php-fpm, it is used as an ID for the virtualhost
- `PhpVersion`: Set the version of php needed, can be `''(no php), 7.4,8.0,8.1,8.2`
- `PhpVersion`: Set the version of php needed, can be `''(no php), 7.4,8.0,8.1,8.2,8.3`
- `ServerNames`: set the domain name of the vhost, it must be an array
- `MemoryLimit`: This sets the maximum amount of memory that a script is allowed to allocate. use `MB`
- `AllowUrlfOpen` : This option enables the URL-aware fopen wrappers that enable accessing URL object like files. use `enabled|disabled`
Expand Down
2 changes: 1 addition & 1 deletion imageroot/actions/create-vhost/validate-input.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"format": "regex",
"pattern":"(^[0-9][.][0-9]$|^$)",
"title": "PhpVersion",
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or ''"
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or 8.3 or ''"
},
"MemoryLimit": {
"type": "integer",
Expand Down
2 changes: 1 addition & 1 deletion imageroot/actions/get-configuration/validate-output.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"format": "regex",
"pattern": "(^[0-9][.][0-9]$|^$)",
"title": "PhpVersion",
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or ''"
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or 8.3 or ''"
},
"MemoryLimit": {
"type": "integer",
Expand Down
2 changes: 1 addition & 1 deletion imageroot/actions/update-vhost/validate-input.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"format": "regex",
"pattern": "(^[0-9][.][0-9]$|^$)",
"title": "PhpVersion",
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or ''"
"description": "Could be 7.4 or 8.0 or 8.1 or 8.2 or 8.3 or ''"
},
"MemoryLimit": {
"type": "integer",
Expand Down
3 changes: 2 additions & 1 deletion imageroot/bin/download-php-fpm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ declare -A version_map
version_map[7.4]=7.4.33
version_map[8.0]=8.0.30
version_map[8.1]=8.1.27
version_map[8.2]=8.2.16
version_map[8.2]=8.2.17
version_map[8.3]=8.3.4
# Check if major_version is mapped properly
if [[ -z "${version_map[$minor_version]}" ]]; then
echo "PHP version $minor_version is not supported" 1>&2
Expand Down
1 change: 1 addition & 0 deletions ui/public/i18n/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"PHP_80":"PHP 8.0",
"PHP_81":"PHP 8.1",
"PHP_82":"PHP 8.2",
"PHP_83":"PHP 8.3",
"container_version_will_be_installed":"Changing PHP version will install a new PHP container: configuration might take a while",
"select_php_version":"Version of PHP",
"AllowUrlfOpen":"URL-aware fopen wrappers",
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/VirtualHosts.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
<cv-dropdown-item value="8.0">{{$t('virtualhosts.PHP_80')}}</cv-dropdown-item>
<cv-dropdown-item value="8.1">{{$t('virtualhosts.PHP_81')}}</cv-dropdown-item>
<cv-dropdown-item value="8.2">{{$t('virtualhosts.PHP_82')}}</cv-dropdown-item>
<cv-dropdown-item value="8.3">{{$t('virtualhosts.PHP_83')}}</cv-dropdown-item>
</cv-dropdown>
<!-- advanced options -->
<cv-accordion ref="accordion">
Expand Down

0 comments on commit 762b353

Please sign in to comment.