Skip to content

Commit

Permalink
Bump to Ubuntu Noble + PHP 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
kberzinch committed Apr 21, 2024
1 parent fd47b4d commit 6f136c3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
extensions: bcmath, ctype, curl, fileinfo, gd, intl, json, ldap, mbstring, mysqli, openssl, pdo, redis, sqlite3, tokenizer, uuid, xml, zip
coverage: none
env:
Expand Down
2 changes: 1 addition & 1 deletion .nomad/jedi.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ EOF
mount {
type = "bind"
source = "local/fpm/"
target = "/etc/php/8.2/fpm/pool.d/"
target = "/etc/php/8.3/fpm/pool.d/"
}

entrypoint = [
Expand Down
2 changes: 1 addition & 1 deletion .nomad/scripts/web.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ php artisan config:cache --no-interaction --verbose
php artisan view:cache --no-interaction --verbose
php artisan event:cache --no-interaction --verbose
php artisan route:cache --no-interaction --verbose
exec php-fpm8.2 --force-stderr --nodaemonize --fpm-config /etc/php/8.2/fpm/php-fpm.conf
exec php-fpm8.3 --force-stderr --nodaemonize --fpm-config /etc/php/8.3/fpm/php-fpm.conf
2 changes: 1 addition & 1 deletion .phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

return [
'target_php_version' => '8.2',
'target_php_version' => '8.3',

'directory_list' => [
'.',
Expand Down
26 changes: 13 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY --link routes/ /app/routes/
COPY --link storage/ /app/storage/
COPY --link artisan composer.json composer.lock /app/

FROM debian:bookworm-slim as backend-uncompressed
FROM ubuntu:noble as backend-uncompressed

LABEL maintainer="[email protected]"

Expand All @@ -25,21 +25,21 @@ RUN set -eux && \
apt-get update && \
apt-get upgrade -qq --assume-yes && \
apt-get install -qq --assume-yes \
php8.2-fpm php8.2-mysql php8.2-xml unzip libfcgi-bin php8.2-curl php8.2-mbstring php8.2-intl php8.2-redis php8.2-uuid php8.2-gmp zopfli && \
php8.3-fpm php8.3-mysql php8.3-xml unzip libfcgi-bin php8.3-curl php8.3-mbstring php8.3-intl php8.3-redis php8.3-uuid php8.3-gmp zopfli && \
apt-get autoremove -qq --assume-yes && \
mkdir /app && \
chown www-data:www-data /app && \
sed -i '/pid/c\\' /etc/php/8.2/fpm/php-fpm.conf && \
sed -i '/systemd_interval/c\systemd_interval = 0' /etc/php/8.2/fpm/php-fpm.conf && \
sed -i '/error_log/c\error_log = /local/error.log' /etc/php/8.2/fpm/php-fpm.conf && \
sed -i '/upload_max_filesize/c\upload_max_filesize = 10M' /etc/php/8.2/fpm/php.ini && \
sed -i '/max_file_uploads/c\max_file_uploads = 1' /etc/php/8.2/fpm/php.ini && \
sed -i '/expose_php/c\expose_php = Off' /etc/php/8.2/fpm/php.ini && \
sed -i '/expose_php/c\expose_php = Off' /etc/php/8.2/cli/php.ini && \
sed -i '/allow_url_fopen/c\allow_url_fopen = Off' /etc/php/8.2/fpm/php.ini && \
sed -i '/allow_url_fopen/c\allow_url_fopen = Off' /etc/php/8.2/cli/php.ini && \
sed -i '/allow_url_include/c\allow_url_include = Off' /etc/php/8.2/fpm/php.ini && \
sed -i '/allow_url_include/c\allow_url_include = Off' /etc/php/8.2/cli/php.ini
sed -i '/pid/c\\' /etc/php/8.3/fpm/php-fpm.conf && \
sed -i '/systemd_interval/c\systemd_interval = 0' /etc/php/8.3/fpm/php-fpm.conf && \
sed -i '/error_log/c\error_log = /local/error.log' /etc/php/8.3/fpm/php-fpm.conf && \
sed -i '/upload_max_filesize/c\upload_max_filesize = 10M' /etc/php/8.3/fpm/php.ini && \
sed -i '/max_file_uploads/c\max_file_uploads = 1' /etc/php/8.3/fpm/php.ini && \
sed -i '/expose_php/c\expose_php = Off' /etc/php/8.3/fpm/php.ini && \
sed -i '/expose_php/c\expose_php = Off' /etc/php/8.3/cli/php.ini && \
sed -i '/allow_url_fopen/c\allow_url_fopen = Off' /etc/php/8.3/fpm/php.ini && \
sed -i '/allow_url_fopen/c\allow_url_fopen = Off' /etc/php/8.3/cli/php.ini && \
sed -i '/allow_url_include/c\allow_url_include = Off' /etc/php/8.3/fpm/php.ini && \
sed -i '/allow_url_include/c\allow_url_include = Off' /etc/php/8.3/cli/php.ini

COPY --link --from=composer /usr/bin/composer /usr/bin/composer

Expand Down

0 comments on commit 6f136c3

Please sign in to comment.