diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/uploadsize.conf b/.examples/docker-compose/with-nginx-proxy/postgres/apache/configs/uploadsize.conf similarity index 100% rename from .examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/uploadsize.conf rename to .examples/docker-compose/with-nginx-proxy/postgres/apache/configs/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env index 41106cab..c806203d 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env @@ -1,3 +1,2 @@ POSTGRES_PASSWORD= -POSTGRES_DB=nextcloud POSTGRES_USER=nextcloud diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml index 2e40e8d7..cde34ff1 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml @@ -6,6 +6,9 @@ services: restart: always volumes: - db:/var/lib/postgresql/data + environment: + # workaround for https://github.com/nextcloud/docker/issues/345 + - POSTGRES_DB=deleteme env_file: - db.env @@ -28,7 +31,8 @@ services: - default proxy: - build: ./proxy + image: jwilder/nginx-proxy:alpine + restart: always ports: - 80:80 @@ -40,6 +44,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/postgres/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile deleted file mode 100644 index 242c84e1..00000000 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM jwilder/nginx-proxy:alpine - -COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf