Skip to content

Commit d884895

Browse files
committed
Updated config for Magento 2.4.5
1 parent 43416f4 commit d884895

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ services:
5050
volumes:
5151
- rabbitmqdata:/var/lib/rabbitmq
5252
elasticsearch:
53-
build: ./es
53+
image: "docker.elastic.co/elasticsearch/elasticsearch:7.16.3"
5454
ports:
5555
- "9200:9200"
5656
- "9300:9300"
5757
environment:
58-
"discovery.type": "single-node"
58+
- "discovery.type=single-node"
59+
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
5960
volumes:
6061
magento:
6162
rabbitmqdata:

php/Dockerfile

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4-fpm-buster
1+
FROM php:8.1-fpm-buster
22

33
RUN echo "Acquire::http::Pipeline-Depth 0;" > /etc/apt/apt.conf.d/privet && echo "Acquire::http::No-Cache true;" >> /etc/apt/apt.conf.d/privet && echo "Acquire::BrokenProxy true;" >> /etc/apt/apt.conf.d/privet
44

@@ -24,27 +24,19 @@ RUN apt-get -qq install -y \
2424
&& docker-php-ext-install -j$(nproc) intl xsl gd zip pdo_mysql opcache soap bcmath json iconv pcntl sockets
2525

2626
# Enable Xdebug
27-
RUN pecl install xdebug-3.0.3 && docker-php-ext-enable xdebug
27+
RUN pecl install xdebug-3.2.0 && docker-php-ext-enable xdebug
2828
RUN echo "xdebug.mode=develop,debug" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
2929
&& echo "xdebug.client_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
3030

31-
32-
#setup blackfire
33-
RUN apt-get install -y gnupg
34-
RUN curl -s https://packages.blackfire.io/gpg.key | apt-key add - \
35-
&& echo "deb http://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
36-
&& apt-get update \
37-
&& apt-get install blackfire-agent blackfire-php
38-
3931
# Configure MailHog
40-
RUN go get github.com/mailhog/mhsendmail && cp /root/go/bin/mhsendmail /usr/local/bin/
41-
RUN echo 'sendmail_path="/usr/local/bin/mhsendmail --smtp-addr=mailhog:1025"' >> /usr/local/etc/php/conf.d/mail.ini
32+
RUN go get github.com/mailhog/mhsendmail
33+
RUN echo 'sendmail_path="/root/go/bin/mhsendmail --smtp-addr=mailhog:1025"' >> /usr/local/etc/php/conf.d/mail.ini
4234

4335
# Set memory limit
4436
RUN echo "memory_limit=4G" >> /usr/local/etc/php/conf.d/memory_limit.ini
4537

4638
# Install Composer
47-
RUN cd /usr/src && curl https://getcomposer.org/download/1.10.19/composer.phar --output composer.phar | php
39+
RUN cd /usr/src && curl https://getcomposer.org/download/2.5.1/composer.phar --output composer.phar | php
4840
RUN cd /usr/src && mv composer.phar /usr/bin/composer
4941
RUN chmod +x /usr/bin/composer
5042

@@ -53,9 +45,6 @@ RUN cd /usr/local/bin && curl -sS -O https://files.magerun.net/n98-magerun2-late
5345
RUN mv /usr/local/bin/n98-magerun2-latest.phar /usr/local/bin/n98-magerun2.phar
5446
RUN chmod +x /usr/local/bin/n98-magerun2.phar
5547

56-
# Add https://github.com/hirak/prestissimo support
57-
RUN composer global require hirak/prestissimo
58-
5948
WORKDIR /var/www/magento
6049

6150
CMD php-fpm

0 commit comments

Comments
 (0)