MCLOUD-7183: Fix functional tests after composer 2.0 release (#10)

Author: oshmyheliuk

images/php/7.2-cli/Dockerfile

@@ -210,7 +210,7 @@ ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
 
 # Get composer installed to /usr/local/bin/composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
 
 ADD bin/* /usr/local/bin/
 

images/php/7.2-cli/docker-entrypoint.sh

@@ -65,6 +65,9 @@ fi
 
 
 # Configure composer
+[ ! -z "${COMPOSER_VERSION}" ] && \
+    composer self-update $COMPOSER_VERSION
+
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
     composer config --global github-oauth.github.com $COMPOSER_GITHUB_TOKEN
 

images/php/7.3-cli/Dockerfile

@@ -206,7 +206,7 @@ ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
 
 # Get composer installed to /usr/local/bin/composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
 
 ADD bin/* /usr/local/bin/
 

images/php/7.3-cli/docker-entrypoint.sh

@@ -65,6 +65,9 @@ fi
 
 
 # Configure composer
+[ ! -z "${COMPOSER_VERSION}" ] && \
+    composer self-update $COMPOSER_VERSION
+
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
     composer config --global github-oauth.github.com $COMPOSER_GITHUB_TOKEN
 

images/php/7.4-cli/Dockerfile

@@ -185,7 +185,7 @@ ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
 
 # Get composer installed to /usr/local/bin/composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
 
 ADD bin/* /usr/local/bin/
 

images/php/7.4-cli/docker-entrypoint.sh

@@ -65,6 +65,9 @@ fi
 
 
 # Configure composer
+[ ! -z "${COMPOSER_VERSION}" ] && \
+    composer self-update $COMPOSER_VERSION
+
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
     composer config --global github-oauth.github.com $COMPOSER_GITHUB_TOKEN
 

images/php/cli/Dockerfile

@@ -54,7 +54,7 @@ ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
 ADD etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini
 
 # Get composer installed to /usr/local/bin/composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer
 
 ADD bin/* /usr/local/bin/
 

images/php/cli/docker-entrypoint.sh

@@ -65,6 +65,9 @@ fi
 
 
 # Configure composer
+[ ! -z "${COMPOSER_VERSION}" ] && \
+    composer self-update $COMPOSER_VERSION
+
 [ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
     composer config --global github-oauth.github.com $COMPOSER_GITHUB_TOKEN
 

tests/functional/Codeception/MagentoDb.php

@@ -65,7 +65,7 @@ public function grabColumnsFromDatabase($table, $columns, array $criteria = [])
      *
      * @return string
      */
-    public function getExposedPort(string $dbKey = self::KEY_DB): string
+    public function getExposedPort(string $dbKey = 'db'): string
     {
         $key = 'exposed_port';
         if (self::KEY_DB === $dbKey) {