File tree Expand file tree Collapse file tree 8 files changed +251
-207
lines changed
Expand file tree Collapse file tree 8 files changed +251
-207
lines changed Original file line number Diff line number Diff line change 1+ <<<<<<<< Updated upstream:.docker/php8.3-cli/Dockerfile
2+ FROM php:8.3-cli
3+ ========
4+ FROM php:8.2-cli
5+ >>>>>>>> Stashed changes:.docker/php8.2-cli/Dockerfile
6+ WORKDIR "/opt/php"
7+
8+ ENV DEBIAN_FRONTEND noninteractive
9+
10+ RUN apt-get update && \
11+ apt-get install -y zip libzip-dev && \
12+ pecl channel-update pecl.php.net && \
13+ pecl install xdebug && \
14+ docker-php-ext-install bcmath zip && \
15+ docker-php-source delete && \
16+ rm -r /tmp/* /var/cache/*
17+
18+ <<<<<<<< Updated upstream:.docker/php8.3-cli/Dockerfile
19+ COPY ./.docker/php8.3-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
20+ ========
21+ COPY ./.docker/php8.2-cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
22+ >>>>>>>> Stashed changes:.docker/php8.2-cli/Dockerfile
23+
24+ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
25+ && php composer-setup.php \
26+ && php -r "unlink('composer-setup.php');" \
27+ && chmod +x composer.phar \
28+ && mv composer.phar /usr/local/bin/composer
File renamed without changes.
Original file line number Diff line number Diff line change 1- FROM php:8.3 -cli
1+ FROM php:8.4 -cli
22WORKDIR "/opt/php"
33
44ENV DEBIAN_FRONTEND noninteractive
@@ -11,7 +11,7 @@ RUN apt-get update && \
1111 docker-php-source delete && \
1212 rm -r /tmp/* /var/cache/*
1313
14- COPY ./.docker/php8.3 -cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
14+ COPY ./.docker/php8.0 -cli/php-ini-overrides.ini /usr/local/etc/php/conf.d/99-overrides.ini
1515
1616RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
1717 && php composer-setup.php \
Original file line number Diff line number Diff line change 1+ error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
2+ error_log = /dev/stderr
3+ log_errors = On
4+ display_startup_errors = Off
5+ date.timezone = UTC
6+ upload_max_filesize = 8M
7+ post_max_size = 8M
8+ html_errors = Off
9+ memory_limit = 512M
10+ max_execution_time = 60
11+ expose_php = Off
12+ zend_extension =xdebug.so
13+ xdebug.mode =coverage
Original file line number Diff line number Diff line change 1111 }
1212 ],
1313 "require" : {
14- "php" : " ^8.0 " ,
14+ "php" : " ^8.2 " ,
1515 "psr/http-message" : " ~1.0" ,
1616 "psr/http-server-handler" : " ~1.0" ,
1717 "psr/http-server-middleware" : " ~1.0" ,
You can’t perform that action at this time.
0 commit comments