Merge pull request #114 from magento-commerce/MCLOUD-10406

BaDos · web-flow · commit 115f12e1760d · 2023-07-19T01:02:58.000-05:00
MCLOUD-10406: update magento/magento-cloud-docker-php:8.2-cli-1.3.5 to stop clearing composer cache
diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -82,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
diff --git a/images/php/7.2-cli/docker-entrypoint.sh b/images/php/7.2-cli/docker-entrypoint.sh
@@ -17,6 +17,10 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
     composer self-update $COMPOSER_VERSION
diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -80,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
diff --git a/images/php/7.3-cli/docker-entrypoint.sh b/images/php/7.3-cli/docker-entrypoint.sh
@@ -17,6 +17,10 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
     composer self-update $COMPOSER_VERSION
diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -76,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
diff --git a/images/php/7.4-cli/docker-entrypoint.sh b/images/php/7.4-cli/docker-entrypoint.sh
@@ -17,9 +17,12 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
-    composer clearcache && \
     composer self-update $COMPOSER_VERSION
 
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
diff --git a/images/php/8.0-cli/Dockerfile b/images/php/8.0-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -73,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
diff --git a/images/php/8.0-cli/docker-entrypoint.sh b/images/php/8.0-cli/docker-entrypoint.sh
@@ -17,9 +17,12 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
-    composer clearcache && \
     composer self-update $COMPOSER_VERSION
 
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
diff --git a/images/php/8.1-cli/Dockerfile b/images/php/8.1-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -73,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
diff --git a/images/php/8.1-cli/docker-entrypoint.sh b/images/php/8.1-cli/docker-entrypoint.sh
@@ -17,9 +17,12 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
-    composer clearcache && \
     composer self-update $COMPOSER_VERSION
 
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
diff --git a/images/php/8.2-cli/Dockerfile b/images/php/8.2-cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -71,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
diff --git a/images/php/8.2-cli/docker-entrypoint.sh b/images/php/8.2-cli/docker-entrypoint.sh
@@ -17,9 +17,12 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
-    composer clearcache && \
     composer self-update $COMPOSER_VERSION
 
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
diff --git a/images/php/8.2-fpm/Dockerfile b/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
diff --git a/images/php/cli/Dockerfile b/images/php/cli/Dockerfile
@@ -21,6 +21,7 @@ ARG CRONTAB=""
 ENV COMPOSER_MEMORY_LIMIT -1
 ENV COMPOSER_ALLOW_SUPERUSER ${COMPOSER_ALLOW_SUPERUSER}
 ENV COMPOSER_HOME ${COMPOSER_HOME}
+ENV COMPOSER_CLEAR_CACHE false
 ENV PHP_MEMORY_LIMIT -1
 ENV PHP_VALIDATE_TIMESTAMPS 1
 ENV DEBUG false
@@ -40,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
diff --git a/images/php/cli/docker-entrypoint.sh b/images/php/cli/docker-entrypoint.sh
@@ -17,9 +17,12 @@ if [ -x "$(command -v ${PHP_EXT_COM_ON})" ] && [ ! -z "${PHP_EXTENSIONS}" ]; the
   ${PHP_EXT_COM_ON} ${PHP_EXTENSIONS}
 fi
 
+# Clear composer cache if needed
+[ "$COMPOSER_CLEAR_CACHE" = "true" ] && \
+    composer clearcache
+
 # Configure composer
 [ ! -z "${COMPOSER_VERSION}" ] && \
-    composer clearcache && \
     composer self-update $COMPOSER_VERSION
 
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
diff --git a/src/Command/Image/GeneratePhp.php b/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[] = '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)
             ]
