Browse Source

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>
dev
Valentin Lab 3 years ago
parent
commit
b49e7a86b7
  1. 13
      nextcloud/build/Dockerfile
  2. 14
      nextcloud/build/database-accept-dots.patch
  3. 2
      nextcloud/metadata.yml

13
nextcloud/build/Dockerfile

@ -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

14
nextcloud/build/database-accept-dots.patch

@ -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;
}

2
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:

Loading…
Cancel
Save