Add Dockerfile for nginx

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

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -25,13 +25,12 @@ services:
       - db.env
 
   web:
-    image: nginx
+    build: ./web
     restart: always
     ports:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html:ro
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
 
   cron:
     build: ./app

diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/...nsecure/mariadb-cron-redis/fpm/nginx.conf → ...ure/mariadb-cron-redis/fpm/web/nginx.conf b/...nsecure/mariadb-cron-redis/fpm/nginx.conf → ...ure/mariadb-cron-redis/fpm/web/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -21,13 +21,12 @@ services:
       - db.env
 
   web:
-    image: nginx
+    build: ./web
     restart: always
     ports:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html:ro
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
 
 volumes:
   db:

diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/...r-compose/insecure/mariadb/fpm/nginx.conf → ...mpose/insecure/mariadb/fpm/web/nginx.conf b/...r-compose/insecure/mariadb/fpm/nginx.conf → ...mpose/insecure/mariadb/fpm/web/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -18,13 +18,12 @@ services:
       - db.env
 
   web:
-    image: nginx
+    build: ./web
     restart: always
     ports:
       - 8080:80
     volumes:
       - nextcloud:/var/www/html:ro
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
 
 volumes:
   db:

diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/...-compose/insecure/postgres/fpm/nginx.conf → ...pose/insecure/postgres/fpm/web/nginx.conf b/...-compose/insecure/postgres/fpm/nginx.conf → ...pose/insecure/postgres/fpm/web/nginx.conf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM nginx

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