Skip to content
This repository was archived by the owner on Oct 1, 2020. It is now read-only.

Commit 057e638

Browse files
authored
Merge pull request #123 from paliarush/upgrade-php-7.3
Compatibility with the latest Magento mainline:
2 parents a17a211 + 4633d9d commit 057e638

File tree

3 files changed

+57
-52
lines changed

3 files changed

+57
-52
lines changed

etc/docker/monolith/Dockerfile

+54-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,56 @@
1-
FROM paliarush123/minikube-php-fpm:latest
1+
FROM php:7.3-fpm
2+
3+
# Install dependencies
4+
RUN apt-get update \
5+
&& apt-get install -y \
6+
libfreetype6-dev \
7+
libicu-dev \
8+
libjpeg62-turbo-dev \
9+
libmcrypt-dev \
10+
libpng-dev \
11+
libxslt1-dev \
12+
sendmail-bin \
13+
sendmail \
14+
sudo \
15+
net-tools \
16+
nano
17+
18+
RUN apt-get install -y apt-utils
19+
RUN apt-get install -y libzip-dev
20+
21+
# Configure the gd library
22+
RUN docker-php-ext-configure \
23+
gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
24+
25+
RUN docker-php-ext-configure opcache --enable-opcache
26+
27+
# Install required PHP extensions
28+
RUN docker-php-ext-install \
29+
dom \
30+
gd \
31+
intl \
32+
mbstring \
33+
pdo_mysql \
34+
xsl \
35+
zip \
36+
bcmath \
37+
soap \
38+
sockets \
39+
opcache
40+
41+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
42+
RUN pecl install -o -f xdebug
43+
44+
RUN apt-get update && apt-get install -y default-mysql-client && rm -rf /var/lib/apt/lists/*
45+
46+
RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/*
47+
48+
RUN apt-get update && apt-get install -y redis-tools && rm -rf /var/lib/apt/lists/*
49+
50+
COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
51+
COPY etc/php-fpm.ini /usr/local/etc/php/conf.d/zz-magento.ini
52+
COPY etc/php-fpm.conf /usr/local/etc/
53+
54+
CMD ["php-fpm", "-R"]
255

356
RUN sed -i "s|listen = 0.0.0.0:9000|listen = 0.0.0.0:9001|g" /usr/local/etc/php-fpm.conf

scripts/Dockerfile

-51
This file was deleted.

scripts/guest/m-reinstall

+3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ install_cmd="./bin/magento setup:install \
8282
--admin-email=${setupOptions[admin_email]} \
8383
--admin-user=${setupOptions[admin_user]} \
8484
--admin-password=${setupOptions[admin_password]} \
85+
--elasticsearch-host=elasticsearch-master \
86+
--elasticsearch-port=9200 \
87+
--elasticsearch-index-prefix=magento2 \
8588
--cleanup-database \
8689
--use-rewrites=1"
8790

0 commit comments

Comments
 (0)