added env to set the backend server

Author: Dan Kelley

src/client/Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /app
 
 # add `/app/node_modules/.bin` to $PATH
 ENV PATH /app/node_modules/.bin:$PATH
-
+# ENV PAWS_API_HOST paws-compose-server
 # install app dependencies
 COPY package.json ./
 COPY package-lock.json ./
@@ -17,9 +17,11 @@ COPY public ./public
 COPY src ./src
 
 RUN npm run build
+
 # add app
-FROM nginx AS host
+FROM nginx:latest AS host
 
-COPY nginx-client.conf /etc/nginx/conf.d/default.conf
+# COPY nginx-client.conf /etc/nginx/conf.d/default.conf
+COPY default.conf.template /etc/nginx/templates/
 
 COPY --from=builder /app/build/ /usr/share/nginx/html

src/client/nginx-client.conf renamed to src/client/default.conf.template

@@ -1,5 +1,6 @@
 upstream backend {
-    server paws-compose-server:5000;
+    #server paws-compose-server:5000;
+    server ${PAWS_API_HOST}:5000;
 }
 
 server {

src/docker-compose.yml

@@ -20,9 +20,8 @@ services:
       - db
     volumes:
       - src_archive:/app/static/raw_data
-    environment: 
-      FLASK_ENV: development
-
+    environment:
+      - FLASK_ENV=development
 
   client:
     build: ./client
@@ -33,6 +32,7 @@ services:
       - server
     environment:
       - CHOKIDAR_USEPOLLING=true
+      - PAWS_API_HOST=paws-compose-server
     stdin_open: true
 
 #using named volumes fixs a windows docker bug relating to container permissions

src/server/wsgi.py

@@ -0,0 +1,6 @@
+from app import create_app
+
+app = create_app()
+
+if __name__ == "__main__":
+    app.run()