use php 7.3

This commit is contained in:
Francis 2021-03-28 14:38:22 +02:00
parent aff574475b
commit 4cde45f092
No known key found for this signature in database
GPG key ID: 071BEA4C2B10077C
3 changed files with 29 additions and 14 deletions

View file

@ -1,16 +1,23 @@
FROM drupal:7-php7.4-apache-buster FROM php:7.3-fpm
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libxml2-dev \ libxml2-dev \
curl \ libpq-dev \
&& docker-php-ext-install -j "$(nproc)" dom libpng-dev \
libzip-dev
RUN docker-php-ext-install -j $(nproc) pgsql dom pdo_pgsql gd zip
ADD https://ftp.drupal.org/files/projects/drupal-7.78.tar.gz /tmp
ADD https://framagit.org/framasoft/framaforms/-/archive/1.0.3/framaforms-1.0.3.tar.gz /tmp ADD https://framagit.org/framasoft/framaforms/-/archive/1.0.3/framaforms-1.0.3.tar.gz /tmp
RUN tar -xzf /tmp/drupal-7.78.tar.gz
RUN tar -xzf /tmp/framaforms-1.0.3.tar.gz RUN tar -xzf /tmp/framaforms-1.0.3.tar.gz
RUN cp -r drupal-7.78/* /var/www/html/
RUN cp -r framaforms-1.0.3/profiles/framaforms_org/ profiles/ RUN cp -r framaforms-1.0.3/profiles/framaforms_org/ profiles/
COPY settings.php sites/default/settings.php COPY settings.php sites/default/settings.php
RUN chmod 644 sites/default/settings.php RUN chmod 644 sites/default/settings.php
RUN chown -R www-data:www-data *

View file

@ -1,13 +1,20 @@
version: "3.8" version: "3.8"
services: services:
app: app-fpm:
build: . build: .
volumes: volumes:
- drupal-modules:/var/www/html/modules - webroot:/var/www/html
- drupal-profiles:/var/www/html/profiles #- drupal-modules:/var/www/html/modules
- drupal-sites:/var/www/html/sites #- drupal-profiles:/var/www/html/profiles
- drupal-themes:/var/www/html/themes #- drupal-sites:/var/www/html/sites
#- drupal-themes:/var/www/html/themes
tty: true
nginx:
image: nginx:latest
volumes:
- webroot:/var/www/html
- ./conf.d:/etc/nginx/conf.d
ports: ports:
- 8000:80 - 8000:80
db: db:
@ -27,3 +34,4 @@ volumes:
drupal-profiles: drupal-profiles:
drupal-sites: drupal-sites:
drupal-themes: drupal-themes:
webroot:

View file

@ -2,11 +2,11 @@ server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
root /var/www/your_folder; root /var/www/html;
index index.html; index index.html;
error_log /var/log/nginx/<yoursite>.error.log; error_log /var/log/nginx/drupal.error.log;
access_log /var/log/nginx/<yoursite>.access.log combined; access_log /var/log/nginx/drupal.access.log combined;
location ~ \.php$ { location ~ \.php$ {
@ -14,7 +14,7 @@ server {
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
fastcgi_send_timeout 300s; fastcgi_send_timeout 300s;
fastcgi_read_timeout 300s; fastcgi_read_timeout 300s;
fastcgi_pass unix:/run/php/php7.3-fpm.sock; fastcgi_pass app-fpm:9000;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
} }