updated docker with variables and other changes

Author: susonwaiba

docker-compose.yml

@@ -2,24 +2,36 @@ version: '3'
 
 services:
   fpm:
-    build: php${PHP_VERSION}/fpm
-    depends_on:
-      - mariadb
-      - redis
+    build:
+      context: php${PHP_VERSION}/fpm
+      args:
+        PHP_ENABLE_REDIS: ${PHP_ENABLE_REDIS}
+        PHP_ENABLE_XDEBUG: ${PHP_ENABLE_XDEBUG}
+        PHP_ENABLE_MONGODB: ${PHP_ENABLE_MONGODB}
+    ports:
+      - ${PHP_FPM_PORT}:9000
     volumes:
       - ./project:/var/www/project
+    depends_on:
+      - mariadb
+      # - mongodb
+      # - redis
 
   cli:
     build:
       context: php${PHP_VERSION}/cli
       args:
         NODE_VERSION: ${NODE_VERSION}
+        PHP_ENABLE_REDIS: ${PHP_ENABLE_REDIS}
+        PHP_ENABLE_XDEBUG: ${PHP_ENABLE_XDEBUG}
+        PHP_ENABLE_MONGODB: ${PHP_ENABLE_MONGODB}
     working_dir: /var/www/project
     volumes:
       - ./project:/var/www/project
     depends_on:
       - mariadb
-      - redis
+      # - mongodb
+      # - redis
 
   nginx:
     image: nginx:alpine
@@ -28,11 +40,10 @@ services:
     volumes:
       - ./project:/var/www/project
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:cached
+    environment:
+      - PHP_FPM_PORT=${PHP_FPM_PORT}
     depends_on:
       - fpm
-
-  redis:
-    image: redis:alpine
 
   mariadb:
     image: mariadb:${MARIADB_VERSION}
@@ -56,3 +67,21 @@ services:
       - mariadb
     ports:
       - ${PHPMYADMIN_PORT}:80
+
+  # mongodb:
+  #   image: mongo:${MONGODB_VERSION}
+  #   ports:
+  #     - ${MONGODB_PORT}:27017
+  #   environment:
+  #     MONGO_INITDB_ROOT_USERNAME: ${MONGODB_ROOT_USERNAME}
+  #     MONGO_INITDB_ROOT_PASSWORD: ${MONGODB_ROOT_PASSWORD}
+  #   volumes:
+  #     - ./data/mongodb:/data/db
+
+  # redis:
+  #   image: redis:alpine
+
+  mailcatcher:
+    image: sj26/mailcatcher
+    ports:
+      - ${MAILCATCHER_PORT}:1080

php7.4/cli/Dockerfile

@@ -1,9 +1,6 @@
 FROM php:7.4-cli
 
-MAINTAINER ReadyMadeHost
-
-ARG NODE_VERSION
-ENV NODE_VERSION ${NODE_VERSION}
+LABEL maintainer="ReadyMadeHost http://readymadehost.com"
 
 # Installing required packages
 RUN apt-get update && apt-get upgrade -y
@@ -36,10 +33,15 @@ RUN docker-php-ext-install \
 	opcache \
 	gd
 
-# Installing others dependencies
+RUN pecl install apcu
+RUN docker-php-ext-enable apcu
+
+# Installing other extensions but enabled dynamically
 RUN pecl install redis
-RUN docker-php-ext-enable redis
-# RUN pecl install mongodb-1.8.0
+# RUN docker-php-ext-enable redis
+RUN pecl install xdebug
+# RUN docker-php-ext-enable xdebug
+RUN pecl install mongodb
 # RUN docker-php-ext-enable mongodb
 
 # Updating php.ini
@@ -53,6 +55,9 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 RUN wget https://get.symfony.com/cli/installer -O - | bash
 RUN echo 'export PATH="$HOME/.symfony/bin:$PATH"' >> ~/.bashrc
 
+ARG NODE_VERSION
+ENV NODE_VERSION ${NODE_VERSION}
+
 # Installing node
 RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
 RUN apt-get -y install nodejs
