✨ add alpine images

Author: Kanti

.additional_bashrc.sh

@@ -1,14 +1,12 @@
 export LS_COLORS="${LS_COLORS}di=1;34:"
-export EXA_COLORS="da=1;34:gm=1;34"
-alias ls='exa'
-alias ll='ls -aalh --git --header --group'
+alias ll='ls -alh'
 export PATH=$PATH:~/.config/composer/vendor/bin:./bin:./vendor/bin:./node_modules/.bin
 
 # only enable docker aliases if docker-socket is mounted
 CONTAINER_ID=$(basename $(findmnt /etc/hosts -o SOURCE | grep -o 'containers\/.\+\/'))
 export HOST_DISPLAY_NAME=$HOSTNAME
 if sudo docker ps -q &>/dev/null; then
-  DOCKER_COMPOSE_PROJECT=$(sudo docker inspect ${CONTAINER_ID} | grep '"com.docker.compose.project":' | awk '{print $2}' | tr --delete '"' | tr --delete ',')
+  DOCKER_COMPOSE_PROJECT=$(sudo docker inspect ${CONTAINER_ID} | jq -r '.[0].Config.Labels."com.docker.compose.project"')
   export NODE_CONTAINER=$(sudo docker ps -f "name=${DOCKER_COMPOSE_PROJECT}" --format {{.Names}} | grep node)
   export HOST_DISPLAY_NAME=$(sudo docker inspect ${CONTAINER_ID} --format='{{.Name}}')
   export HOST_DISPLAY_NAME=${HOST_DISPLAY_NAME:1}
@@ -26,6 +24,8 @@ if [[ $CONTAINER_ID != ${HOSTNAME}* ]] ; then
   export HOST_DISPLAY_NAME=$HOSTNAME
 fi
 
+source ~/.bash_git
+
 PS1='\033]2;'$(pwd)'\007\[\e[0;36m\][\[\e[1;31m\]\u\[\e[0;36m\]@\[\e[1;34m\]$HOST_DISPLAY_NAME\[\e[0;36m\]: \[\e[0m\]\w\[\e[0;36m\]]\[\e[0m\]\$\[\e[1;32m\]\s\[\e[0;33m\]$(__git_ps1)\[\e[0;36m\]> \[\e[0m\]\n$ ';
 
 alias xdebug-toggle='test $(php -m | grep xdebug) && xdebug-disable && echo "xdebug disabled" || (xdebug-enable && echo "xdebug enabled")'

.github/workflows/main.yml

@@ -19,6 +19,7 @@ jobs:
       matrix:
         php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         webserver: [ 'apache', 'nginx' ]
+        distroAddon: [ '', '-alpine' ]
     steps:
       -
         name: Set up QEMU
@@ -36,13 +37,15 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push ${{ matrix.webserver }}-${{ matrix.php }}
+        name: Build and push ${{ matrix.webserver }}-${{ matrix.php }}-${{ matrix.distro }}
         id: docker_build
         uses: docker/build-push-action@v2
         with:
           push: ${{ github.ref == 'refs/heads/main' }}
-          tags: pluswerk/php-dev:${{ matrix.webserver }}-${{ matrix.php }},pluswerk/php-dev:${{ matrix.webserver }}-${{ matrix.php }}-${{ steps.date.outputs.date }}
-          build-args: FROM=webdevops/php-${{ matrix.webserver }}-dev:${{ matrix.php }}
+          tags: pluswerk/php-dev:${{ matrix.webserver }}-${{ matrix.php }}${{ matrix.distroAddon }},pluswerk/php-dev:${{ matrix.webserver }}-${{ matrix.php }}${{ matrix.distroAddon }}-${{ steps.date.outputs.date }}
+          build-args: |
+            FROM=webdevops/php-${{ matrix.webserver }}-dev:${{ matrix.php }}${{ matrix.distroAddon }}
+            DIST_ADDON=${{ matrix.distroAddon }}
       -
         name: Image digest
         run: |

Dockerfile

@@ -1,73 +1,60 @@
-ARG FROM=webdevops/php-nginx-dev:8.0
-FROM $FROM
-
-ENV XHPROF_VERSION=5.0.4
-
-# Install additional software
+ARG FROM=webdevops/php-nginx-dev:8.2
+ARG DIST_ADDON=
+FROM $FROM as base-alpine
+# Install additional software Alpine:
+RUN apk add --no-cache sudo vim nano less tree bash-completion mariadb-client iputils sshpass gdb tzdata findmnt jq docker-cli && \
+    echo "application ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+FROM $FROM as base
+# Install additional software Debian:
 RUN apt-get update && \
