From bcbc8b3613e70e91fa062ffd7a3d106c167013c9 Mon Sep 17 00:00:00 2001
From: unteem <timothee@unteem.org>
Date: Tue, 9 Jan 2018 19:17:26 +0100
Subject: [PATCH] use autoconfig & add mail.config.php
---
Dockerfile | 2 ++
docker-compose.yml | 10 +++++++++-
scripts/install | 23 +++++------------------
3 files changed, 16 insertions(+), 19 deletions(-)
create mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..df26e08
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,2 @@
+FROM nextcloud:12-fpm
+COPY mail.config.php /usr/src/nextcloud/config/
diff --git a/docker-compose.yml b/docker-compose.yml
index 31cf6c4..517fadd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,13 +23,21 @@ services:
- back
- lb_web
app:
- image: nextcloud:12-fpm
+ build: .
links:
- db
volumes:
- ./data/apps:/var/www/html/apps
+ - ./data/custom_apps:/var/www/html/custom_apps
- ./data/config:/var/www/html/config
- ./data/data:/var/www/html/data
+ environment:
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_HOST=db
+ - MYSQL_USER=root
+ - MYSQL_PASSWORD
+ - NEXTCLOUD_ADMIN_PASSWORD
+ - NEXTCLOUD_ADMIN_USER=indie
networks:
- back
db:
diff --git a/scripts/install b/scripts/install
index eb59503..1efdfa8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -1,28 +1,16 @@
#!/bin/bash -eux
-mkdir -p ./data/config
-
MYSQL_ROOT_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
+NEXTCLOUD_ADMIN_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
echo "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" > .env
+echo "SUBNET=1" >> .env
+echo "MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}" >> .env
+echo "NEXTCLOUD_ADMIN_PASSWORD=${MYSQL_ROOT_PASSWORD}" >> .env
-cat > ./data/config/config.php <<EOF
+cat > mail.config.php <<EOF
<?php
\$CONFIG = array (
- 'trusted_domains' =>
- array (
- 0 => '${URL}',
- ),
- 'datadirectory' => '/var/www/html/data',
- 'overwrite.cli.url' => 'https://${URL}',
- 'dbtype' => 'mysql',
- 'dbname' => 'owncloud',
- 'dbhost' => 'db:3306',
- 'dbtableprefix' => 'oc_',
- 'dbuser' => 'root',
- 'dbpassword' => '${MYSQL_ROOT_PASSWORD}',
- 'theme' => '',
- 'maintenance' => false,
'mail_domain' => '${MAIL_DOMAIN}',
'mail_from_address' => 'noreply.${URL}',
'mail_smtpmode' => 'smtp',
@@ -33,6 +21,5 @@ cat > ./data/config/config.php <<EOF
'mail_smtpname' => 'noreply.${URL}@${MAIL_DOMAIN}',
'mail_smtppassword' => '${MAIL_PASS}',
'mail_smtpsecure' => 'tls',
- 'memcache.local' => '\\OC\\Memcache\\APCu',
);
EOF
--
GitLab