Skip to content
Merged
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
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ RUN sed -i "s|\${PHP_VERSION}|${PHP_VERSION}|g" /etc/nginx/snippets/fastcgi-php"
sed -i "s|\${PHP_VERSION}|${PHP_VERSION}|g" /etc/nginx/sites-available/default && \
sed -i "s|\${USER}|${USER}|g; s|\${PHP_VERSION}|${PHP_VERSION}|g" /etc/php/"${PHP_VERSION}"/fpm/pool.d/www.conf && \
grep -q "^include=/etc/php/${PHP_VERSION}/fpm/pool.d/*.conf" /etc/php/"${PHP_VERSION}"/fpm/php-fpm.conf || \
echo "include=/etc/php/${PHP_VERSION}/fpm/pool.d/*.conf" >> /etc/php/"${PHP_VERSION}"/fpm/php-fpm.conf
echo "include=/etc/php/${PHP_VERSION}/fpm/pool.d/*.conf" >> /etc/php/"${PHP_VERSION}"/fpm/php-fpm.conf && \
ln -sf /etc/nginx/snippets/fastcgi-php"${PHP_VERSION}".conf /etc/nginx/snippets/fastcgi-php8.4.conf

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 PHP 8.4 image build fails

With PHP_VERSION=8.4 and an available package version, ln attempts to replace the snippet with a link to itself. It exits with an error, so the image build fails.

Suggested change
ln -sf /etc/nginx/snippets/fastcgi-php"${PHP_VERSION}".conf /etc/nginx/snippets/fastcgi-php8.4.conf
if [ "${PHP_VERSION}" != "8.4" ]; then ln -sf /etc/nginx/snippets/fastcgi-php"${PHP_VERSION}".conf /etc/nginx/snippets/fastcgi-php8.4.conf; fi

Devin Review


Was this helpful? React with 👍 or 👎 to provide feedback.


# Set PHP-FPM socket permissions in the configuration
RUN sed -i "s|^error_log =.*|error_log = /dev/stderr|" /etc/php/"${PHP_VERSION}"/fpm/php-fpm.conf && \
Expand Down
Loading