From 79a39fef8f0b3c50f46ab9219d82e8d931b45465 Mon Sep 17 00:00:00 2001
From: rush <github@avaika.me>
Date: Thu, 29 Nov 2018 14:31:38 +0300
Subject: [PATCH] proxy-mariadb-fpm nobuild

Signed-off-by: rush <github@avaika.me>
---
 .../mariadb/fpm/{web => configs}/nginx.conf                | 0
 .../mariadb/fpm/{proxy => configs}/uploadsize.conf         | 0
 .../with-nginx-proxy/mariadb/fpm/docker-compose.yml        | 7 +++++--
 .../with-nginx-proxy/mariadb/fpm/proxy/Dockerfile          | 3 ---
 .../with-nginx-proxy/mariadb/fpm/web/Dockerfile            | 3 ---
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename .examples/docker-compose/with-nginx-proxy/mariadb/fpm/{web => configs}/nginx.conf (100%)
 rename .examples/docker-compose/with-nginx-proxy/mariadb/fpm/{proxy => configs}/uploadsize.conf (100%)
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile

diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/nginx.conf
similarity index 100%
rename from .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
rename to .examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/uploadsize.conf
similarity index 100%
rename from .examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/uploadsize.conf
rename to .examples/docker-compose/with-nginx-proxy/mariadb/fpm/configs/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 5fc70af1..2d8da9b5 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - db
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html:ro
@@ -33,6 +33,8 @@ services:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
       - LETSENCRYPT_EMAIL=
+    volumes:
+      - ./config/nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - app
     networks:
@@ -40,7 +42,7 @@ services:
       - default
 
   proxy:
-    build: ./proxy
+    image: jwilder/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
@@ -52,6 +54,7 @@ services:
       - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./configs/uploadsize.conf:/etc/nginx/conf.d/uploadsize.conf
     networks:
       - proxy-tier
 
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
deleted file mode 100644
index 242c84e1..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM jwilder/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf