From b49e7a86b7995c6d2e3a7f9c62fac25e74ba6f4a Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Fri, 22 Jan 2021 11:55:43 +0100
Subject: [PATCH] new: [nextcloud] allow to override image locally

By removing the build phase and pushing the patched docker
image in =docker.0k.io= registry, we allow to override
image in =compose.yml=.

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
---
 nextcloud/build/Dockerfile                 | 13 -------------
 nextcloud/build/database-accept-dots.patch | 14 --------------
 nextcloud/metadata.yml                     |  2 +-
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 nextcloud/build/Dockerfile
 delete mode 100644 nextcloud/build/database-accept-dots.patch

diff --git a/nextcloud/build/Dockerfile b/nextcloud/build/Dockerfile
deleted file mode 100644
index 445f1cd..0000000
--- a/nextcloud/build/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-## This is a cache of nextcloud:18.0.1 image (gmp is included)
-FROM docker.0k.io/nextcloud:1.2.0
-
-
-##
-## What is following is only to patch nextcloud to remove
-## some database name checks
-##
-
-COPY database-accept-dots.patch /tmp/
-
-RUN cd /usr/src/nextcloud && \
-    patch -p1 < /tmp/database-accept-dots.patch
\ No newline at end of file
diff --git a/nextcloud/build/database-accept-dots.patch b/nextcloud/build/database-accept-dots.patch
deleted file mode 100644
index b25e9f5..0000000
--- a/nextcloud/build/database-accept-dots.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
-index 0cbfecf..a821a2e 100644
---- a/lib/private/Setup/AbstractDatabase.php
-+++ b/lib/private/Setup/AbstractDatabase.php
-@@ -72,9 +72,6 @@ abstract class AbstractDatabase {
- 		} elseif (empty($config['dbname'])) {
- 			$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
- 		}
--		if(substr_count($config['dbname'], '.') >= 1) {
--			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
--		}
- 		return $errors;
- 	}
- 
diff --git a/nextcloud/metadata.yml b/nextcloud/metadata.yml
index 309dc45..f338f54 100644
--- a/nextcloud/metadata.yml
+++ b/nextcloud/metadata.yml
@@ -1,9 +1,9 @@
+docker-image: docker.0k.io/nextcloud:18.0.1-myc
 data-resources:
   - /var/www/html
   - /var/lib/nextcloud/data
 config-resources:
   - /var/www/html/config
-
 provides:
   nextcloud-app:
 uses: