Update to latest PHPDocker.io config.

Author: Crell

docker-compose.yml

@@ -3,21 +3,21 @@
 ###############################################################################
 
 services:
-    webserver:
-        image: 'nginx:alpine'
-        working_dir: /app
-        volumes:
-            - '.:/app'
-            - './phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf'
-        ports:
-            - '30000:80'
+#    webserver:
+#        image: 'nginx:alpine'
+#        working_dir: /app
+#        volumes:
+#            - '.:/app'
+#            - './phpdocker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf'
+#        ports:
+#            - '30000:80'
 
     php-fpm:
         build: phpdocker/php-fpm
         working_dir: /app
+        environment:
+            PHP_IDE_CONFIG: "serverName=Docker"
         volumes:
             - '.:/app'
             - './phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.4/fpm/conf.d/99-overrides.ini'
             - './phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/8.4/cli/conf.d/99-overrides.ini'
-        environment:
-            PHP_IDE_CONFIG: "serverName=Docker"

phpdocker/README.html

@@ -75,7 +75,7 @@ <h2>Services exposed outside your environment</h2>
 <tbody>
 <tr>
   <td>Webserver</td>
-  <td><a href="http://localhost:30000">localhost:30000</a></td>
+  <td><a href="http://localhost:40000">localhost:40000</a></td>
 </tr>
 </tbody>
 </table>

phpdocker/README.md

@@ -30,7 +30,7 @@ add your own hostname on your `/etc/hosts`
 
 Service|Address outside containers
 -------|--------------------------
-Webserver|[localhost:30000](http://localhost:30000)
+Webserver|[localhost:40000](http://localhost:40000)
 
 ## Hosts within your environment ##
 

phpdocker/nginx/nginx.conf

@@ -6,7 +6,7 @@ server {
     access_log /var/log/nginx/application.access.log;
 
     root /app/public;
-    index index.html index.php;
+    index index.php;
 
     # try to serve file directly, fallback to index.php
     location / {

phpdocker/php-fpm/Dockerfile

@@ -1,75 +1,9 @@
-## Cloned and modified from phpdocker.io's 8.3 base image.
+FROM phpdockerio/php:8.4-fpm
+WORKDIR "/app"
 
-### CLI ###
-
-FROM ubuntu:noble AS cli
-
-# Fixes some weird terminal issues such as broken clear / CTRL+L
-ENV TERM=linux
-
-# Ensure apt doesn't ask questions when installing stuff
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install Ondrej repos for Ubuntu jammy, PHP, composer and selected extensions - better selection than
-# the distro's packages
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
-    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
-    && apt-get update \
     && apt-get -y --no-install-recommends install \
-        ca-certificates \
-        curl \
-        unzip \
-        php8.4-cli \
-        php8.4-curl \
-        php8.4-mbstring \
-        php8.4-opcache \
-        php8.4-readline \
-        php8.4-xml \
-        php8.4-pdo \
-        php8.4-pdo-sqlite \
-        php8.4-dev \
-        php-pear \
-        make \
         git \
-        nano \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* ~/.composer
-
-#=== Install xdebug via PIE (PHP Extension Installer) ===
-#ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-#RUN install-php-extensions xdebug/xdebug@master \
-#    && docker-php-ext-enable xdebug
-
-RUN pecl install xdebug-3.4.0
-
-#RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
-#    && cd xdebug && git reset --hard 65f7f69f34 && rm -r .git
-
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
-
-CMD ["php", "-a"]
-
-# Git keeps whining if I don't do this.
-RUN git config --global --add safe.directory /app
-
-### FPM ###
-
-FROM cli AS fpm
-
-# Install FPM
-RUN apt-get update \
-    && apt-get -y --no-install-recommends install php8.4-fpm \
+        php8.4-xdebug \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
-
-STOPSIGNAL SIGQUIT
-
-# PHP-FPM packages need a nudge to make them docker-friendly
-COPY overrides.conf /etc/php/8.4/fpm/pool.d/z-overrides.conf
-
-CMD ["/usr/sbin/php-fpm8.4", "-O" ]
-
-# Open up fcgi port
-EXPOSE 9000

phpdocker/php-fpm/php-ini-overrides.ini

@@ -9,4 +9,4 @@ xdebug.client_port=9000
 display_errors=On
 xdebug.idekey=Docker
 
-zend_extension=/usr/lib/php/20240924/xdebug.so
+zend_extension=/usr/lib/php/20240924/xdebug.so