Browse Source

temp fix for xdebug+php8 bug on ap2i

Olivier Massot 1 year ago
parent
commit
69a442a3cc
4 changed files with 22 additions and 7 deletions
  1. 6 6
      docker/ap2i/Dockerfile
  2. 1 1
      docker/ap2i/conf/xdebug.ini
  3. 1 0
      docker/nginx/site_ap2i.conf
  4. 14 0
      icon.svg

+ 6 - 6
docker/ap2i/Dockerfile

@@ -1,5 +1,5 @@
 # ./docker/php/Dockerfile
-FROM php:8.2.1-fpm
+FROM php:8.2.13-fpm
 ARG COMPOSER_HASH
 ARG OS
 ARG HOST
@@ -90,13 +90,13 @@ COPY /.ssh /root/.ssh
 COPY /docker/ap2i/conf/memory.ini /usr/local/etc/php/conf.d
 COPY /docker/ap2i/conf/apc.ini /usr/local/etc/php/conf.d
 COPY /docker/ap2i/conf/execution_time.ini /usr/local/etc/php/conf.d
-COPY /docker/ap2i/conf/xdebug.ini /usr/local/etc/php/conf.d
+#COPY /docker/ap2i/conf/xdebug.ini /usr/local/etc/php/conf.d
 
 ######## XDebug ########
-COPY /docker/ap2i/conf/update_xdebug_ini.php /usr/local/etc/php/conf.d
-RUN pecl install xdebug \
- && docker-php-ext-enable xdebug \
- && php /usr/local/etc/php/conf.d/update_xdebug_ini.php $OS $HOST
+#COPY /docker/ap2i/conf/update_xdebug_ini.php /usr/local/etc/php/conf.d
+#RUN pecl install xdebug \
+# && docker-php-ext-enable xdebug \
+# && php /usr/local/etc/php/conf.d/update_xdebug_ini.php $OS $HOST
 
 ######## FACL and Start ########
 ## Create .env.local file

+ 1 - 1
docker/ap2i/conf/xdebug.ini

@@ -9,4 +9,4 @@ xdebug.client_port = 9003
 
 ; Client host is "host.docker.internal" on Mac or Windows,
 ; or your current machine's name on unix (type 'hostname' in a terminal)
-xdebug.client_host = host.docker.internal
+xdebug.client_host = dev

+ 1 - 0
docker/nginx/site_ap2i.conf

@@ -19,6 +19,7 @@ server {
     proxy_buffer_size 128k;
     proxy_buffers 4 256k;
     proxy_busy_buffers_size 256k;
+    client_max_body_size 20m;
 
     location ~ ^/index\.php(/|$) {
         fastcgi_pass ap2i:9000;

+ 14 - 0
icon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 439 309" style="enable-background:new 0 0 439 309;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1D63ED;}
+</style>
+<path class="st0" d="M379.6,111.7c-2.3-16.7-11.5-31.2-28.1-44.3l-9.6-6.5l-6.4,9.7c-8.2,12.5-12.3,29.9-11,46.6
+	c0.6,5.8,2.5,16.4,8.4,25.5c-5.9,3.3-17.6,7.7-33.2,7.4H1.7l-0.6,3.5c-2.8,16.7-2.8,69,30.7,109.1c25.5,30.5,63.6,46,113.4,46
+	c108,0,187.8-50.3,225.3-141.9c14.7,0.3,46.4,0.1,62.7-31.4c0.4-0.7,1.4-2.6,4.2-8.6l1.6-3.3l-9.1-6.2
+	C419.9,110.8,397.2,108.3,379.6,111.7L379.6,111.7z M240,0h-45.3v41.7H240V0z M240,50.1h-45.3v41.7H240V50.1z M186.4,50.1h-45.3
+	v41.7h45.3V50.1z M132.9,50.1H87.6v41.7h45.3V50.1z M79.3,100.2H34v41.7h45.3V100.2z M132.9,100.2H87.6v41.7h45.3V100.2z
+	 M186.4,100.2h-45.3v41.7h45.3V100.2z M240,100.2h-45.3v41.7H240V100.2z M293.6,100.2h-45.3v41.7h45.3V100.2z"/>
+</svg>