diff options
author | Marc Brückner <m.brueckner90@gmail.com> | 2017-08-02 11:52:53 +0200 |
---|---|---|
committer | Tilo Spannagel <development@tilosp.de> | 2017-09-27 13:29:11 +0200 |
commit | e87d8d121700557b977bc442a42de024e33b67a6 (patch) | |
tree | 0f20467a1bb36c379df9f6da7af3dae491b67673 | |
parent | 83b027fbaedbd4c866f795308cedee4f8453c06a (diff) |
rework of docker-compose examples
-rw-r--r-- | .examples/docker-compose.yml | 97 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/apache/caching.php | 12 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml | 79 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf | 1 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/fpm/caching.php | 12 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml | 86 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/fpm/nginx.conf (renamed from .examples/nginx.conf) | 0 | ||||
-rw-r--r-- | .examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf | 1 |
8 files changed, 191 insertions, 97 deletions
diff --git a/.examples/docker-compose.yml b/.examples/docker-compose.yml deleted file mode 100644 index 60167edc..00000000 --- a/.examples/docker-compose.yml +++ /dev/null @@ -1,97 +0,0 @@ -version: '2' -services: - proxy: - image: jwilder/nginx-proxy - container_name: proxy - ports: - - 80:80 - - 443:443 - volumes: - - ./proxy/conf.d:/etc/nginx/conf.d - - ./proxy/vhost.d:/etc/nginx/vhost.d - - ./proxy/html:/usr/share/nginx/html - - ./proxy/certs:/etc/nginx/certs:ro - - /var/run/docker.sock:/tmp/docker.sock:ro - networks: - - proxy-tier - restart: always - - letsencrypt-companion: - image: alastaircoote/docker-letsencrypt-nginx-proxy-companion - container_name: letsencrypt-companion - volumes_from: - - proxy - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - ./proxy/certs:/etc/nginx/certs:rw - restart: always - - web: - image: nginx - container_name: nextcloud_webserver - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - links: - - app - - collabora - volumes_from: - - app - environment: - - VIRTUAL_HOST=${DOMAIN} - - VIRTUAL_NETWORK=nginx-proxy - - VIRTUAL_PORT=80 - - LETSENCRYPT_HOST=${DOMAIN} - - LETSENCRYPT_EMAIL= - networks: - - proxy-tier - restart: always - - app: - image: nextcloud:fpm - container_name: nextcloud_fpm - links: - - db - volumes: - - ./nextcloud/apps:/var/www/html/apps - - ./nextcloud/config:/var/www/html/config - - ./nextcloud/data:/var/www/html/data - networks: - - proxy-tier - restart: always - - db: - image: mariadb - container_name: db - volumes: - - ./nextcloud/db:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD= - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_PASSWORD= - networks: - - proxy-tier - restart: always - - redis: - image: redis - container_name: redis - networks: - - proxy-tier - restart: always - - collabora: - image: collabora/code - container_name: collabora - cap_add: - - MKNOD - environment: - - domain=${DOMAIN} - networks: - - proxy-tier - restart: always - -networks: - proxy-tier: - external: - name: nginx-proxy diff --git a/.examples/docker-compose/with-nginx-proxy/apache/caching.php b/.examples/docker-compose/with-nginx-proxy/apache/caching.php new file mode 100644 index 00000000..d97c77c2 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/apache/caching.php @@ -0,0 +1,12 @@ +<? +$CONFIG = array ( + 'memcache.local' => '\\OC\\Memcache\\APCu', + 'memcache.locking' => '\\OC\\Memcache\\Redis', + 'filelocking.enabled' => 'true', + 'redis' => + array ( + 'host' => 'redis', + 'port' => 6379, + ), +); +?> diff --git a/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml new file mode 100644 index 00000000..a186b95b --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/apache/docker-compose.yml @@ -0,0 +1,79 @@ +version: '3' + +volumes: + certs: + conf.d: + vhost.d: + html: + nextcloud: + db: + +networks: + proxy-tier: + +services: + proxy: + image: jwilder/nginx-proxy + ports: + - 80:80 + - 443:443 + volumes: + - conf.d:/etc/nginx/conf.d + - vhost.d:/etc/nginx/vhost.d + - 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: + - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy + restart: always + + letsencrypt-companion: + image: jrcs/letsencrypt-nginx-proxy-companion + volumes: + - conf.d:/etc/nginx/conf.d + - vhost.d:/etc/nginx/vhost.d + - html:/usr/share/nginx/html + - certs:/etc/nginx/certs:rw + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - proxy-tier + restart: always + + app: + image: nextcloud:apache + volumes: + - nextcloud:/var/www/html + environment: + - VIRTUAL_HOST= + - LETSENCRYPT_HOST= + - LETSENCRYPT_EMAIL= + networks: + - proxy-tier + - default + restart: always + + db: + image: mariadb + volumes: + - db:/var/lib/mysql + 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: + - MKNOD + environment: + - domain= + restart: always diff --git a/.examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf new file mode 100644 index 00000000..8c1bc580 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/apache/uploadsize.conf @@ -0,0 +1 @@ +client_max_body_size 10g; diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/caching.php b/.examples/docker-compose/with-nginx-proxy/fpm/caching.php new file mode 100644 index 00000000..d97c77c2 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/fpm/caching.php @@ -0,0 +1,12 @@ +<? +$CONFIG = array ( + 'memcache.local' => '\\OC\\Memcache\\APCu', + 'memcache.locking' => '\\OC\\Memcache\\Redis', + 'filelocking.enabled' => 'true', + 'redis' => + array ( + 'host' => 'redis', + 'port' => 6379, + ), +); +?> diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml new file mode 100644 index 00000000..756ebcdb --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/fpm/docker-compose.yml @@ -0,0 +1,86 @@ +version: '3' + +volumes: + certs: + conf.d: + vhost.d: + html: + nextcloud: + db: + +networks: + proxy-tier: + +services: + proxy: + image: jwilder/nginx-proxy + ports: + - 80:80 + - 443:443 + volumes: + - conf.d:/etc/nginx/conf.d + - vhost.d:/etc/nginx/vhost.d + - 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: + - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy + restart: always + + letsencrypt-companion: + image: jrcs/letsencrypt-nginx-proxy-companion + volumes: + - conf.d:/etc/nginx/conf.d + - vhost.d:/etc/nginx/vhost.d + - html:/usr/share/nginx/html + - certs:/etc/nginx/certs:rw + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - proxy-tier + restart: always + + web: + image: nginx + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + - nextcloud:/var/www/html + environment: + - VIRTUAL_HOST= + - LETSENCRYPT_HOST= + - LETSENCRYPT_EMAIL= + networks: + - proxy-tier + - default + restart: always + + app: + image: nextcloud:fpm + volumes: + - nextcloud:/var/www/html + restart: always + + db: + image: mariadb + volumes: + - db:/var/lib/mysql + 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: + - MKNOD + environment: + - domain= + restart: always diff --git a/.examples/nginx.conf b/.examples/docker-compose/with-nginx-proxy/fpm/nginx.conf index 40b0975a..40b0975a 100644 --- a/.examples/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/fpm/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf new file mode 100644 index 00000000..8c1bc580 --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/fpm/uploadsize.conf @@ -0,0 +1 @@ +client_max_body_size 10g; |