Merge branch 'spryker-master'

README.md

@@ -29,16 +29,16 @@ Extends official Spryker PHP Docker images with extensions and tools to be able
 
 | Tag                                                                                                   | PHP version | Linux distribution | Details                                                                                                                                                                                              | Dockerfile                                                                                         |
 |:------------------------------------------------------------------------------------------------------|:------------|:-------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------|
-| [loeffelhardt/php:latest](https://hub.docker.com/r/loeffelhardt/php/tags?name=latest)                 | 8.2.20      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:latest.svg)](https://microbadger.com/images/loeffelhardt/php:latest "Get your own image badge on microbadger.com")                 | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
-| [loeffelhardt/php:8.2](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2)                       | 8.2.20      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2.svg)](https://microbadger.com/images/loeffelhardt/php:8.2 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
+| [loeffelhardt/php:latest](https://hub.docker.com/r/loeffelhardt/php/tags?name=latest)                 | 8.2.22      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:latest.svg)](https://microbadger.com/images/loeffelhardt/php:latest "Get your own image badge on microbadger.com")                 | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
+| [loeffelhardt/php:8.2](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2)                       | 8.2.22      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2.svg)](https://microbadger.com/images/loeffelhardt/php:8.2 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
 | [loeffelhardt/php:8.1](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.1)                       | 8.1.29      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.1.svg)](https://microbadger.com/images/loeffelhardt/php:8.1 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.1/Dockerfile)     |
-| [loeffelhardt/php:8.2-alpine3.20](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-alpine3.19) | 8.2.20      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
+| [loeffelhardt/php:8.2-alpine3.20](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-alpine3.19) | 8.2.22      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.2/Dockerfile)     |
 | [loeffelhardt/php:8.1-alpine3.20](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.1-alpine3.19) | 8.1.29      | Alpine 3.20        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.1-alpine3.19.svg)](https://microbadger.com/images/loeffelhardt/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.20/8.1/Dockerfile)     |
-| [loeffelhardt/php:8.2-alpine3.19](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-alpine3.19) | 8.2.20      | Alpine 3.19        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.19/8.2/Dockerfile)     |
+| [loeffelhardt/php:8.2-alpine3.19](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-alpine3.19) | 8.2.22      | Alpine 3.19        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.19/8.2/Dockerfile)     |
 | [loeffelhardt/php:8.1-alpine3.19](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.1-alpine3.19) | 8.1.29      | Alpine 3.19        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.1-alpine3.19.svg)](https://microbadger.com/images/loeffelhardt/php:8.1-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.19/8.1/Dockerfile)     |
 | [loeffelhardt/php:8.2-alpine3.18](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-alpine3.18) | 8.2.19      | Alpine 3.18        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.18/8.2/Dockerfile)     |
 | [loeffelhardt/php:8.1-alpine3.18](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.1-alpine3.18) | 8.1.28      | Alpine 3.18        | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.1-alpine3.18.svg)](https://microbadger.com/images/loeffelhardt/php:8.1-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/alpine/3.18/8.1/Dockerfile)     |
-| [loeffelhardt/php:8.2-debian](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-debian)         | 8.2.20      | Debian "bullseye"  | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-debian.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-debian "Get your own image badge on microbadger.com")         | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/debian/bullseye/8.2/Dockerfile) |
+| [loeffelhardt/php:8.2-debian](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.2-debian)         | 8.2.22      | Debian "bullseye"  | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.2-debian.svg)](https://microbadger.com/images/loeffelhardt/php:8.2-debian "Get your own image badge on microbadger.com")         | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/debian/bullseye/8.2/Dockerfile) |
 | [loeffelhardt/php:8.1-debian](https://hub.docker.com/r/loeffelhardt/php/tags?name=8.1-debian)         | 8.1.29      | Debian "bullseye"  | [![](https://images.microbadger.com/badges/image/loeffelhardt/php:8.1-debian.svg)](https://microbadger.com/images/loeffelhardt/php:8.1-debian "Get your own image badge on microbadger.com")         | [:link:](https://github.com/loeffelhardt/el-docker-php/blob/master/debian/bullseye/8.1/Dockerfile) |
 ## How to use
 

alpine/3.18/8.1/Dockerfile

@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -71,7 +72,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

alpine/3.18/8.2/Dockerfile

@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -72,7 +73,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

alpine/3.19/8.1/Dockerfile

@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev "
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -71,7 +72,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

alpine/3.19/8.2/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.0.2-experimental
-ARG SPRYKER_PHP_VERSION=8.2.20
+ARG SPRYKER_PHP_VERSION=8.2.22
 
 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19
 
@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -72,7 +73,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

alpine/3.20/8.1/Dockerfile

@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -71,7 +72,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

alpine/3.20/8.2/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.0.2-experimental
-ARG SPRYKER_PHP_VERSION=8.2.20
+ARG SPRYKER_PHP_VERSION=8.2.22
 
 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20
 
@@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\
     libxml2 \
     libxpm \
     libxslt \
-    libzip"
-
+    libzip \
+    rabbitmq-c"
 
 ARG PHP_BUILD_DEPS="\
     autoconf \
@@ -45,7 +45,8 @@ ARG PHP_BUILD_DEPS="\
     libxpm-dev \
     libxslt-dev \
     libzip-dev \
-    postgresql-dev"
+    postgresql-dev \
+    rabbitmq-c-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -72,7 +73,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG GRAPHVIZ_BUILD_DEPS="\
     expat-dev"

context/php/disabled/amqp.ini

@@ -0,0 +1 @@
+extension = amqp.so

debian/bullseye/8.1/Dockerfile

@@ -29,7 +29,6 @@ ARG PHP_RUN_DEPS="\
     libxslt1.1 \
     libzip4"
 
-
 ARG PHP_BUILD_DEPS="\
     libbz2-dev \
     libfreetype6-dev \
@@ -42,7 +41,8 @@ ARG PHP_BUILD_DEPS="\
     libxml2-dev \
     libxpm-dev \
     libxslt1-dev \
-    libzip-dev"
+    libzip-dev \
+    librabbitmq-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -68,7 +68,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG CFLAGS="-I/usr/src/php"
 RUN apt update -y \

debian/bullseye/8.2/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.0.2-experimental
-ARG SPRYKER_PHP_VERSION=8.2.20
+ARG SPRYKER_PHP_VERSION=8.2.22
 
 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye
 
@@ -29,7 +29,6 @@ ARG PHP_RUN_DEPS="\
     libxslt1.1 \
     libzip4"
 
-
 ARG PHP_BUILD_DEPS="\
     libbz2-dev \
     libfreetype6-dev \
@@ -42,7 +41,8 @@ ARG PHP_BUILD_DEPS="\
     libxml2-dev \
     libxpm-dev \
     libxslt1-dev \
-    libzip-dev"
+    libzip-dev \
+    librabbitmq-dev"
 
 ARG PHP_EXTENSIONS="\
     bcmath \
@@ -69,7 +69,8 @@ ARG PHP_PECL_EXTENSIONS="\
 ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
     pcov \
     xdebug \
-    xhprof"
+    xhprof \
+    amqp"
 
 ARG CFLAGS="-I/usr/src/php"
 RUN apt update -y \
@@ -127,8 +128,8 @@ RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
 # Blackfire
 ENV BLACKFIRE_AGENT_SOCKET=''
 RUN architecture=$(case ${TARGETPLATFORM} in "linux/amd64") echo "amd64" ;; linux/arm64) echo "arm64" ;; *) echo "amd64" ;; esac) \
