Skip to content

Add Alpine 3.18 variant #1405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2023
Merged

Add Alpine 3.18 variant #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 8.1-rc/alpine3.16/cli/Dockerfile → 8.1-rc/alpine3.18/cli/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1-rc/alpine3.16/cli/docker-php-entrypoint → 8.1-rc/alpine3.18/cli/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/cli/docker-php-ext-configure → ...c/alpine3.18/cli/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/cli/docker-php-ext-enable → 8.1-rc/alpine3.18/cli/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/cli/docker-php-ext-install → 8.1-rc/alpine3.18/cli/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/cli/docker-php-source → 8.1-rc/alpine3.18/cli/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.1-rc/alpine3.16/fpm/Dockerfile → 8.1-rc/alpine3.18/fpm/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1-rc/alpine3.16/fpm/docker-php-entrypoint → 8.1-rc/alpine3.18/fpm/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/fpm/docker-php-ext-configure → ...c/alpine3.18/fpm/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/fpm/docker-php-ext-enable → 8.1-rc/alpine3.18/fpm/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/fpm/docker-php-ext-install → 8.1-rc/alpine3.18/fpm/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/fpm/docker-php-source → 8.1-rc/alpine3.18/fpm/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.1-rc/alpine3.16/zts/Dockerfile → 8.1-rc/alpine3.18/zts/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1-rc/alpine3.16/zts/docker-php-entrypoint → 8.1-rc/alpine3.18/zts/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/zts/docker-php-ext-configure → ...c/alpine3.18/zts/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/zts/docker-php-ext-enable → 8.1-rc/alpine3.18/zts/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/zts/docker-php-ext-install → 8.1-rc/alpine3.18/zts/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1-rc/alpine3.16/zts/docker-php-source → 8.1-rc/alpine3.18/zts/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.1/alpine3.16/cli/Dockerfile → 8.1/alpine3.18/cli/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1/alpine3.16/cli/docker-php-entrypoint → 8.1/alpine3.18/cli/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/cli/docker-php-ext-configure → 8.1/alpine3.18/cli/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/cli/docker-php-ext-enable → 8.1/alpine3.18/cli/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/cli/docker-php-ext-install → 8.1/alpine3.18/cli/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/cli/docker-php-source → 8.1/alpine3.18/cli/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.1/alpine3.16/fpm/Dockerfile → 8.1/alpine3.18/fpm/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1/alpine3.16/fpm/docker-php-entrypoint → 8.1/alpine3.18/fpm/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/fpm/docker-php-ext-configure → 8.1/alpine3.18/fpm/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/fpm/docker-php-ext-enable → 8.1/alpine3.18/fpm/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/fpm/docker-php-ext-install → 8.1/alpine3.18/fpm/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/fpm/docker-php-source → 8.1/alpine3.18/fpm/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.1/alpine3.16/zts/Dockerfile → 8.1/alpine3.18/zts/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.1/alpine3.16/zts/docker-php-entrypoint → 8.1/alpine3.18/zts/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/zts/docker-php-ext-configure → 8.1/alpine3.18/zts/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/zts/docker-php-ext-enable → 8.1/alpine3.18/zts/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/zts/docker-php-ext-install → 8.1/alpine3.18/zts/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.1/alpine3.16/zts/docker-php-source → 8.1/alpine3.18/zts/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2-rc/alpine3.16/cli/Dockerfile → 8.2-rc/alpine3.18/cli/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2-rc/alpine3.16/cli/docker-php-entrypoint → 8.2-rc/alpine3.18/cli/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/cli/docker-php-ext-configure → ...c/alpine3.18/cli/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/cli/docker-php-ext-enable → 8.2-rc/alpine3.18/cli/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/cli/docker-php-ext-install → 8.2-rc/alpine3.18/cli/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/cli/docker-php-source → 8.2-rc/alpine3.18/cli/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2-rc/alpine3.16/fpm/Dockerfile → 8.2-rc/alpine3.18/fpm/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2-rc/alpine3.16/fpm/docker-php-entrypoint → 8.2-rc/alpine3.18/fpm/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/fpm/docker-php-ext-configure → ...c/alpine3.18/fpm/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/fpm/docker-php-ext-enable → 8.2-rc/alpine3.18/fpm/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/fpm/docker-php-ext-install → 8.2-rc/alpine3.18/fpm/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/fpm/docker-php-source → 8.2-rc/alpine3.18/fpm/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2-rc/alpine3.16/zts/Dockerfile → 8.2-rc/alpine3.18/zts/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2-rc/alpine3.16/zts/docker-php-entrypoint → 8.2-rc/alpine3.18/zts/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 ...c/alpine3.16/zts/docker-php-ext-configure → ...c/alpine3.18/zts/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/zts/docker-php-ext-enable → 8.2-rc/alpine3.18/zts/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/zts/docker-php-ext-install → 8.2-rc/alpine3.18/zts/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2-rc/alpine3.16/zts/docker-php-source → 8.2-rc/alpine3.18/zts/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2/alpine3.16/cli/Dockerfile → 8.2/alpine3.18/cli/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2/alpine3.16/cli/docker-php-entrypoint → 8.2/alpine3.18/cli/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/cli/docker-php-ext-configure → 8.2/alpine3.18/cli/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/cli/docker-php-ext-enable → 8.2/alpine3.18/cli/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/cli/docker-php-ext-install → 8.2/alpine3.18/cli/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/cli/docker-php-source → 8.2/alpine3.18/cli/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2/alpine3.16/fpm/Dockerfile → 8.2/alpine3.18/fpm/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2/alpine3.16/fpm/docker-php-entrypoint → 8.2/alpine3.18/fpm/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/fpm/docker-php-ext-configure → 8.2/alpine3.18/fpm/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/fpm/docker-php-ext-enable → 8.2/alpine3.18/fpm/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/fpm/docker-php-ext-install → 8.2/alpine3.18/fpm/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/fpm/docker-php-source → 8.2/alpine3.18/fpm/docker-php-source
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion 8.2/alpine3.16/zts/Dockerfile → 8.2/alpine3.18/zts/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 8.2/alpine3.16/zts/docker-php-entrypoint → 8.2/alpine3.18/zts/docker-php-entrypoint
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/zts/docker-php-ext-configure → 8.2/alpine3.18/zts/docker-php-ext-configure
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/zts/docker-php-ext-enable → 8.2/alpine3.18/zts/docker-php-ext-enable
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/zts/docker-php-ext-install → 8.2/alpine3.18/zts/docker-php-ext-install
View file
Open in desktop
File renamed without changes.
0 8.2/alpine3.16/zts/docker-php-source → 8.2/alpine3.18/zts/docker-php-source
View file
Open in desktop
File renamed without changes.
32 changes: 16 additions & 16 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"buster/apache",
"buster/fpm",
"buster/zts",
"alpine3.18/cli",
"alpine3.18/fpm",
"alpine3.18/zts",
"alpine3.17/cli",
"alpine3.17/fpm",
"alpine3.17/zts",
"alpine3.16/cli",
"alpine3.16/fpm",
"alpine3.16/zts"
"alpine3.17/zts"
],
"version": "8.1.18"
},
Expand All @@ -54,12 +54,12 @@
"buster/apache",
"buster/fpm",
"buster/zts",
"alpine3.18/cli",
"alpine3.18/fpm",
"alpine3.18/zts",
"alpine3.17/cli",
"alpine3.17/fpm",
"alpine3.17/zts",
"alpine3.16/cli",
"alpine3.16/fpm",
"alpine3.16/zts"
"alpine3.17/zts"
],
"version": "8.1.19RC1"
},
Expand All @@ -76,12 +76,12 @@
"buster/apache",
"buster/fpm",
"buster/zts",
"alpine3.18/cli",
"alpine3.18/fpm",
"alpine3.18/zts",
"alpine3.17/cli",
"alpine3.17/fpm",
"alpine3.17/zts",
"alpine3.16/cli",
"alpine3.16/fpm",
"alpine3.16/zts"
"alpine3.17/zts"
],
"version": "8.2.5"
},
Expand All @@ -98,12 +98,12 @@
"buster/apache",
"buster/fpm",
"buster/zts",
"alpine3.18/cli",
"alpine3.18/fpm",
"alpine3.18/zts",
"alpine3.17/cli",
"alpine3.17/fpm",
"alpine3.17/zts",
"alpine3.16/cli",
"alpine3.16/fpm",
"alpine3.16/zts"
"alpine3.17/zts"
],
"version": "8.2.6RC1"
}
Expand Down
5 changes: 5 additions & 0 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,18 @@ for version in "${versions[@]}"; do
for suite in \
bullseye \
buster \
alpine3.18 \
alpine3.17 \
alpine3.16 \
; do
# https://github.com/docker-library/php/pull/1348
if [ "$rcVersion" = '8.0' ] && [[ "$suite" = alpine* ]] && [ "$suite" != 'alpine3.16' ]; then
continue
fi
# https://github.com/docker-library/php/pull/1405
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With no force pushes, this is impressive - you rolled the dice and won 😂 ❤️

if [ "$suite" = 'alpine3.16' ] && [ "$rcVersion" != '8.0' ]; then
continue
fi
for variant in cli apache fpm zts; do
if [[ "$suite" = alpine* ]]; then
if [ "$variant" = 'apache' ]; then
Expand Down