From b120af8e7f8a150ca01cc847753579987364c55a Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Mon, 14 Aug 2017 15:32:08 +0200
Subject: [PATCH] Add Dockerfile for nginx

---
 .../insecure/mariadb-cron-redis/fpm/docker-compose.yml         | 3 +--
 .../insecure/mariadb-cron-redis/fpm/web/Dockerfile             | 3 +++
 .../insecure/mariadb-cron-redis/fpm/{ => web}/nginx.conf       | 0
 .../docker-compose/insecure/mariadb/fpm/docker-compose.yml     | 3 +--
 .examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile   | 3 +++
 .../docker-compose/insecure/mariadb/fpm/{ => web}/nginx.conf   | 0
 .../docker-compose/insecure/postgres/fpm/docker-compose.yml    | 3 +--
 .examples/docker-compose/insecure/postgres/fpm/web/Dockerfile  | 3 +++
 .../docker-compose/insecure/postgres/fpm/{ => web}/nginx.conf  | 0
 9 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
 rename .examples/docker-compose/insecure/mariadb-cron-redis/fpm/{ => web}/nginx.conf (100%)
 create mode 100644 .examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
 rename .examples/docker-compose/insecure/mariadb/fpm/{ => web}/nginx.conf (100%)
 create mode 100644 .examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
 rename .examples/docker-compose/insecure/postgres/fpm/{ => web}/nginx.conf (100%)

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
index ce55794..f9a663c 100644
--- 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
new file mode 100644
index 0000000..d6eac3e
--- /dev/null
+++ 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/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/nginx.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb-cron-redis/fpm/nginx.conf
rename to .examples/docker-compose/insecure/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
index 9ae7c15..4bd0182 100644
--- 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
new file mode 100644
index 0000000..d6eac3e
--- /dev/null
+++ 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/.examples/docker-compose/insecure/mariadb/fpm/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
similarity index 100%
rename from .examples/docker-compose/insecure/mariadb/fpm/nginx.conf
rename to .examples/docker-compose/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
index b3b0d3a..85f2458 100644
--- 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
new file mode 100644
index 0000000..d6eac3e
--- /dev/null
+++ 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/.examples/docker-compose/insecure/postgres/fpm/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
similarity index 100%
rename from .examples/docker-compose/insecure/postgres/fpm/nginx.conf
rename to .examples/docker-compose/insecure/postgres/fpm/web/nginx.conf