-    && curl -A "Docker" -o /tmp/blackfire.so -D - -L -s https://packages.blackfire.io/binaries/blackfire-php/${BLACKFIRE_VERSION}/blackfire-php-linux_${architecture}-php-${BLACKFIRE_PHP_VERSION}.so \
-    && mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so
+   && curl -A "Docker" -o /tmp/blackfire.so -D - -L -s https://packages.blackfire.io/binaries/blackfire-php/${BLACKFIRE_VERSION}/blackfire-php-linux_${architecture}-php-${BLACKFIRE_PHP_VERSION}.so \
+   && mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so
 
 # New Relic
 ENV NEWRELIC_ENABLED=0
@@ -141,24 +142,24 @@ ENV NEWRELIC_TRANSACTION_TRACER_THRESHOLD=0
 ENV NEWRELIC_DISTRIBUTED_TRACING_EXCLUDE_NEWRELIC_HEADER=0
 
 RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux.tar.gz" | tar -C /tmp -zx \
-    && export NR_INSTALL_USE_CP_NOT_LN=1 \
-    && export NR_INSTALL_SILENT=1 \
-    && /tmp/newrelic-php5-*/newrelic-install install \
-    && rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
-    && /usr/bin/install -d -m 777 /var/log/newrelic/ \
-    && rm /usr/local/etc/php/conf.d/newrelic.ini \
-    && ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
+   && export NR_INSTALL_USE_CP_NOT_LN=1 \
+   && export NR_INSTALL_SILENT=1 \
+   && /tmp/newrelic-php5-*/newrelic-install install \
+   && rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
+   && /usr/bin/install -d -m 777 /var/log/newrelic/ \
+   && rm /usr/local/etc/php/conf.d/newrelic.ini \
+   && ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
 
 # Tideways
 RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/amd64" ]; then \
-    wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" && \
-    tar xvzf tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz && \
-    cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'
+   wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" && \
+   tar xvzf tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz && \
+   cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'
 
 RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
-    wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz" && \
-    tar xvzf tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz && \
-    cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'
+   wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz" && \
+   tar xvzf tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz && \
+   cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'
 
 # Opcache
 RUN /usr/bin/install -d -m 777 /var/run/opcache