nextcloud: Update version to 21 and PHP from 7.2 to 7.4

env.template

@@ -30,7 +30,7 @@ MAIL_DATA_PATH=/srv/vmail
 
 # NEXTCLOUD
 
-NEXTCLOUD_VERSION=nextcloud-15.0.5
+NEXTCLOUD_VERSION=nextcloud-21.0.9
 NEXTCLOUD_SERVER_NAME=nextcloud
 # Internal data path
 NEXTCLOUD_DATA_PATH=/srv/nextcloud/data

images/nextcloud/Dockerfile

@@ -10,28 +10,28 @@ ARG NEXTCLOUD_BACKUP_PATH
 RUN \
     wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
     apt-get update && \
-    apt-get install -y wget bzip2 vim rsync mariadb-client cron sudo php-imagick php7.2-gmp php7.2-intl && \
+    apt-get install -y wget bzip2 vim rsync mariadb-client cron sudo php-imagick php7.4-gmp php7.4-intl && \
     apt-get clean
 
 # Change upload-limits and -sizes
-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
+RUN sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 2048M/g" /etc/php/7.4/fpm/php.ini && \
+    sed -i "s/post_max_size = 8M/post_max_size =root123  2048M/g" /etc/php/7.4/fpm/php.ini && \
+    echo 'default_charset = "UTF-8"' >> /etc/php/7.4/fpm/php.ini && \
+    echo "upload_tmp_dir = ${NEXTCLOUD_DATA_PATH}" >> /etc/php/7.4/fpm/php.ini && \
+    echo "extension = apc.so" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.enabled = 1" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.include_once_override = 0" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.shm_size = 256" >> /etc/php/7.4/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.2/fpm/php.ini && \
-    cat /tmp/php_nc.ini >> /etc/php/7.2/cli/php.ini
+RUN cat /tmp/php_nc.ini >> /etc/php/7.4/fpm/php.ini && \
+    cat /tmp/php_nc.ini >> /etc/php/7.4/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.2/fpm/pool.d/www.conf
+RUN sed -i 's/^;env/env/g' /etc/php/7.4/fpm/pool.d/www.conf
 
 # Create the data-directory where NEXTCLOUD can store its stuff
 RUN mkdir -p "${NEXTCLOUD_DATA_PATH}" && \
@@ -59,5 +59,5 @@ RUN (crontab -l 2>/dev/null; echo "*/5  *  *  *  * php -f /var/www/nextcloud/cro
 #VOLUME ${NEXTCLOUD_BACKUP_PATH}
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD service php7.2-fpm start && nginx
-#CMD ["service", "php7.2-fpm", "start", "&&", "nginx"]
+CMD service php7.4-fpm start && nginx
+#CMD ["service", "php7.4-fpm", "start", "&&", "nginx"]

images/nextcloud/Dockerfile.template

@@ -10,28 +10,28 @@ ARG NEXTCLOUD_BACKUP_PATH
 RUN \
     wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
     apt-get update && \
-    apt-get install -y wget bzip2 vim rsync mariadb-client cron sudo php-imagick php7.2-gmp php7.2-intl && \
+    apt-get install -y wget bzip2 vim rsync mariadb-client cron sudo php-imagick php7.4-gmp php7.4-intl && \
     apt-get clean
 
 # Change upload-limits and -sizes
-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
+RUN sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 2048M/g" /etc/php/7.4/fpm/php.ini && \
+    sed -i "s/post_max_size = 8M/post_max_size =root123  2048M/g" /etc/php/7.4/fpm/php.ini && \
+    echo 'default_charset = "UTF-8"' >> /etc/php/7.4/fpm/php.ini && \
+    echo "upload_tmp_dir = ${NEXTCLOUD_DATA_PATH}" >> /etc/php/7.4/fpm/php.ini && \
+    echo "extension = apc.so" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.enabled = 1" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.include_once_override = 0" >> /etc/php/7.4/fpm/php.ini && \
+    echo "apc.shm_size = 256" >> /etc/php/7.4/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.2/fpm/php.ini && \
-    cat /tmp/php_nc.ini >> /etc/php/7.2/cli/php.ini
+RUN cat /tmp/php_nc.ini >> /etc/php/7.4/fpm/php.ini && \
+    cat /tmp/php_nc.ini >> /etc/php/7.4/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.2/fpm/pool.d/www.conf
+RUN sed -i 's/^;env/env/g' /etc/php/7.4/fpm/pool.d/www.conf
 
 # Create the data-directory where NEXTCLOUD can store its stuff
 RUN mkdir -p "${NEXTCLOUD_DATA_PATH}" && \
@@ -59,5 +59,5 @@ RUN (crontab -l 2>/dev/null; echo "*/5  *  *  *  * php -f /var/www/nextcloud/cro
 #VOLUME ${NEXTCLOUD_BACKUP_PATH}
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD service php7.2-fpm start && nginx
-#CMD ["service", "php7.2-fpm", "start", "&&", "nginx"]
+CMD service php7.4-fpm start && nginx
+#CMD ["service", "php7.4-fpm", "start", "&&", "nginx"]

images/nextcloud/default

@@ -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.2-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.4-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.2-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
     }

images/nginx-php/Dockerfile

@@ -1,18 +1,18 @@
 FROM bingen/amd64-nginx
 
-# Add PHP 7.2 repo
+# Add PHP 7.4 repo
 RUN apt-get update && \
     apt-get install -y 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 php7.2-intl && \
+    apt-get install -y php7.4 php7.4-fpm php-pear php7.4-common \
+    php7.4-mysql php7.4-cli php7.4-gd php7.4-curl php-apcu php7.4-opcache \
+    php7.4-mbstring php7.4-ldap php7.4-zip php7.4-intl && \
     apt-get clean
 
 # overwrite the default-configuration with our own settings - enabling PHP
 COPY default /etc/nginx/sites-available/default
 
-CMD service php7.2-fpm start && nginx
+CMD service php7.4-fpm start && nginx

images/nginx-php/Dockerfile.template

@@ -1,18 +1,18 @@
 FROM bingen/ARCH_PLACEHOLDER-nginx
 
-# Add PHP 7.2 repo
+# Add PHP 7.4 repo
 RUN apt-get update && \
     apt-get install -y 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 php7.2-intl && \
+    apt-get install -y php7.4 php7.4-fpm php-pear php7.4-common \
+    php7.4-mysql php7.4-cli php7.4-gd php7.4-curl php-apcu php7.4-opcache \
+    php7.4-mbstring php7.4-ldap php7.4-zip php7.4-intl && \
     apt-get clean
 
 # overwrite the default-configuration with our own settings - enabling PHP
 COPY default /etc/nginx/sites-available/default
 
-CMD service php7.2-fpm start && nginx
+CMD service php7.4-fpm start && nginx