Merge pull request #170 from magento-commerce/develop

MCLOUD-14104: Cloud tools October Release

Author: adobe-shruthi

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.4.4",
+    "version": "1.4.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

config/services.xml

@@ -38,6 +38,7 @@
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Build" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Deploy" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\RabbitMq" />
+                <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\ActiveMqArtemis" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Node" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Mailhog" />
                 <argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Blackfire" />

images/mailhog/1.0/Dockerfile

@@ -2,17 +2,13 @@
 # MailHog Dockerfile
 #
 
-FROM golang:1.17.9-alpine
+FROM golang:1.24-alpine
 
-# Install MailHog:
-RUN apk --no-cache add --virtual build-dependencies \
-    git \
-  && mkdir -p /root/gocode \
-  && export GOPATH=/root/gocode \
-  && go get github.com/mailhog/[email protected] \
-  && mv /root/gocode/bin/MailHog /usr/local/bin \
-  && rm -rf /root/gocode \
-  && apk del --purge build-dependencies
+# Install MailHog
+RUN apk --no-cache add git \
+  && go install github.com/mailhog/[email protected] \
+  && mv /go/bin/MailHog /usr/local/bin/MailHog \
+  && apk del git
 
 # Add mailhog user/group with uid/gid 1000.
 # This is a workaround for boot2docker issue #581, see

images/php/8.1-cli/Dockerfile

@@ -56,7 +56,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.1-fpm/Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.2-cli/Dockerfile

@@ -56,7 +56,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.2-fpm/Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.3-cli/Dockerfile

@@ -56,7 +56,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -65,7 +64,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.3-fpm/Dockerfile

@@ -37,7 +37,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -46,7 +45,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \

images/php/8.4-cli/Dockerfile

@@ -77,7 +77,6 @@ RUN apt-get update \
   gnupg2 \
   ca-certificates \
   lsb-release \
-  software-properties-common \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \
@@ -86,7 +85,7 @@ RUN apt-get update \
   libgpgme11-dev \
   libicu-dev \
   libldap2-dev \
-  libpcre3-dev \
+  libpcre2-dev \
   libpspell-dev \
   libtidy-dev \
   libxslt1-dev \