Merge pull request #61 from magento-commerce/develop

Merge develop into 1.2
magento · Jul 20, 2021 · e02b118 · e02b118
2 parents d8e67a8 + e1209f3
commit e02b118
Show file tree

Hide file tree

Showing 44 changed files with 1,374 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -11,7 +11,7 @@
         "php": "^7.2",
         "ext-json": "*",
         "composer/composer": "^1.0||^2.0",
-        "composer/semver": "^1.0",
+        "composer/semver": "^1.0||^2.0||^3.0",
         "illuminate/config": "^5.5",
         "symfony/config": "^4.4",
         "symfony/console": "^2.8||^4.0",

diff --git a/config/services.xml b/config/services.xml
@@ -39,6 +39,7 @@
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Mailhog" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Blackfire" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Cron" />
+                <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Zookeeper" />
             </argument>
         </service>
         <service id="Magento\CloudDocker\Compose\ProductionBuilder" shared="false">

diff --git a/dist/mutagen.sh b/dist/mutagen.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-mutagen terminate --label-selector=magento-docker
-mutagen terminate --label-selector=magento-docker-vendor
+mutagen sync terminate --label-selector=magento-docker
+mutagen sync terminate --label-selector=magento-docker-vendor
 
-mutagen create \
+mutagen sync create \
        --label=magento-docker \
        --sync-mode=two-way-resolved \
        --default-file-mode=0644 \
@@ -20,7 +20,7 @@ mutagen create \
        --symlink-mode=posix-raw \
        ./ docker://$(docker-compose ps -q fpm|awk '{print $1}')/app
 
-mutagen create \
+mutagen sync create \
        --label=magento-docker-vendor \
        --sync-mode=two-way-resolved \
        --default-file-mode=0644 \

diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -136,6 +136,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update \
   sendmail \
   sudo \
   iproute2 \
+  git \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -113,6 +114,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -133,6 +133,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update \
   sendmail \
   sudo \
   iproute2 \
+  git \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -110,6 +111,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile
@@ -123,6 +123,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-fpm/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update \
   sendmail \
   sudo \
   iproute2 \
+  git \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -100,6 +101,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/8.0-cli/Dockerfile b/images/php/8.0-cli/Dockerfile
@@ -116,6 +116,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/images/php/8.0-fpm/Dockerfile b/images/php/8.0-fpm/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update \
   sendmail \
   sudo \
   iproute2 \
+  git \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -93,6 +94,23 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
   && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
   && echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
   && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+RUN mkdir -p /tmp/zoo \
+  && cd /tmp/zoo \
+  && git clone https://github.com/php-zookeeper/php-zookeeper.git \
+  && curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz \
+  && tar -xf zookeeper-3.4.14.tar.gz \
+  && cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include \
+  && cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && ./configure \
+  && sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile \
+  && make \
+  && make install \
+  && ldconfig \
+  && cd /tmp/zoo/php-zookeeper \
+  && phpize \
+  && ./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c \
+  && make \
+  && make install
 RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
   && rm -f /usr/local/lib/php/extensions/*/*sodium.so \
   && apt-get remove libsodium* -y \

diff --git a/src/Command/BuildCompose.php b/src/Command/BuildCompose.php
@@ -163,6 +163,16 @@ protected function configure(): void
                 null,
                 InputOption::VALUE_REQUIRED,
                 'Selenium image'
+            )->addOption(
+                Source\CliSource::OPTION_ZOOKEEPER_VERSION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Zookeeper version'
+            )->addOption(
+                Source\CliSource::OPTION_ZOOKEEPER_IMAGE,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Zookeeper image'
             )->addOption(
                 Source\CliSource::OPTION_NO_ES,
                 null,
@@ -244,6 +254,11 @@ protected function configure(): void
             null,
             InputOption::VALUE_NONE,
             'Add Selenium latest version'
+        )->addOption(
+            Source\CliSource::OPTION_WITH_ZOOKEEPER,
+            null,
+            InputOption::VALUE_NONE,
+            'Add Zookeeper latest version'
         )->addOption(
             Source\CliSource::OPTION_WITH_TEST,
             null,

diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php
@@ -38,7 +38,8 @@ class GeneratePhp extends Command
         'sendmail-bin',
         'sendmail',
         'sudo',
-        'iproute2'
+        'iproute2',
+        'git',
     ];
     private const DEFAULT_PACKAGES_PHP_CLI = [
         'apt-utils',

diff --git a/src/Compose/BuilderInterface.php b/src/Compose/BuilderInterface.php
@@ -35,6 +35,7 @@ interface BuilderInterface
     public const SERVICE_TEST = ServiceInterface::SERVICE_TEST;
     public const SERVICE_HEALTHCHECK = 'healthcheck';
     public const SERVICE_MAILHOG = ServiceInterface::SERVICE_MAILHOG;
+    public const SERVICE_ZOOKEEPER = ServiceInterface::SERVICE_ZOOKEEPER;
 
     public const NETWORK_MAGENTO = 'magento';
     public const NETWORK_MAGENTO_BUILD = 'magento-build';

diff --git a/src/Compose/Php/ExtensionResolver.php b/src/Compose/Php/ExtensionResolver.php
@@ -326,6 +326,32 @@ public static function getConfig(): array
             'sockets' => [
                 '>=7.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE],
             ],
+            'zookeeper' => [
+                '>=7.2' => [
+                    self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,
+                    // phpcs:disable
+                    self::EXTENSION_INSTALLATION_SCRIPT => <<< BASH
+mkdir -p /tmp/zoo
+cd /tmp/zoo
+git clone https://github.com/php-zookeeper/php-zookeeper.git
+curl -LO https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz
+tar -xf zookeeper-3.4.14.tar.gz
+cp zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/generated/zookeeper.jute.h zookeeper-3.4.14/zookeeper-client/zookeeper-client-c/include
+cd zookeeper-3.4.14/zookeeper-client/zookeeper-client-c
+./configure
+sed -i 's/CFLAGS = -g -O2 -D_GNU_SOURCE/CFLAGS = -g -O2 -D_GNU_SOURCE -Wno-error=format-overflow -Wno-error=stringop-truncation/g' Makefile
+make
+make install
+ldconfig
+cd /tmp/zoo/php-zookeeper
+phpize
+./configure --with-libzookeeper-dir=../zookeeper-3.4.14/zookeeper-client/zookeeper-client-c
+make
+make install
+BASH
+// phpcs:enable
+                ],
+            ],
             'sodium' => [
                 '>=7.0 <7.2' => [
                     self::EXTENSION_TYPE => self::EXTENSION_TYPE_INSTALLATION_SCRIPT,