@@ -63,7 +68,15 @@ ADD manage-project-permission.sh /root/manage-project-permission.sh
 RUN chmod +x /root/manage-project-permission.sh
 RUN echo 'alias mpp="/root/manage-project-permission.sh"' >> /root/.bashrc
 RUN /root/manage-project-permission.sh
+
+ARG PHP_ENABLE_REDIS
+ENV PHP_ENABLE_REDIS ${PHP_ENABLE_REDIS}
+ARG PHP_ENABLE_XDEBUG
+ENV PHP_ENABLE_XDEBUG ${PHP_ENABLE_XDEBUG}
+ARG PHP_ENABLE_MONGODB
+ENV PHP_ENABLE_MONGODB ${PHP_ENABLE_MONGODB}
+
 ADD docker-entrypoint.sh /root/docker-entrypoint.sh
 RUN chmod +x /root/docker-entrypoint.sh
 
-CMD ["/root/docker-entrypoint.sh"]
+CMD ["/root/docker-entrypoint.sh", "bash"]

php7.4/cli/docker-entrypoint.sh

@@ -2,4 +2,19 @@
 
 /root/manage-project-permission.sh
 
+if [ ${PHP_ENABLE_REDIS} -eq "1" ]; then
+    docker-php-ext-enable redis
+    echo "-- php cli redis extension enabled"
+fi
+
+if [ ${PHP_ENABLE_XDEBUG} -eq "1" ]; then
+    docker-php-ext-enable xdebug
+    echo "-- php cli xdebug extension enabled"
+fi
+
+if [ ${PHP_ENABLE_MONGODB} -eq "1" ]; then
+    docker-php-ext-enable mongodb
+    echo "-- php cli mongodb extension enabled"
+fi
+
 tail -f /dev/null

php7.4/fpm/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.4-fpm
 
-MAINTAINER ReadyMadeHost
+LABEL maintainer="ReadyMadeHost http://readymadehost.com"
 
 # Installing required packages
 RUN apt-get update && apt-get upgrade -y
@@ -26,13 +26,29 @@ RUN docker-php-ext-install \
 	opcache \
 	gd
 
-# Installing others dependencies
+RUN pecl install apcu
+RUN docker-php-ext-enable apcu
+
+# Installing other extensions but enabled dynamically
 RUN pecl install redis
-RUN docker-php-ext-enable redis
-# RUN pecl install mongodb-1.8.0
+# RUN docker-php-ext-enable redis
+RUN pecl install xdebug
+# RUN docker-php-ext-enable xdebug
+RUN pecl install mongodb
 # RUN docker-php-ext-enable mongodb
 
 # Updating php.ini
 ADD conf/php.ini /usr/local/etc/php/php.ini
 
-CMD ["php-fpm", "-F"]
+ARG PHP_ENABLE_REDIS
+ENV PHP_ENABLE_REDIS ${PHP_ENABLE_REDIS}
+ARG PHP_ENABLE_XDEBUG
+ENV PHP_ENABLE_XDEBUG ${PHP_ENABLE_XDEBUG}
+ARG PHP_ENABLE_MONGODB
+ENV PHP_ENABLE_MONGODB ${PHP_ENABLE_MONGODB}
+
+# Add scripts
+ADD docker-entrypoint.sh /root/docker-entrypoint.sh
+RUN chmod +x /root/docker-entrypoint.sh
+
+CMD ["/root/docker-entrypoint.sh", "php-fpm", "-F"]

php7.4/fpm/docker-entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ ${PHP_ENABLE_REDIS} -eq "1" ]; then
+    docker-php-ext-enable redis
+    echo "-- php fpm redis extension enabled"
+fi
+
+if [ ${PHP_ENABLE_XDEBUG} -eq "1" ]; then
+    docker-php-ext-enable xdebug
+    echo "-- php fpm xdebug extension enabled"
+fi
+
+if [ ${PHP_ENABLE_MONGODB} -eq "1" ]; then
+    docker-php-ext-enable mongodb
+    echo "-- php fpm mongodb extension enabled"
+fi
+
+exec "$@"