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