diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7bad177e7..cf6c6236d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -7,11 +7,8 @@ services: image: nginx:alpine ports: - "80:80" - networks: - - reverse_proxy - depends_on: - - web - - directory.api volumes: - - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro + + directory.db: + command: ["postgres", "-c", "log_statement=all"] \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f462b39aa..955d37eb4 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -3,11 +3,16 @@ version: "3.8" services: + reverse_proxy: + image: nginx:alpine + ports: + - "80:80" + volumes: + - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro + directory.api: build: dockerfile: directory/src/FilterLists.Directory.Api/debug.Dockerfile - ports: - - "80" environment: - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://+:80 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e113f6193..1e79040df 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,16 +7,6 @@ services: image: nginx:alpine ports: - "443:443" - networks: - - reverse_proxy - depends_on: - - web - - directory.api volumes: - - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro - - ~/cert:/etc/nginx/cert:ro - - web: - build: - context: . # hack for https://github.com/docker/compose/issues/4047 + - ~/cert:/etc/nginx/cert:ro \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c5f1f14da..2a5a11c47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,16 @@ version: "3.8" services: + reverse_proxy: + image: nginx:alpine + networks: + - reverse_proxy + depends_on: + - web + - directory.api + volumes: + - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro + web: image: ${DOCKER_REGISTRY-}filterlists_web build: @@ -39,4 +49,4 @@ networks: directory: volumes: - directory.db: + directory.db: \ No newline at end of file