-  apt-get install -y sudo vim nano less tree bash-completion mariadb-client iputils-ping sshpass gdb exa && \
+  apt-get install -y sudo vim nano less tree bash-completion mariadb-client iputils-ping sshpass gdb jq && \
   usermod -aG sudo application && \
   echo "application ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
   curl -fsSL https://get.docker.com/ | sh && \
   rm -rf /var/lib/apt/lists/*
 
-# Install XHProf
-COPY profiler.php /opt/docker/profiler.php
-
-RUN cd /tmp && \
-      wget https://github.com/tideways/php-xhprof-extension/archive/v${XHPROF_VERSION}.zip && \
-      unzip v${XHPROF_VERSION}.zip && \
-      cd php-xhprof-extension-${XHPROF_VERSION} && \
-      phpize && \
-      ./configure && \
-      make && \
-      make install && \
-    cd / && \
-      rm -rf /tmp/php-xhprof-extension-${XHPROF_VERSION} && \
-      echo "extension=tideways_xhprof.so" >> /opt/docker/etc/php/php.ini && \
-      echo "auto_prepend_file=/opt/docker/profiler.php" >> /opt/docker/etc/php/php.ini
+FROM base${DIST_ADDON}
 
-RUN pecl install pcov && \
-   docker-php-ext-enable pcov mongodb && \
-   echo "pcov.enabled=0" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini && \
-   echo "pcov.exclude='~vendor~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
+COPY entrypoint.d/* /opt/docker/provision/entrypoint.d/
+COPY profiler.php /opt/docker/profiler.php
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
+RUN install-php-extensions @fix_letsencrypt xhprof mongodb pcov && \
+    echo "auto_prepend_file=/opt/docker/profiler.php" >> /opt/docker/etc/php/php.ini && \
+    echo "pcov.enabled=0" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini && \
+    echo "pcov.exclude='~vendor~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini && \
+    composer self-update --clean-backups && \
+    php -r "version_compare(PHP_VERSION, '7.2', '>=') && print_r(exec('composer completion bash > /etc/bash_completion.d/composer'));" && \
+    if [ -f /etc/apache2/envvars ]; then \
+    sed -i 's/export APACHE_RUN_USER=www-data/export APACHE_RUN_USER=application/g' /etc/apache2/envvars && \
+    sed -i 's/export APACHE_RUN_GROUP=www-data/export APACHE_RUN_GROUP=application/g' /etc/apache2/envvars ; \
+    fi && \
+    if [ -f /etc/nginx/nginx.conf ]; then sed -i 's/user www-data;/user application application;/g' /etc/nginx/nginx.conf ; fi
 
-RUN composer self-update --clean-backups
-RUN php -r "version_compare(PHP_VERSION, '7.2', '>=') && print_r(exec('composer completion bash > /etc/bash_completion.d/composer'));"
 
 USER application
-RUN composer global require davidrjonas/composer-lock-diff perftools/xhgui-collector alcaeus/mongo-php-adapter perftools/php-profiler && \
-    composer clear
 
-# add .additional_bashrc.sh
 COPY bin/* /usr/local/bin/
 COPY .additional_bashrc.sh /home/application/.additional_bashrc.sh
 COPY .vimrc /home/application/.vimrc
 COPY .vimrc /root/.vimrc
 COPY apache.conf /opt/docker/etc/httpd/vhost.common.d/apache.conf
-RUN echo "source ~/.additional_bashrc.sh" >> ~/.bashrc
+
+RUN composer global require davidrjonas/composer-lock-diff perftools/xhgui-collector alcaeus/mongo-php-adapter perftools/php-profiler && \
+    composer clear && \
+    echo "source ~/.additional_bashrc.sh" >> ~/.bashrc && \
+    curl -L https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh > ~/.bash_git
 
 USER root
 
 ENV \
     COMPOSER_CACHE_DIR=/home/application/.composer/cache \
     POSTFIX_RELAYHOST="[global-mail]:1025" \
-    PHP_DISMOD="ioncube" \
+    PHP_DISMOD="ioncube,tideways" \
     PHP_DISPLAY_ERRORS="1" \
     PHP_MEMORY_LIMIT="-1" \
     XHGUI_MONGO_URI="global-xhgui:27017" \
     XHGUI_PROFILING="enabled" \
     TZ=Europe/Berlin
 
-COPY entrypoint.d/* /opt/docker/provision/entrypoint.d/
-
-# set apache user group to application:
-RUN if [ -f /etc/apache2/envvars ]; then sed -i 's/export APACHE_RUN_USER=www-data/export APACHE_RUN_USER=application/g' /etc/apache2/envvars ; fi
-RUN if [ -f /etc/apache2/envvars ]; then sed -i 's/export APACHE_RUN_GROUP=www-data/export APACHE_RUN_GROUP=application/g' /etc/apache2/envvars ; fi
-# set nginx user group to application:
-RUN if [ -f /etc/nginx/nginx.conf ]; then sed -i 's/user www-data;/user application application;/g' /etc/nginx/nginx.conf ; fi
-
-# https://stackoverflow.com/questions/52998331/imagemagick-security-policy-pdf-blocking-conversion#comment110879511_59193253
-RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml
-
 WORKDIR /app

README.md

@@ -4,6 +4,16 @@ PHP-DEV is a small package that includes a web server, PHP and some tools needed
 You can easily decide which version of PHP you want to use and whether you want to start an Apache or a Nginx webserver by setting the values in a docker-compose.yml.
 We recommend using [pluswerk/docker-global](https://github.com/pluswerk/docker-global) as a wrapper for your projects, since this Dockerfile has been built keeping that in mind.
 
+# Tags
+
+- php versions supported: `7.1`-`8.2`
+- webserver supported: `nginx` and `apache`
+- alpine images: `-alpine`
+- examples
+  - `pluswerk/php-dev:nginx-8.2-alpine`
+  - `pluswerk/php-dev:apache-7.1-alpine`
+  - `pluswerk/php-dev:nginx-8.0`
+
 ## Setup
 
 Create a `compose/Development/docker-compose.yml` like shown below.  
@@ -46,7 +56,7 @@ version: '3.5'
 
 services:
   web:
-    image: pluswerk/php-dev:nginx-8.1
+    image: pluswerk/php-dev:nginx-8.2-alpine
 
     volumes:
       - .:/app

entrypoint.d/00_set-user-and-group-id.sh renamed to entrypoint.d/00-set-user-and-group-id.sh

@@ -10,4 +10,4 @@ echo ${TZ} >/etc/timezone
 
 ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
 
-dpkg-reconfigure -f noninteractive tzdata &> /dev/null
+#dpkg-reconfigure -f noninteractive tzdata &> /dev/null

entrypoint.d/10-set-timezone.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 if [ -n "${PHP_DEBUGGER:-}" ] && [[ "${PHP_DEBUGGER}" = 'xdebug' ]]; then
-  xdebug-enable;
+  echo 'xdebug-enable:'
+  xdebug-enable || true;
 else
-  xdebug-disable;
+  echo 'xdebug-disable:'
+  xdebug-disable || true;
 fi;

entrypoint.d/toggle-profiler-on-startup.sh renamed to entrypoint.d/30-toggle-profiler-on-startup.sh

@@ -4,13 +4,17 @@
 // we want minimal file inclusion.
 
 if ((isset($_COOKIE['XDEBUG_PROFILE']) || getenv('PROFILING_ENABLED'))) {
-    require_once '/home/application/.config/composer/vendor/perftools/php-profiler/autoload.php';
+    $composerVendorDir = '/home/application/.composer/vendor';
+    if (!is_dir($composerVendorDir)) {
+        $composerVendorDir = '/home/application/.config/composer/vendor';
+    }
+    require_once $composerVendorDir . '/perftools/php-profiler/autoload.php';
 
-    $tmpFile = '/tmp/'. uniqid('xhgui', true) . '.data.jsonl';
+    $tmpFile = '/tmp/' . uniqid('xhgui', true) . '.data.jsonl';
 
     $profiler = new \Xhgui\Profiler\Profiler(
         [
-            'profiler' => \Xhgui\Profiler\Profiler::PROFILER_TIDEWAYS_XHPROF,
+            'profiler' => \Xhgui\Profiler\Profiler::PROFILER_XHPROF,
             #  'save.handler' => \Xhgui\Profiler\Profiler::SAVER_MONGODB,
 
             'save.handler' => \Xhgui\Profiler\Profiler::SAVER_FILE,
@@ -23,9 +27,9 @@
     $profiler->enable();
 
 
-    register_shutdown_function(static function () use ($tmpFile, $profiler) {
+    register_shutdown_function(static function () use ($composerVendorDir, $tmpFile, $profiler) {
         //we want this autoloading only after the main php script executed everything.
-        require_once '/home/application/.config/composer/vendor/autoload.php';
+        require_once $composerVendorDir . '/autoload.php';
         $profiler->stop();
 
         //huge performance Optimisation possible: