Skip to content

Commit

Permalink
fix: correctly reference v8.3 within overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Dec 20, 2023
1 parent 476de01 commit c884205
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion latest/overlay/etc/container.d/05-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [[ "${PHP_SKIP_TEMPLATES}" != "true" ]]; then
echo "> writing fpm config"
gomplate -V \
-o /etc/php82/php-fpm.conf \
-o /etc/php83/php-fpm.conf \
-f /etc/templates/php-fpm.conf.tmpl

if [[ $? -ne 0 ]]; then
Expand Down
14 changes: 7 additions & 7 deletions latest/overlay/etc/entrypoint.d/10-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if [[ "${PHP_SKIP_TEMPLATES}" != "true" ]]; then
gomplate \
-o /etc/php82/php.ini \
-o /etc/php83/php.ini \
-f /etc/templates/php.ini.tmpl || exit 1

if [[ $? -ne 0 ]]; then
Expand All @@ -11,20 +11,20 @@ if [[ "${PHP_SKIP_TEMPLATES}" != "true" ]]; then
fi
fi

for TEMPLATE in $(find /etc/php82/custom.d -mindepth 1 -type d); do
for TEMPLATE in $(find /etc/php83/custom.d -mindepth 1 -type d); do
RELATIVENAME=${TEMPLATE//\/etc\/php8\/custom.d\//}

if [ ! -d "/etc/php82/conf.d/${RELATIVENAME}" ]; then
mkdir "/etc/php82/conf.d/${RELATIVENAME}"
if [ ! -d "/etc/php83/conf.d/${RELATIVENAME}" ]; then
mkdir "/etc/php83/conf.d/${RELATIVENAME}"
fi
done

for TEMAPLTE in $(find /etc/php82/custom.d -mindepth 1 -type f); do
for TEMAPLTE in $(find /etc/php83/custom.d -mindepth 1 -type f); do
RELATIVENAME=${TEMPLATE//\/etc\/php8\/custom.d\//}

ln -sf \
"/etc/php82/conf.d/${RELATIVENAME}" \
"/etc/php82/custom.d/${RELATIVENAME}"
"/etc/php83/conf.d/${RELATIVENAME}" \
"/etc/php83/custom.d/${RELATIVENAME}"
done

true
6 changes: 3 additions & 3 deletions latest/overlay/etc/templates/php.ini.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ default_charset = "UTF-8"
;input_encoding =
;output_encoding =

;include_path = ".:/php82/includes"
;include_path = ".:/php83/includes"

doc_root =
user_dir =

extension_dir = "/usr/lib/php82/modules"
extension_dir = "/usr/lib/php83/modules"
;sys_temp_dir = "/tmp"
enable_dl = {{ getenv "PHP_ENABLE_DL" }}

Expand Down Expand Up @@ -241,7 +241,7 @@ pgsql.log_notice = 0
bcmath.scale = 0

[browscap]
browscap = /etc/php82/browscap.ini
browscap = /etc/php83/browscap.ini

[Session]
session.save_handler = files
Expand Down

0 comments on commit c884205

Please sign in to comment.