Skip to content

Commit

Permalink
Merge pull request #66 from qenta-cee/master_php7.4_mag2.4.3
Browse files Browse the repository at this point in the history
bug fixes 7.4 with 2.4.3
  • Loading branch information
shahzadali authored Jan 15, 2024
2 parents 1af3eeb + f8223ba commit a546ee5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .docker/magento2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get -qq upgrade
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -

# install dependencies aand tools
RUN apt-get -qq install git unzip vim mariadb-client zip jq nodejs
RUN apt-get -q install -y git unzip vim mariadb-client zip jq nodejs

# install php extension dependencies
RUN apt-get -qq install libmemcached-dev libzip-dev zlib1g-dev libpng-dev libjpeg-dev libfreetype6-dev libwebp-dev libonig-dev libtidy-dev libicu-dev libxml2-dev libxslt-dev
Expand All @@ -29,10 +29,10 @@ RUN apt-get -qq install libmemcached-dev libzip-dev zlib1g-dev libpng-dev libjpe
RUN apt-get -qq autoremove

# install PHP extensions required
RUN bash -c "pecl install xdebug memcached &> /dev/null"
RUN bash -c "pecl install xdebug-3.1.6"
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j64 intl sockets soap gd mbstring mysqli pdo pdo_mysql tidy bcmath xsl zip
RUN docker-php-ext-enable intl sockets xsl zip memcached xdebug gd mbstring mysqli pdo pdo_mysql tidy bcmath
RUN docker-php-ext-enable intl sockets xsl zip xdebug gd mbstring mysqli pdo pdo_mysql tidy bcmath

# enable apache modules
RUN a2enmod rewrite headers ext_filter expires
Expand Down
3 changes: 3 additions & 0 deletions .docker/magento2/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ function install_plugin() {
cd /var/www/magento2
composer config minimum-stability dev
composer config repositories.qenta path ${PLUGIN_DIR}
composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
composer config --no-plugins allow-plugins.laminas/laminas-dependency-plugin true
composer config --no-plugins allow-plugins.magento/magento-composer-installer true
composer require qenta/magento2-qcp
bin/magento cache:clean
bin/magento setup:upgrade
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sh text eol=lf

0 comments on commit a546ee5

Please sign in to comment.