Skip to content

Commit

Permalink
Merge pull request #18 from ityetti/develop
Browse files Browse the repository at this point in the history
Add n98-magerun2
  • Loading branch information
ityetti authored Nov 28, 2024
2 parents 29f1acb + 0cd2ae0 commit 9684df8
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Magento 2 Docker to Development (Apple Silicon)

### Nginx (1.22) + Redis (7.0) + PHP-FPM (8.2) + MySQL (8.0.34) + XDebug (3.2.2) + Mailpit + RabbitMQ (3.11) + OpenSearch (2.5.0) + Varnish (7.3)
### Traefik + Nginx + Redis + PHP-FPM + MySQL + XDebug + Mailpit + RabbitMQ + OpenSearch + Varnish

The docker stack is composed of the following containers
- traefik
Expand Down Expand Up @@ -119,6 +119,8 @@ https://rabbit.magento2.test - **RabbitMQ** (guest/guest for access)<br>
- v1.0.5 - Replace Elasticsearch to OpenSearch, upgrade component versions, added varnish
- v1.0.6 - Fix xDebug for correct stopping at point
- v1.0.7 - Add traefik, optimization for varnish, remove nginx-proxy
- v1.0.8 - Replace mailhog to mailpit
- v1.0.9 - Add n98-magerun2

## Branches
- master (for magento 2.4.6 and higher)
Expand Down
6 changes: 5 additions & 1 deletion php-fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,14 @@ RUN wget -O composer-setup.php https://getcomposer.org/installer
RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
RUN chmod +x /usr/local/bin/composer

# Install n98-magerun2
RUN wget https://files.magerun.net/n98-magerun2.phar \
&& chmod +x n98-magerun2.phar \
&& mv n98-magerun2.phar /usr/local/bin/n98-magerun2

COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/magento.ini
COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/xdebug-settings.ini
COPY etc/php-pcov.ini /usr/local/etc/php/conf.d/pcov-settings.ini
COPY etc/mail.ini /usr/local/etc/php/conf.d/mail.ini
COPY etc/php-fpm.conf /usr/local/etc/
COPY etc/php-gnupg.ini /usr/local/etc/php/conf.d/gnupg.ini

Expand Down
2 changes: 0 additions & 2 deletions php-fpm/etc/mail.ini

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/composer
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose exec -e COMPOSER_MEMORY_LIMIT=-1 php-fpm composer $*
docker-compose exec -e COMPOSER_MEMORY_LIMIT=-1 php-fpm composer $*
2 changes: 1 addition & 1 deletion scripts/magento
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose exec -T php-fpm /home/magento/bin/magento $*
docker-compose exec -T php-fpm /home/magento/bin/magento $*
3 changes: 3 additions & 0 deletions scripts/n98
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

docker-compose exec -T php-fpm /usr/local/bin/n98-magerun2 $*
2 changes: 1 addition & 1 deletion scripts/php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose exec -T php-fpm php $*
docker-compose exec -T php-fpm php $*

0 comments on commit 9684df8

Please sign in to comment.