Skip to content

Commit 49039c2

Browse files
Added support for Alpine 3.24 (#686)
* Added support for Alpine 3.24 * Enhance PHP version fetching script with improved curl options for better error handling and reliability --------- Co-authored-by: Jules Sayer <jules.sayer@protonmail.com>
1 parent dbeee9b commit 49039c2

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

scripts/conf/php-versions-base-config.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,36 +42,36 @@ php_versions:
4242
# - 8.1.34 # Pull latest from Official PHP source
4343
- minor: "8.2"
4444
base_os:
45-
- name: alpine3.22
4645
- name: alpine3.23
46+
- name: alpine3.24
4747
- name: bookworm
4848
- name: trixie
4949
patch_versions:
50-
# - 8.2.30 # Pull latest from Official PHP source
50+
# - 8.2.32 # Pull latest from Official PHP source
5151
- minor: "8.3"
5252
base_os:
53-
- name: alpine3.22
5453
- name: alpine3.23
54+
- name: alpine3.24
5555
- name: bookworm
5656
- name: trixie
5757
patch_versions:
58-
# - 8.3.29 # Pull latest from Official PHP source
58+
# - 8.3.32 # Pull latest from Official PHP source
5959
- minor: "8.4"
6060
base_os:
61-
- name: alpine3.22
6261
- name: alpine3.23
62+
- name: alpine3.24
6363
- name: bookworm
6464
- name: trixie
6565
patch_versions:
66-
# - 8.4.16 # Pull latest from Official PHP source
66+
# - 8.4.23 # Pull latest from Official PHP source
6767
- minor: "8.5"
6868
base_os:
69-
- name: alpine3.22
7069
- name: alpine3.23
70+
- name: alpine3.24
7171
- name: bookworm
7272
- name: trixie
7373
patch_versions:
74-
# - 8.5.1 # Pull latest from Official PHP source
74+
# - 8.5.8 # Pull latest from Official PHP source
7575

7676
operating_systems:
7777
- family: alpine
@@ -108,6 +108,10 @@ operating_systems:
108108
version: alpine3.23
109109
number: 3.23
110110
nginx_version: 1.30.1-r1
111+
- name: "Alpine 3.24"
112+
version: alpine3.24
113+
number: 3.24
114+
nginx_version: 1.30.3-r1
111115
- family: debian
112116
default: true
113117
versions:

scripts/get-php-versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function echo_color_message (){
238238
if [ "$SKIP_DOWNLOAD" = false ]; then
239239
echo_color_message yellow "⚡️ Getting PHP Versions from $PHP_VERSIONS_ACTIVE_JSON_FEED"
240240
# Fetch the JSON from the PHP website
241-
php_net_version_json=$(curl -s $PHP_VERSIONS_ACTIVE_JSON_FEED)
241+
php_net_version_json=$(curl -sS --fail --retry 5 --retry-all-errors --max-time 15 "$PHP_VERSIONS_ACTIVE_JSON_FEED")
242242

243243
# Parse the fetched JSON data and optionally validate PHP versions on DockerHub
244244
if [ "$SKIP_DOCKERHUB_VALIDATION" = true ]; then

0 commit comments

Comments
 (0)