Merge branch 'master' into table_for_file

Author: c-simpson

GettingStarted.md

@@ -5,18 +5,15 @@
 - Install Docker Compose - `https://docs.docker.com/compose/install/`      
 
 ## Running everything (server and client)
-
 - navigate to src directory `cd .../PAWS-DATA-PIPELINE/src`
 - docker compose `docker-compose up`
 - access the client going to `http://localhost:3000`
+## Running the client (front-end) locally
+- navigate to src directory `cd .../PAWS-DATA-PIPELINE/src`
+- docker compose `docker-compose run server`
+- start the frontend with the proxy`npm run start:local`
 
-## Running just the client (front-end)
-
-- navigate to src directory `cd .../PAWS-DATA-PIPELINE/src/client`
-- docker compose `docker-compose up`
-- access the client going to `http://localhost:3000`
-
-## Running just the server (back-end)
-
-- navigate to src directory `cd .../PAWS-DATA-PIPELINE/src/server`
-- docker compose `docker-compose up`
+## Running just server (back-end) locally
+- navigate to src directory `cd .../PAWS-DATA-PIPELINE/src`
+- set the PAWS_API_HOST=localhost or your ip in `docker-compose.yml`
+- docker compose `docker-compose up` and stop the server

src/client/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:13.12.0-alpine
+FROM node:13.12.0-alpine as builder
 
 # set working directory
 WORKDIR /app
@@ -13,8 +13,15 @@ COPY package-lock.json ./
 
 RUN npm install --silent
 
+COPY public ./public
+COPY src ./src
+
+RUN npm run build
+
 # add app
-COPY . ./
+FROM nginx:latest AS host
+
+# COPY nginx-client.conf /etc/nginx/conf.d/default.conf
+COPY default.conf.template /etc/nginx/templates/
 
-# start app
-CMD ["npm", "start"]
+COPY --from=builder /app/build/ /usr/share/nginx/html

src/client/default.conf.template

@@ -0,0 +1,34 @@
+upstream backend {
+    #server paws-compose-server:5000;
+    server ${PAWS_API_HOST}:5000;
+}
+
+server {
+    listen       80;
+    server_name  localhost;
+    client_max_body_size 100M;
+    
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+    
+    location /api {
+        try_files $uri @backend;
+    }
+
+    location @backend {
+        proxy_pass http://backend;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 3600;
+        proxy_connect_timeout 3600;
+        proxy_send_timeout 3600;
+        send_timeout 3600;
+        # Following is necessary for Websocket support
+        # proxy_http_version 1.1;
+        # proxy_set_header Upgrade $http_upgrade;
+        # proxy_set_header Connection "upgrade";
+    }
+}