Skip to content

Add an fpm-zts build #1343

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions Dockerfile-linux.template
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,13 @@ RUN set -eux; \
{{ if env.variant == "apache" then ( -}}
\
--with-apxs2 \
{{ ) elif env.variant == "fpm" then ( -}}
{{ ) elif (env.variant == "fpm" or env.variant == "fpm-zts") then ( -}}
\
--enable-fpm \
--with-fpm-user=www-data \
--with-fpm-group=www-data \
{{ ) elif env.variant == "zts" then ( -}}
{{ ) else "" end -}}
{{ if (env.variant == "zts" or env.variant == "fpm-zts") then ( -}}
\
{{ if (.version | version_id) >= ("8" | version_id) then ( -}}
--enable-zts \
Expand Down Expand Up @@ -474,7 +475,7 @@ COPY apache2-foreground /usr/local/bin/
WORKDIR /var/www/html

EXPOSE 80
{{ ) elif env.variant == "fpm" then ( -}}
{{ ) elif (env.variant == "fpm" or env.variant == "fpm-zts") then ( -}}
WORKDIR /var/www/html

RUN set -eux; \
Expand Down
1 change: 1 addition & 0 deletions apply-templates.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ for version; do
case "$variant" in
apache) cmd='["apache2-foreground"]' ;;
fpm) cmd='["php-fpm"]' ;;
fpm-zts) cmd='["php-fpm"]' ;;
*) cmd='["php", "-a"]' ;;
esac
export cmd
Expand Down
2 changes: 1 addition & 1 deletion versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ for version in "${versions[@]}"; do
alpine3.16 \
alpine3.15 \
; do
for variant in cli apache fpm zts; do
for variant in cli apache fpm fpm-zts zts; do
if [[ "$suite" = alpine* ]]; then
if [ "$variant" = 'apache' ]; then
continue
Expand Down