Parcourir la source

Nginx/Nextcloud: Upgrade to PHP 7.2

To be able to use Passwords app.
multi_domain
ßingen il y a 7 ans
Parent
révision
1c7249d800
3 fichiers modifiés avec 25 ajouts et 20 suppressions
  1. +13
    -13
      images/rpi-nextcloud/Dockerfile
  2. +2
    -2
      images/rpi-nextcloud/default
  3. +10
    -5
      images/rpi-nginx-php/Dockerfile

+ 13
- 13
images/rpi-nextcloud/Dockerfile Voir le fichier

@@ -11,24 +11,24 @@ RUN apt-get update && \
apt-get clean

# Change upload-limits and -sizes
RUN sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 2048M/g" /etc/php/7.0/fpm/php.ini && \
sed -i "s/post_max_size = 8M/post_max_size =root123 2048M/g" /etc/php/7.0/fpm/php.ini && \
echo 'default_charset = "UTF-8"' >> /etc/php/7.0/fpm/php.ini && \
echo "upload_tmp_dir = ${NEXTCLOUD_DATA_PATH}" >> /etc/php/7.0/fpm/php.ini && \
echo "extension = apc.so" >> /etc/php/7.0/fpm/php.ini && \
echo "apc.enabled = 1" >> /etc/php/7.0/fpm/php.ini && \
echo "apc.include_once_override = 0" >> /etc/php/7.0/fpm/php.ini && \
echo "apc.shm_size = 256" >> /etc/php/7.0/fpm/php.ini
RUN sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 2048M/g" /etc/php/7.2/fpm/php.ini && \
sed -i "s/post_max_size = 8M/post_max_size =root123 2048M/g" /etc/php/7.2/fpm/php.ini && \
echo 'default_charset = "UTF-8"' >> /etc/php/7.2/fpm/php.ini && \
echo "upload_tmp_dir = ${NEXTCLOUD_DATA_PATH}" >> /etc/php/7.2/fpm/php.ini && \
echo "extension = apc.so" >> /etc/php/7.2/fpm/php.ini && \
echo "apc.enabled = 1" >> /etc/php/7.2/fpm/php.ini && \
echo "apc.include_once_override = 0" >> /etc/php/7.2/fpm/php.ini && \
echo "apc.shm_size = 256" >> /etc/php/7.2/fpm/php.ini

# now add our hand-written nginx-default-configuration which makes use of all the stuff so far prepared
COPY default /etc/nginx/sites-available/default

# PHP config
COPY php_nc.ini /tmp/php_nc.ini
RUN cat /tmp/php_nc.ini >> /etc/php/7.0/fpm/php.ini && \
cat /tmp/php_nc.ini >> /etc/php/7.0/cli/php.ini
RUN cat /tmp/php_nc.ini >> /etc/php/7.2/fpm/php.ini && \
cat /tmp/php_nc.ini >> /etc/php/7.2/cli/php.ini
# https://docs.nextcloud.com/server/13/admin_manual/installation/source_installation.html#php-fpm-tips-label
RUN sed -i 's/^;env/env/g' /etc/php/7.0/fpm/pool.d/www.conf
RUN sed -i 's/^;env/env/g' /etc/php/7.2/fpm/pool.d/www.conf

# Create the data-directory where NEXTCLOUD can store its stuff
RUN mkdir -p "${NEXTCLOUD_DATA_PATH}" && \
@@ -54,5 +54,5 @@ RUN chmod +x /etc/cron.daily/backup
#VOLUME ${NEXTCLOUD_BACKUP_PATH}

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD service php7.0-fpm start && nginx
#CMD ["service", "php7.0-fpm", "start", "&&", "nginx"]
CMD service php7.2-fpm start && nginx
#CMD ["service", "php7.2-fpm", "start", "&&", "nginx"]

+ 2
- 2
images/rpi-nextcloud/default Voir le fichier

@@ -57,7 +57,7 @@ server {
fastcgi_param SCRIPT_FILENAME $document_root$1;
fastcgi_param PATH_INFO $2;
fastcgi_param HTTPS on;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
}

location ~* ^.+\.(jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
@@ -69,7 +69,7 @@ server {
location ~ \.php$ {
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
}

+ 10
- 5
images/rpi-nginx-php/Dockerfile Voir le fichier

@@ -1,13 +1,18 @@
FROM bingen/rpi-nginx

# update and install php5
# Add PHP 7.2 repo
RUN apt-get update && \
apt-get install -y php7.0 php7.0-fpm php-pear php7.0-common php7.0-mcrypt \
php7.0-mysql php7.0-cli php7.0-gd php7.0-curl php7.0-apcu php7.0-opcache \
php7.0-mbstring php7.0-ldap php7.0-zip && \
apt-get install apt-transport-https lsb-release ca-certificates wget && \
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
# update and install php
RUN apt-get update && \
apt-get install -y php7.2 php7.2-fpm php-pear php7.2-common \
php7.2-mysql php7.2-cli php7.2-gd php7.2-curl php-apcu php7.2-opcache \
php7.2-mbstring php7.2-ldap php7.2-zip && \
apt-get clean

# overwrite the default-configuration with our own settings - enabling PHP
COPY default /etc/nginx/sites-available/default

CMD service php7.0-fpm start && nginx
CMD service php7.2-fpm start && nginx

Chargement…
Annuler
Enregistrer