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

nextcloud · Aug 28, 2017 · e9f61d1 · e9f61d1
1 parent bce03e0
commit e9f61d1
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 15 deletions.
diff --git a/.examples/docker-compose/with-nginx-proxy/apache/app/Dockerfile 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
@@ -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/...mpose/with-nginx-proxy/apache/caching.php → ...ose/with-nginx-proxy/apache/app/redis.php b/...mpose/with-nginx-proxy/apache/caching.php → ...ose/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
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+FROM jwilder/nginx-proxy:alpine
+
+COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/...e/with-nginx-proxy/apache/uploadsize.conf → ...-nginx-proxy/apache/proxy/uploadsize.conf b/...e/with-nginx-proxy/apache/uploadsize.conf → ...-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
@@ -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
@@ -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/...-compose/with-nginx-proxy/fpm/caching.php → ...ompose/with-nginx-proxy/fpm/app/redis.php b/...-compose/with-nginx-proxy/fpm/caching.php → ...ompose/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
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+FROM jwilder/nginx-proxy:alpine
+
+COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/...pose/with-nginx-proxy/fpm/uploadsize.conf → ...ith-nginx-proxy/fpm/proxy/uploadsize.conf b/...pose/with-nginx-proxy/fpm/uploadsize.conf → ...ith-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
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/...r-compose/with-nginx-proxy/fpm/nginx.conf → ...mpose/with-nginx-proxy/fpm/web/nginx.conf b/...r-compose/with-nginx-proxy/fpm/nginx.conf → ...mpose/with-nginx-proxy/fpm/web/nginx.conf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM jwilder/nginx-proxy:alpine

		COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM nginx

		COPY nginx.conf /etc/nginx/nginx.conf