From 11ff2c2ffd9d3ee9f76d1d7482e1c2327da62515 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 25 Jun 2019 11:27:46 -0500 Subject: [PATCH] re-org prod/dev docker-compose files --- docker-compose.dcproj | 11 +++++++---- ...ompose.vs.debug.yml => docker-compose.override.yml | 0 docker-compose.prod.yml | 9 +++++++++ docker-compose.yml | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) rename docker-compose.vs.debug.yml => docker-compose.override.yml (100%) create mode 100644 docker-compose.prod.yml diff --git a/docker-compose.dcproj b/docker-compose.dcproj index 6d5baf17f..7e4255733 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -10,12 +10,15 @@ - - - + + docker-compose.yml - + + docker-compose.yml + + + \ No newline at end of file diff --git a/docker-compose.vs.debug.yml b/docker-compose.override.yml similarity index 100% rename from docker-compose.vs.debug.yml rename to docker-compose.override.yml diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 000000000..ced12f72a --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,9 @@ +version: "3.7" + +services: + nginx: + ports: + - "443:443" + volumes: + - ./ops/nginx/conf.d:/etc/nginx/conf.d:ro + - ~/cert:/etc/nginx/cert:ro \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 2fc496bd7..5344f0f53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,17 +4,13 @@ services: nginx: image: nginx:alpine restart: always - ports: - - "443:443" networks: - reverse-proxy depends_on: - web - api volumes: - - ./ops/nginx/conf.d:/etc/nginx/conf.d:ro - ./ops/nginx/svr-includes:/etc/nginx/svr-includes:ro - - ~/cert:/etc/nginx/cert:ro web: image: collinbarrett/filterlists.web:latest