From 2bfaadf6f75b7136f6e004ffb287074e15f03f75 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 29 Aug 2020 14:46:19 -0500
Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=94=A8=20dev=20on=20web=20outsid?=
 =?UTF-8?q?e=20of=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.override.yml               |  9 ---------
 docker-compose.prod.yml                   | 12 ++++++++++++
 docker-compose.yml                        | 11 -----------
 reverse-proxy/conf.d.dev/filterlists.conf | 11 -----------
 web/Dockerfile.dev                        | 15 ---------------
 web/package.json                          |  2 +-
 6 files changed, 13 insertions(+), 47 deletions(-)
 delete mode 100644 web/Dockerfile.dev

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e460315bf..6f4803450 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -10,15 +10,6 @@ services:
       - ./reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
-  web:
-    build:
-      dockerfile: Dockerfile.dev
-    volumes:
-      - ./web/src:/app/src:ro
-    environment:
-      - CHOKIDAR_USEPOLLING=true
-    stdin_open: true
-
   directory.api:
     build:
       dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile.dev
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 7944c5cf1..403afc66a 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,6 +6,18 @@ services:
   reverse_proxy:
     ports:
       - "443:443"
+    depends_on:
+      - web
     volumes:
       - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
+
+  web:
+    image: ${DOCKER_REGISTRY-}filterlists_web
+    restart: always
+    build:
+      context: ./web
+    networks:
+      - reverse_proxy
+    depends_on:
+      - directory.api
diff --git a/docker-compose.yml b/docker-compose.yml
index bd0b9fb06..e43ea674f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,21 +7,10 @@ services:
     networks:
       - reverse_proxy
     depends_on:
-      - web
       - directory.api
     volumes:
       - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
 
-  web:
-    image: ${DOCKER_REGISTRY-}filterlists_web
-    restart: always
-    build:
-      context: ./web
-    networks:
-      - reverse_proxy
-    depends_on:
-      - directory.api
-
   directory.api:
     image: ${DOCKER_REGISTRY-}filterlists_directory_api
     restart: always
diff --git a/reverse-proxy/conf.d.dev/filterlists.conf b/reverse-proxy/conf.d.dev/filterlists.conf
index 8e8910fe6..20b35723e 100644
--- a/reverse-proxy/conf.d.dev/filterlists.conf
+++ b/reverse-proxy/conf.d.dev/filterlists.conf
@@ -12,15 +12,4 @@ server {
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header   X-Forwarded-Proto $scheme;
   }
-
-  location / {
-    proxy_pass         http://web:3000;
-    proxy_http_version 1.1;
-    proxy_set_header   Upgrade $http_upgrade;
-    proxy_set_header   Connection keep-alive;
-    proxy_set_header   Host $host;
-    proxy_cache_bypass $http_upgrade;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Forwarded-Proto $scheme;
-  }
 } 
\ No newline at end of file
diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev
deleted file mode 100644
index 775e6546e..000000000
--- a/web/Dockerfile.dev
+++ /dev/null
@@ -1,15 +0,0 @@
-# init
-FROM node:alpine
-ENV PATH /app/node_modules/.bin:$PATH
-EXPOSE 3000
-
-# install
-WORKDIR /app
-COPY public/. public/
-COPY config-overrides.js ./
-COPY tsconfig.json ./
-COPY package*.json ./
-RUN npm i
-
-# start
-CMD ["npm", "start"]
\ No newline at end of file
diff --git a/web/package.json b/web/package.json
index 8b2850534..57def2d3b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -28,7 +28,7 @@
     "test": "react-app-rewired test",
     "eject": "react-scripts eject"
   },
-  "proxy": "https://filterlists.com",
+  "proxy": "http://localhost:80",
   "eslintConfig": {
     "extends": [
       "react-app",