From 29a08a0c949e698685ea8641766c71a3e969a146 Mon Sep 17 00:00:00 2001
From: diroots <diroots@no-log.org>
Date: Mon, 4 Jan 2021 17:00:46 +0100
Subject: [PATCH 1/4] version bump patch test

---
 patches/001-version-bump.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/001-version-bump.patch b/patches/001-version-bump.patch
index 412ab435..66acaa5c 100644
--- a/patches/001-version-bump.patch
+++ b/patches/001-version-bump.patch
@@ -2,8 +2,8 @@
 +++ 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_Version = array(18,0,12,2);
++$OC_Version = array(18,0,12,3);
+ $OC_VersionString = '18.0.12';
  $OC_Edition = '';
  $OC_Channel = 'stable';
-- 
GitLab


From e03f186acf831e644a763304b6e9b4e87e8f334a Mon Sep 17 00:00:00 2001
From: diroots <diroots@no-log.org>
Date: Mon, 4 Jan 2021 17:04:28 +0100
Subject: [PATCH 2/4] upgrade image to NC 19.0.6

---
 Dockerfile                     | 2 +-
 patches/001-version-bump.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3702a477..2b68a9da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:18-fpm
+FROM nextcloud:19-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 && \
diff --git a/patches/001-version-bump.patch b/patches/001-version-bump.patch
index 66acaa5c..c61f7906 100644
--- a/patches/001-version-bump.patch
+++ b/patches/001-version-bump.patch
@@ -2,8 +2,8 @@
 +++ version.php	2020-12-04 10:56:09.000000000 +0100
 @@ -1,5 +1,5 @@
  <?php 
--$OC_Version = array(18,0,12,2);
-+$OC_Version = array(18,0,12,3);
- $OC_VersionString = '18.0.12';
+-$OC_Version = array(19,0,6,2);
++$OC_Version = array(19,0,6,3);
+ $OC_VersionString = '19.0.6';
  $OC_Edition = '';
  $OC_Channel = 'stable';
-- 
GitLab


From f8a65ce0b295e82286fb5fab1eabc06fb4a42954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Wed, 20 Jan 2021 14:58:37 +0000
Subject: [PATCH 3/4] Pin 19.0.7 image and skip version bump

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b68a9da..acbfb966 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-FROM nextcloud:19-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
-- 
GitLab


From 993287bc4e183f8e63f0529568e94baf263177f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Wed, 20 Jan 2021 14:59:10 +0000
Subject: [PATCH 4/4] Delete 001-version-bump.patch

---
 patches/001-version-bump.patch | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 patches/001-version-bump.patch

diff --git a/patches/001-version-bump.patch b/patches/001-version-bump.patch
deleted file mode 100644
index c61f7906..00000000
--- a/patches/001-version-bump.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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(19,0,6,2);
-+$OC_Version = array(19,0,6,3);
- $OC_VersionString = '19.0.6';
- $OC_Edition = '';
- $OC_Channel = 'stable';
-- 
GitLab