MCLOUD-10406: update magento/magento-cloud-docker-php:8.2-cli-1.3.5 to stop clearing composer cache

Author: BaDos

images/php/7.2-cli/Dockerfile

@@ -83,9 +83,8 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+RUN pip3 install --upgrade setuptools && pip3 install pyyaml
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/7.3-cli/Dockerfile

@@ -81,9 +81,8 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+RUN pip3 install --upgrade setuptools && pip3 install pyyaml
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/7.4-cli/Dockerfile

@@ -77,9 +77,8 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+RUN pip3 install --upgrade setuptools && pip3 install pyyaml
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/8.0-cli/Dockerfile

@@ -74,9 +74,8 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+RUN pip3 install --upgrade setuptools && pip3 install pyyaml
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/8.1-cli/Dockerfile

@@ -74,9 +74,8 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+RUN pip3 install --upgrade setuptools && pip3 install pyyaml
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/8.2-cli/Dockerfile

@@ -72,11 +72,11 @@ RUN apt-get update \
   libyaml-dev \
   libzip-dev \
   zip \
+  python3-yaml \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+
 
 # Install Grunt
 RUN npm install -g grunt-cli

images/php/8.2-fpm/Dockerfile

@@ -53,6 +53,7 @@ RUN apt-get update \
   libyaml-dev \
   libzip-dev \
   zip \
+  python3-yaml \
   && rm -rf /var/lib/apt/lists/*
 
 # Install MailHog

images/php/cli/Dockerfile

@@ -41,9 +41,8 @@ RUN apt-get update \
   {%packages%} \
   && rm -rf /var/lib/apt/lists/*
 
-# Install PyYAML
-RUN pip3 install --upgrade setuptools \
-    && pip3 install pyyaml
+# Install Python packages
+{%python_packages%}
 
 # Install Grunt
 RUN npm install -g grunt-cli

src/Command/Image/GeneratePhp.php

@@ -286,6 +286,13 @@ private function buildDockerfile(string $dockerfile, string $phpVersion, string
             }
         }
 
+        if ($this->semver::satisfies($phpVersion, '8.2.*')) {
+            $packages = array_merge($packages, ['python3-yaml']);
+            $pythonPackages = '';
+        } else {
+            $pythonPackages = 'RUN pip3 install --upgrade setuptools && pip3 install pyyaml';
+        }
+
         $volumes = [
             'root' => [
                 'def' => 'VOLUME ${MAGENTO_ROOT}',
@@ -319,6 +326,7 @@ private function buildDockerfile(string $dockerfile, string $phpVersion, string
                 '{%env_php_extensions%}' => $phpExtEnabledDefault
                     ? 'ENV PHP_EXTENSIONS ' . implode(' ', $phpExtEnabledDefault)
                     : '',
+                '{%python_packages%}' => $pythonPackages,
                 '{%volumes_cmd%}' => rtrim($volumesCmd),
                 '{%volumes_def%}' => rtrim($volumesDef)
             ]