From 562494c11527703468b0832563081f4a89e14a88 Mon Sep 17 00:00:00 2001 From: rush Date: Thu, 29 Nov 2018 14:33:05 +0300 Subject: [PATCH] proxy-mariadb-apache nobuild Signed-off-by: rush --- .../mariadb/apache/{proxy => configs}/uploadsize.conf | 0 .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 3 ++- .../with-nginx-proxy/mariadb/apache/proxy/Dockerfile | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) rename .examples/docker-compose/with-nginx-proxy/mariadb/apache/{proxy => configs}/uploadsize.conf (100%) delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/configs/uploadsize.conf similarity index 100% rename from .examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/uploadsize.conf rename to .examples/docker-compose/with-nginx-proxy/mariadb/apache/configs/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml index 3b5121a6c..471b1a618 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml @@ -31,7 +31,7 @@ services: - default proxy: - build: ./proxy + images: jwilder/nginx-proxy:alpine restart: always ports: - 80:80 @@ -43,6 +43,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/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile deleted file mode 100644 index 242c84e11..000000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM jwilder/nginx-proxy:alpine - -COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf