Skip to content

Commit

Permalink
Merge pull request #4 from Larium/feature/phpupgrade
Browse files Browse the repository at this point in the history
Upgrade to php 8.4
  • Loading branch information
akDeveloper authored Nov 29, 2024
2 parents 55013f7 + 337058d commit 2941025
Show file tree
Hide file tree
Showing 8 changed files with 251 additions and 207 deletions.
28 changes: 28 additions & 0 deletions .docker/php8.2-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<<<<<<<< Updated upstream:.docker/php8.3-cli/Dockerfile
FROM php:8.3-cli
========
FROM php:8.2-cli
>>>>>>>> Stashed changes:.docker/php8.2-cli/Dockerfile
WORKDIR "/opt/php"

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \
apt-get install -y zip libzip-dev && \
pecl channel-update pecl.php.net && \
pecl install xdebug && \
docker-php-ext-install bcmath zip && \
docker-php-source delete && \
rm -r /tmp/* /var/cache/*

<<<<<<<< Updated upstream:.docker/php8.3-cli/Dockerfile
COPY ./.docker/php8.3-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
========
COPY ./.docker/php8.2-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
>>>>>>>> Stashed changes:.docker/php8.2-cli/Dockerfile

RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php composer-setup.php \
&& php -r "unlink('composer-setup.php');" \
&& chmod +x composer.phar \
&& mv composer.phar /usr/local/bin/composer
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3-cli
FROM php:8.4-cli
WORKDIR "/opt/php"

ENV DEBIAN_FRONTEND noninteractive
Expand All @@ -11,7 +11,7 @@ RUN apt-get update && \
docker-php-source delete && \
rm -r /tmp/* /var/cache/*

COPY ./.docker/php8.3-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
COPY ./.docker/php8.0-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini

RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php composer-setup.php \
Expand Down
13 changes: 13 additions & 0 deletions .docker/php8.4-cli/php-ini-overrides.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
error_log = /dev/stderr
log_errors = On
display_startup_errors = Off
date.timezone = UTC
upload_max_filesize = 8M
post_max_size = 8M
html_errors = Off
memory_limit = 512M
max_execution_time = 60
expose_php = Off
zend_extension=xdebug.so
xdebug.mode=coverage
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.2",
"psr/http-message": "~1.0",
"psr/http-server-handler": "~1.0",
"psr/http-server-middleware": "~1.0",
Expand Down
Loading

0 comments on commit 2941025

Please sign in to comment.