Fixed proxy settings for e2e stack. Removed nginx proxy in favor of v…

…ue dev proxy.
eecs-autograder · Oct 16, 2024 · 65876a4 · 65876a4
1 parent efb319b
commit 65876a4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 193 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/e2e_test_stack/docker-compose.yml b/e2e_test_stack/docker-compose.yml
@@ -1,28 +1,21 @@
 version: "3"
 
 services:
-  nginx:
-    image: nginx:latest
-    restart: no
-    container_name: ag-vue-e2e-nginx
-    ports:
-      - "8080:80"
-    volumes:
-      - ./nginx/conf.d/:/etc/nginx/conf.d
-
   website:
     restart: no
     build:
       context: ../
       dockerfile: Dockerfile-website-dev
     container_name: ag-vue-e2e-website
-    expose:
-      - "8080"
+    ports:
+      - 8080:8080
+    # expose:
+    #   - "8080"
     volumes:
       - ../src:/usr/src/app/src
       - ../tests:/usr/src/app/tests
       - ../public:/usr/src/app/public
-    command: npm run serve -- --host website
+    command: npm run serve
 
   django:
     restart: no

diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf
diff --git a/vue.config.e2e.js b/vue.config.e2e.js
diff --git a/vue.config.js b/vue.config.js
@@ -2,13 +2,13 @@ module.exports = {
   devServer: {
     proxy: {
       "/api": {
-        target: "http://django:8001",
+        target: "http://django:8000",
       },
       "/static": {
-        target: "http://django:8001",
+        target: "http://django:8000",
       },
       "/__debug__/": {
-        target: "http://django:8001",
+        target: "http://django:8000",
       },
     },
   },