From e08429ba1e3b574b60f4b42c384d86bf2b44ecce Mon Sep 17 00:00:00 2001 From: Tomasz Michalak Date: Wed, 9 Dec 2020 16:17:31 +0100 Subject: [PATCH] Set composer to 1.x and add missing deps. Fixing error with Composer 2 and required dependency. --- developer/Dockerfile | 9 +++++---- integrator/Dockerfile | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/developer/Dockerfile b/developer/Dockerfile index e4b4a848..d8e3df65 100644 --- a/developer/Dockerfile +++ b/developer/Dockerfile @@ -9,8 +9,8 @@ ENV MAGENTO_VERSION 2.3.6 ENV INSTALL_DIR /var/www/html ENV COMPOSER_HOME /var/www/.composer/ -RUN curl -sS https://getcomposer.org/installer | php \ - && mv composer.phar /usr/local/bin/composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer + COPY ./auth.json $COMPOSER_HOME RUN requirements="libpng++-dev libzip-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libfreetype6-dev libicu-dev libxslt1-dev unzip" \ @@ -25,7 +25,8 @@ RUN requirements="libpng++-dev libzip-dev libmcrypt-dev libmcrypt4 libcurl3-dev && docker-php-ext-install intl \ && docker-php-ext-install xsl \ && docker-php-ext-install soap \ - && docker-php-ext-install bcmath + && docker-php-ext-install bcmath \ + && docker-php-ext-install sockets RUN yes '' | pecl install mcrypt-1.0.3 \ && echo 'extension=mcrypt.so' > /usr/local/etc/php/conf.d/mcrypt.ini @@ -64,4 +65,4 @@ ADD crontab /etc/cron.d/magento2-cron RUN chmod 0644 /etc/cron.d/magento2-cron \ && crontab -u www-data /etc/cron.d/magento2-cron -VOLUME $INSTALL_DIR \ No newline at end of file +VOLUME $INSTALL_DIR diff --git a/integrator/Dockerfile b/integrator/Dockerfile index 346edabd..654c4d67 100644 --- a/integrator/Dockerfile +++ b/integrator/Dockerfile @@ -9,8 +9,8 @@ ENV MAGENTO_VERSION 2.3.6 ENV INSTALL_DIR /var/www/html ENV COMPOSER_HOME /var/www/.composer/ -RUN curl -sS https://getcomposer.org/installer | php \ - && mv composer.phar /usr/local/bin/composer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --version=1.10.16 --filename=composer + COPY ./auth.json $COMPOSER_HOME RUN requirements="libpng++-dev libzip-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libfreetype6-dev libicu-dev libxslt1-dev unzip" \ @@ -25,7 +25,8 @@ RUN requirements="libpng++-dev libzip-dev libmcrypt-dev libmcrypt4 libcurl3-dev && docker-php-ext-install intl \ && docker-php-ext-install xsl \ && docker-php-ext-install soap \ - && docker-php-ext-install bcmath + && docker-php-ext-install bcmath \ + && docker-php-ext-install sockets RUN yes '' | pecl install mcrypt-1.0.3 \ && echo 'extension=mcrypt.so' > /usr/local/etc/php/conf.d/mcrypt.ini @@ -58,4 +59,4 @@ ADD crontab /etc/cron.d/magento2-cron RUN chmod 0644 /etc/cron.d/magento2-cron \ && crontab -u www-data /etc/cron.d/magento2-cron -VOLUME $INSTALL_DIR \ No newline at end of file +VOLUME $INSTALL_DIR