MCLOUD-7548: Enable Sodium in PHP docker images by default (#36)

Author: shiftedreality

src/Compose/Php/ExtensionResolver.php

@@ -46,7 +46,10 @@ class ExtensionResolver
         'sysvsem',
         'sysvshm',
         'opcache',
-        'zip'
+        'zip',
+        // Required for Magento 2.4.0+
+        'xsl',
+        'sodium'
     ];
 
     /**

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -141,7 +141,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml

@@ -128,7 +128,7 @@ services:
     env_file: ./.docker/config.env
     environment:
       - MAGENTO_RUN_MODE=developer
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -177,7 +177,7 @@ services:
       - 'magento-pub-static:/app/pub/static:rw,delegated'
       - '.docker/mnt:/mnt:rw,delegated'
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium xdebug'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis xdebug'
     networks:
       magento:
         aliases:
@@ -190,7 +190,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml

@@ -163,7 +163,7 @@ services:
       - 'magento-pub-static:/app/pub/static:rw,delegated'
       - '.docker/mnt:/mnt:rw,delegated'
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium xdebug'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis xdebug'
     networks:
       magento:
         aliases:
@@ -176,7 +176,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_no_tls_service/docker-compose.exp.yml

@@ -122,7 +122,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_no_varnish_and_tls_service/docker-compose.exp.yml

@@ -112,7 +112,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/cloud_no_varnish_service/docker-compose.exp.yml

@@ -129,7 +129,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip redis xsl sodium'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium redis'
   build:
     hostname: build.magento2.docker
     image: 'magento/magento-cloud-docker-php:7.3-cli-1.2.0'

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -102,7 +102,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium'
   build:
     hostname: build.magento2.test
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'

src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml

@@ -167,7 +167,7 @@ services:
     image: 'php-v1:7.4-cli'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium'
   build:
     hostname: build.magento2.test
     image: 'php-v1:7.4-cli'