Skip to content

Commit 7f6a537

Browse files
fix(diskover): use Ubuntu default php packages (php-cli/php-fpm) for noble base
Upstream python-node base image is now Ubuntu 26.04 (resolute), which ships PHP 8.5 by default; the previously hardcoded php8.3-cli / php8.3-style fpm config paths no longer exist, causing apt to fail to locate the package and breaking the release build (run 25485774052). - Switch to versionless php-cli / php-fpm / php-sqlite3 packages so the Dockerfile follows the base image's default PHP version. - Replace the Alpine-style /etc/php83 config-tweak with a glob over /etc/php/*/fpm/pool.d/www.conf so it works on any Debian/Ubuntu PHP. - Update start.sh to invoke the default 'php' binary instead of php8.3. Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com>
1 parent 05484d8 commit 7f6a537

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

apps/diskover/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ RUN \
2222
echo "**** install runtime packages ****" && \
2323
apt-get install -y --no-install-recommends \
2424
ncurses-bin \
25-
php8.3-cli \
25+
php-cli \
2626
php-sqlite3 \
2727
php-fpm \
2828
python3-pip \
2929
python3 \
3030
python3-venv && \
3131
echo "**** configure php-fpm to pass env vars ****" && \
32-
if [ -f /etc/php83/php-fpm.d/www.conf ]; then sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf; fi && \
32+
for f in /etc/php/*/fpm/pool.d/www.conf; do \
33+
[ -f "$f" ] || continue; \
34+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' "$f"; \
35+
grep -qxF 'clear_env = no' "$f" || echo 'clear_env = no' >> "$f"; \
36+
fpmconf="$(dirname "$(dirname "$f")")/php-fpm.conf"; \
37+
[ -f "$fpmconf" ] && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> "$fpmconf"; \
38+
done && \
3339
echo "**** install diskover ****" && \
3440
if [ -z ${DISKOVER_RELEASE+x} ]; then \
3541
DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \

apps/diskover/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ if [ -f "/config/diskover.cfg" ]; then
3838
done
3939
fi
4040

41-
exec php8.3 -S 0.0.0.0:80 -t /app/diskover-web/public
41+
exec php -S 0.0.0.0:80 -t /app/diskover-web/public

0 commit comments

Comments
 (0)