Rudimentary Dockerfile and compose

Author: alvinlim277

compose.yaml

@@ -127,6 +127,11 @@ services:
         - action: rebuild
           path: collab
           target: collab/app
+
+  nginx:
+    build: nginx
+    ports:
+      - "80:80"
 #  mongo:
 #    image: "mongo:latest"
 #    ports:

nginx/Dockerfile

@@ -0,0 +1,4 @@
+FROM nginx:alpine 
+COPY nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

nginx/nginx.conf

@@ -31,7 +31,7 @@ http {
 
         # frontend (i guess login page)
         location / {
-            proxy_pass http://localhost:3000/; # frontend running on...similar for other services 
+            proxy_pass http://peerprep:3000/; # frontend running on...similar for other services 
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
@@ -40,35 +40,32 @@ http {
         }
 
         # question
-        location /api/ {
-            proxy_pass http://localhost:9090/;  
+        location ~ ^/api/(?!internal).*$ {
+            proxy_pass http://backend:9090/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+
         }
 
-        # # user (pure conjecture, just referencing gaylord article)
-        # location /users/ {
-        #     auth_request auth;
-        #     auth_request_set $userid $upstream_http_x_auth_user;
+        # user (pure conjecture, just referencing gaylord article)
+        location /users/ {
+            proxy_pass http://user-service:3001/;  
+            # auth_request auth;
+            # auth_request_set $userid $upstream_http_x_auth_user;
 
-        #     # if fail go back to landing
-        #     if ($http_accept ~* "text/html" ) {
-        #         error_page 401 403 =200 /;
-        #     }
-        #     proxy_set_header X-Auth-User $userid;
-        #     proxy_set_header Host $host;
-        #     proxy_set_header X-Forwarded-For $remote_addr;
-        #     proxy_pass http://localhost:3001/;  
-
-        # }
-
-        # location = auth {
-        #     internal;
-        #     # proxy_pass to authenticator service
-        #     proxy_set_header Content-Length "";
-        #     proxy_set_header X-Dbg $cookie_AUTH;
-
-        #     proxy_cache auth_cache;
-        #     proxy_cache_valid 200 204 1m;
-        #     proxy_cache_key "$http_authorization"; # jwt?
-        # }
+            # # if fail go back to landing
+            # if ($http_accept ~* "text/html" ) {
+            #     error_page 401 403 =200 /;
+            # }
+
+            proxy_set_header X-Auth-User $userid;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $remote_addr;
+
+
+        }
+
     }
 }