Merge pull request #7426 from evgeniyKazak/LAW-5954

LAW-5954

devops/Dockerfile

@@ -1,25 +1,18 @@
-FROM wordpress:4.9-fpm
+FROM wordpress:5.9-fpm
 
 ENV TMP /tmp/nginx-php/
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        libjpeg-dev \
-		libpng-dev \
-		libfreetype6-dev \
-    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-freetype-dir=/usr/include \
-    && docker-php-ext-install gd
+RUN apt-get update && apt-get install -y --no-install-recommends nginx
 
 # php configs
 COPY www.conf /usr/local/etc/php-fpm.d/www.conf
 COPY docker-php.ini /usr/local/etc/php/conf.d/docker-php.ini
 
-RUN apt-get install -y nginx
-
 # nginx configs
 COPY nginx /etc/nginx
 
 # source code
-COPY htdocs /var/www
+COPY htdocs /var/www/html
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

devops/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+chown -R www-data:www-data /var/www/html/
+
 printf "\n\nStarting PHP daemon...\n\n"
 php-fpm --daemonize
 

devops/nginx/sites-available/default.conf

@@ -2,7 +2,7 @@ server {
     listen 80;
     server_name lawcarta.loc livecarta.loc localhost;
 
-    root /var/www;
+    root /var/www/html;
     index index.php;
 
     access_log /var/log/nginx/access.log;