Merge remote-tracking branch 'origin/master' into copilot/fix-docker-image-relationship

Co-authored-by: Kanti <471387+Kanti@users.noreply.github.com>

Author: Copilot

docker/php-official/8.2-alpine/Dockerfile

@@ -151,6 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
         bcmath \

docker/php-official/8.2/Dockerfile

@@ -130,6 +130,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -146,6 +147,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
         bcmath \
@@ -215,6 +217,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \

docker/php-official/8.3-alpine/Dockerfile

@@ -151,6 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
         bcmath \

docker/php-official/8.3/Dockerfile

@@ -130,6 +130,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -146,6 +147,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-openssl-dir \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && docker-php-ext-install \
         bcmath \
@@ -215,6 +217,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \

docker/php-official/8.4-alpine/Dockerfile

@@ -151,6 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-ftp-ssl \
     && docker-php-ext-install \
         bcmath \
         bz2 \

docker/php-official/8.4/Dockerfile

@@ -130,6 +130,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -146,6 +147,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-ftp-ssl \
     && docker-php-ext-install \
         bcmath \
         amqp \
@@ -213,6 +215,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \

docker/php-official/8.5-alpine/Dockerfile

@@ -151,6 +151,7 @@ RUN set -x \
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-ftp-ssl \
     && docker-php-ext-install \
         bcmath \
         bz2 \

docker/php-official/8.5/Dockerfile

@@ -130,6 +130,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -146,6 +147,7 @@ RUN set -x \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
+    && docker-php-ext-configure ftp --with-ftp-ssl \
     && docker-php-ext-install \
         bcmath \
         amqp \
@@ -212,6 +214,7 @@ RUN set -x \
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+        libssl-dev \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \

template/Dockerfile/images/php.jinja2

@@ -57,6 +57,9 @@
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+{%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
+        libssl-dev \
+{%- endif %}
     # Install guetzli
     && wget https://github.com/google/guetzli/archive/master.zip \
     && unzip master.zip \
@@ -73,6 +76,11 @@
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
     && docker-php-ext-configure ldap \
+{%- if version == '8.2' or version == '8.3' %}
+    && docker-php-ext-configure ftp --with-openssl-dir \
+{%- elif version == '8.4' or version == '8.5' %}
+    && docker-php-ext-configure ftp --with-ftp-ssl \
+{%- endif %}
 {%- if version != '8.4' and version != '8.5' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 {%- endif %}
@@ -152,6 +160,9 @@
         librabbitmq-dev \
         libmagick++-dev \
         libgmp-dev \
+{%- if version == '8.2' or version == '8.3' or version == '8.4' or version == '8.5' %}
+        libssl-dev \
+{%- endif %}
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
@@ -234,6 +245,11 @@
     && git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
     && cd /usr/src/php/ext/amqp && git submodule update --init \
     && docker-php-ext-configure ldap \
+{%- if version == '8.2' or version == '8.3' %}
+    && docker-php-ext-configure ftp --with-openssl-dir \
+{%- elif version == '8.4' or version == '8.5' %}
+    && docker-php-ext-configure ftp --with-ftp-ssl \
+{%- endif %}
 {%- if version != '8.4' and version != '8.5' %}
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
 {%- endif %}

tests/serverspec/spec/docker/php-apache-dev_spec.rb

@@ -10,6 +10,7 @@
     include_examples 'collection::bootstrap'
     include_examples 'collection::base'
     include_examples 'collection::base-app'
+    include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
 
     if ($testConfiguration[:php] == 5)
         include_examples 'collection::php5::development'