summaryrefslogtreecommitdiffstats
path: root/css
ModeNameSize
-rw-r--r--style.scss611logstatsplain
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 06:46:06 +0000
.examples/docker-compose/with-nginx-proxy/apache/proxy/uploadsize.conf (renamed from .examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf)0
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/app/Dockerfile4
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/app/autoconfig.php10
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/app/redis.php (renamed from .examples/docker-compose/with-nginx-proxy/fpm/caching.php)0
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/db.env3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml17
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/proxy/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/proxy/uploadsize.conf (renamed from .examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf)0
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/web/Dockerfile3
-rw-r--r--.examples/docker-compose/with-nginx-proxy/fpm/web/nginx.conf (renamed from .examples/docker-compose/with-nginx-proxy/fpm/nginx.conf)0
16 files changed, 57 insertions, 15 deletions
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/apache/app/Dockerfile
new file mode 100644
index 00000000..2d54bc41
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/apache/app/Dockerfile
@@ -0,0 +1,4 @@
+FROM nextcloud:apache
+
+COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
+COPY redis.php /usr/src/nextcloud/config/redis.php
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/apache/app/autoconfig.php
new file mode 100644
index 00000000..ea7004e9
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/apache/app/autoconfig.php
@@ -0,0 +1,10 @@
+<?php
+$AUTOCONFIG = array(
+ 'directory' => '/var/www/html/data',
+ 'dbtype' => 'mysql',
+ 'dbname' => getenv('MYSQL_DATABASE'),
+ 'dbuser' => getenv('MYSQL_USER'),
+ 'dbpass' => getenv('MYSQL_PASSWORD'),
+ 'dbhost' => 'db',
+ 'dbtableprefix' => '',
+);
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/caching.php b/.examples/docker-compose/with-nginx-proxy/apache/app/redis.php
index 9f8b5d2b..9f8b5d2b 100644
--- a/.examples/docker-compose/with-nginx-proxy/apache/caching.php
+++ b/.examples/docker-compose/with-nginx-proxy/apache/app/redis.php
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/db.env b/.examples/docker-compose/with-nginx-proxy/apache/db.env
new file mode 100644
index 00000000..a4366057
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/apache/db.env
@@ -0,0 +1,3 @@
+MYSQL_PASSWORD=
+MYSQL_DATABASE=nextcloud
+MYSQL_USER=nextcloud
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml
index a186b95b..ab550245 100644
--- a/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml
@@ -13,7 +13,7 @@ networks:
services:
proxy:
- image: jwilder/nginx-proxy
+ build: proxy
ports:
- 80:80
- 443:443
@@ -23,7 +23,6 @@ services:
- html:/usr/share/nginx/html
- certs:/etc/nginx/certs:ro
- /var/run/docker.sock:/tmp/docker.sock:ro
- - ./uploadsize.conf:/etc/nginx/conf.d/uploadsize.conf:ro
networks:
- proxy-tier
labels:
@@ -43,9 +42,11 @@ services:
restart: always
app:
- image: nextcloud:apache
+ build: app
volumes:
- nextcloud:/var/www/html
+ env_file:
+ - db.env
environment:
- VIRTUAL_HOST=
- LETSENCRYPT_HOST=
@@ -61,9 +62,8 @@ services:
- db:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=
- - MYSQL_DATABASE=nextcloud
- - MYSQL_USER=nextcloud
- - MYSQL_PASSWORD=
+ env_file:
+ - db.env
restart: always
redis:
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/apache/proxy/Dockerfile
new file mode 100644
index 00000000..242c84e1
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/apache/proxy/Dockerfile
@@ -0,0 +1,3 @@
+FROM jwilder/nginx-proxy:alpine
+
+COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/apache/proxy/uploadsize.conf
index 8c1bc580..8c1bc580 100644
--- a/.examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf
+++ b/.examples/docker-compose/with-nginx-proxy/apache/proxy/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/fpm/app/Dockerfile
new file mode 100644
index 00000000..dfd3c8c8
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/app/Dockerfile
@@ -0,0 +1,4 @@
+FROM nextcloud:fpm
+
+COPY autoconfig.php /usr/src/nextcloud/config/autoconfig.php
+COPY redis.php /usr/src/nextcloud/config/redis.php
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/app/autoconfig.php b/.examples/docker-compose/with-nginx-proxy/fpm/app/autoconfig.php
new file mode 100644
index 00000000..ea7004e9
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/app/autoconfig.php
@@ -0,0 +1,10 @@
+<?php
+$AUTOCONFIG = array(
+ 'directory' => '/var/www/html/data',
+ 'dbtype' => 'mysql',
+ 'dbname' => getenv('MYSQL_DATABASE'),
+ 'dbuser' => getenv('MYSQL_USER'),
+ 'dbpass' => getenv('MYSQL_PASSWORD'),
+ 'dbhost' => 'db',
+ 'dbtableprefix' => '',
+);
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/caching.php b/.examples/docker-compose/with-nginx-proxy/fpm/app/redis.php
index 9f8b5d2b..9f8b5d2b 100644
--- a/.examples/docker-compose/with-nginx-proxy/fpm/caching.php
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/app/redis.php
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/db.env b/.examples/docker-compose/with-nginx-proxy/fpm/db.env
new file mode 100644
index 00000000..a4366057
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/db.env
@@ -0,0 +1,3 @@
+MYSQL_PASSWORD=
+MYSQL_DATABASE=nextcloud
+MYSQL_USER=nextcloud
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml
index 756ebcdb..bbe5ec32 100644
--- a/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ networks:
services:
proxy:
- image: jwilder/nginx-proxy
+ build: proxy
ports:
- 80:80
- 443:443
@@ -23,7 +23,6 @@ services:
- html:/usr/share/nginx/html
- certs:/etc/nginx/certs:ro
- /var/run/docker.sock:/tmp/docker.sock:ro
- - ./uploadsize.conf:/etc/nginx/conf.d/uploadsize.conf:ro
networks:
- proxy-tier
labels:
@@ -43,9 +42,8 @@ services:
restart: always
web:
- image: nginx
+ build: web
volumes:
- - ./nginx.conf:/etc/nginx/nginx.conf:ro
- nextcloud:/var/www/html
environment:
- VIRTUAL_HOST=
@@ -57,7 +55,9 @@ services:
restart: always
app:
- image: nextcloud:fpm
+ build: app
+ env_file:
+ - db.env
volumes:
- nextcloud:/var/www/html
restart: always
@@ -66,17 +66,16 @@ services:
image: mariadb
volumes:
- db:/var/lib/mysql
+ env_file:
+ - db.env
environment:
- MYSQL_ROOT_PASSWORD=
- - MYSQL_DATABASE=nextcloud
- - MYSQL_USER=nextcloud
- - MYSQL_PASSWORD=
restart: always
redis:
image: redis
restart: always
-
+
collabora:
image: collabora/code
cap_add:
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/fpm/proxy/Dockerfile
new file mode 100644
index 00000000..242c84e1
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/proxy/Dockerfile
@@ -0,0 +1,3 @@
+FROM jwilder/nginx-proxy:alpine
+
+COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/fpm/proxy/uploadsize.conf
index 8c1bc580..8c1bc580 100644
--- a/.examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf
+++ b/.examples/docker-compose/with-nginx-proxy/fpm/proxy/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/fpm/web/Dockerfile
new file mode 100644