Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f67aff2 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'nc19' into 'master'

Nc19

See merge request !6
parents 8eff99e8 df3ab34d
Loading
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
FROM nextcloud:18-fpm
FROM nextcloud:19.0.7-fpm
RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
COPY patches/ /tmp/build_patches/
RUN patch -u /usr/src/nextcloud/version.php -i /tmp/build_patches/001-version-bump.patch && \
	patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch
RUN patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch

patches/001-version-bump.patch

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line
--- version.original.php	2020-12-04 10:55:45.000000000 +0100
+++ version.php	2020-12-04 10:56:09.000000000 +0100
@@ -1,5 +1,5 @@
 <?php 
-$OC_Version = array(18,0,11,2);
+$OC_Version = array(18,0,11,3);
 $OC_VersionString = '18.0.11';
 $OC_Edition = '';
 $OC_Channel = 'stable';