compose and nginx

TODO.md

@@ -1,4 +1,3 @@
 # TODO
 
-sign up user
+get mcrates.au up
-add want without discogs

client/src/actions.ts

@@ -15,7 +15,7 @@ declare module 'axios' {
 }
 
 const api = axios.create({
-  baseURL: 'http://localhost:41337',
+  baseURL: '/api',
   withCredentials: true
 });
 

docker-compose.MCRATES.yaml

@@ -0,0 +1,35 @@
+version: "3.3"
+
+services:
+  pg:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: 'mcrates'
+      POSTGRES_DB: 'mcrates'
+      POSTGRES_PASSWORD: 'digdeep'
+    volumes:
+      - "./db:/var/lib/postgresql/data"
+
+  api:
+    image: node:16
+    working_dir: /opt/mcrates/api
+    entrypoint: npm start
+    environment:
+      DATABASE_URL: 'postgresql://mcrates:digdeep@pg:5432/mcrates?schema=public'
+    volumes:
+      - "./api:/opt/mcrates/api"
+
+  client:
+    image: node:16
+    working_dir: /opt/mcrates/client
+    entrypoint: npm start
+    volumes:
+      - "./client:/opt/mcrates/client"
+
+  nginx:
+    image: nginx:latest
+    volumes:
+      - './nginx/localhost.nginx.conf:/etc/nginx/conf.d/default.conf'
+      - '/etc/letsencrypt'
+    ports:
+      - '80:80'

docker-compose.yaml

@@ -12,32 +12,37 @@ services:
     volumes:
       - "./db:/var/lib/postgresql/data"
 
-  pg-test:
+  # pg-test:
-    image: postgres:latest
+  #   image: postgres:latest
-    environment:
-      POSTGRES_USER: 'mcrates'
-      POSTGRES_DB: 'test'
-      POSTGRES_PASSWORD: 'digdeep'
-    ports:
-      - '55432:5432'
-
-  # api:
-  #   image: node:16
-  #   working_dir: /opt/mcrates/api
-  #   entrypoint: npm start
   #   environment:
-  #     DATABASE_URL: 'postgresql://mcrates:digdeep@pg:5432/mcrates?schema=public'
+  #     POSTGRES_USER: 'mcrates'
+  #     POSTGRES_DB: 'test'#     POSTGRES_PASSWORD: 'digdeep'
   #   ports:
-  #     - '41337:41337'
+  #     - '55432:5432'
-  #   volumes:
-  #     - "./api:/opt/mcrates/api"
 
-  # client:
+  api:
-  #   image: node:16
+    image: node:16
-  #   working_dir: /opt/mcrates/client
+    working_dir: /opt/mcrates/api
-  #   entrypoint: npm start
+    entrypoint: npm start
-  #   ports:
+    environment:
-  #     - '8080:8080'
+      DATABASE_URL: 'postgresql://mcrates:digdeep@pg:5432/mcrates?schema=public'
-  #   volumes:
+    ports:
-  #     - "./client:/opt/mcrates/client"
+      - '41337:41337'
+    volumes:
+      - "./api:/opt/mcrates/api"
 
+  client:
+    image: node:16
+    working_dir: /opt/mcrates/client
+    entrypoint: npm start
+    ports:
+      - '8080:8080'
+    volumes:
+      - "./client:/opt/mcrates/client"
+
+  nginx:
+    image: nginx:latest
+    volumes:
+      - './nginx/localhost.nginx.conf:/etc/nginx/conf.d/default.conf'
+    ports:
+      - '80:80'

nginx/localhost.nginx.conf

@@ -0,0 +1,37 @@
+upstream mcrates_api {
+    server api:41337;
+}
+
+upstream mcrates_client {
+    server client:8080;
+}
+
+# upstream mcrates_ws {
+#     server 127.0.0.1:40055;
+# }
+
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+server {
+    location / {
+        proxy_pass http://mcrates_client;
+        proxy_read_timeout 600s;
+    }
+
+    # location /api/ws {
+    #     proxy_pass http://mcrates_ws;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Upgrade $http_upgrade;
+    #     proxy_set_header Connection $connection_upgrade;
+    #     proxy_read_timeout 600s;
+    # }
+
+    location /api/ {
+        # trailing slash means api will receive url WITHOUT /api
+        proxy_pass http://mcrates_api/;
+        proxy_read_timeout 600s;
+    }
+}

nginx/matescrates.au.nginx.conf

@@ -1,11 +1,15 @@
-upstream mcrates_http {
+upstream mcrates_api {
-    server 127.0.0.1:40080;
+    server api:41337;
 }
 
-upstream mcrates_ws {
+upstream mcrates_client {
-    server 127.0.0.1:40055;
+    server client:8080;
 }
 
+# upstream mcrates_ws {
+#     server 127.0.0.1:40055;
+# }
+
 map $http_upgrade $connection_upgrade {
     default upgrade;
     '' close;
@@ -22,21 +26,21 @@ server {
     gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss application/atom+xml image/svg+xml;
 
     location / {
-        root /srv/mcrates/current;
+        proxy_pass http://mcrates_client;
-        index index.html;
-        try_files $uri $uri/ index.html;
-    }
-
-    location /api/ws {
-        proxy_pass http://mcrates_ws;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
         proxy_read_timeout 600s;
     }
 
+    # location /api/ws {
+    #     proxy_pass http://mcrates_ws;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Upgrade $http_upgrade;
+    #     proxy_set_header Connection $connection_upgrade;
+    #     proxy_read_timeout 600s;
+    # }
+
     location /api/ {
-        proxy_pass http://mcrates_http;
+        # trailing slash means api will receive url WITHOUT /api
+        proxy_pass http://mcrates_api/;
         proxy_read_timeout 600s;
     }