Use custom Dockerfiles instead of mounting files for remote docker #104

This commit is contained in:
Marc Brückner 2017-08-16 17:21:07 +02:00 committed by Tilo Spannagel
parent b120af8e7f
commit 3c2f4b52e1
No known key found for this signature in database
GPG Key ID: B89F1626A58E1429
16 changed files with 57 additions and 15 deletions

View File

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

View File

@ -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' => '',
);

View File

@ -0,0 +1,3 @@
MYSQL_PASSWORD=
MYSQL_DATABASE=nextcloud
MYSQL_USER=nextcloud

View File

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

View File

@ -0,0 +1,3 @@
FROM jwilder/nginx-proxy:alpine
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

View File

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

View File

@ -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' => '',
);

View File

@ -0,0 +1,3 @@
MYSQL_PASSWORD=
MYSQL_DATABASE=nextcloud
MYSQL_USER=nextcloud

View File

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

View File

@ -0,0 +1,3 @@
FROM jwilder/nginx-proxy:alpine
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

View File

@ -0,0 +1,3 @@
FROM nginx
COPY nginx.conf /etc/nginx/nginx.conf