nginx update, woking locally with docker

Author: Kabongosalomon

README.md

@@ -42,7 +42,7 @@ Note: The stand alone app uses sqlite as db instead of postgreSQL like our live
 - Remove language
     - `python manage.py remove_language en-sw-JW300`
 - Check available languages
-    - `python manage.py all_language`
+    - `python manage.py all_languages`
 - Update known languages 
     - `curl --request GET 'http://127.0.0.1:5000/update'`
 - Run tests
@@ -115,7 +115,7 @@ To make sure that it is well installed you can run the code above to check the v
 
 #### Add, Delete and Update supported languages  
 
-- check the available models in memory `docker-compose -f docker-compose.prod.yml exec api python manage.py all_language`
+- check the available models in memory `docker-compose -f docker-compose.prod.yml exec api python manage.py all_languages`
 - add a new language, 
     - e.g English-Swahili (note: we are using JW300 shortform) `docker-compose -f docker-compose.prod.yml exec api python manage.py add_language en-sw-JW300`
     - (English-Yoruba) `docker-compose -f docker-compose.prod.yml exec api python manage.py add_language en-yo-`

docker-compose.prod.yml

@@ -6,8 +6,10 @@ services:
       context: ./src/server
       dockerfile: Dockerfile.prod
     command: gunicorn --bind 0.0.0.0:5000 manage:masakhane
-    expose:
-      - 5000
+    ports:
+      - 5000:5000
+    # expose:
+    #   - 5000
     env_file:
       - ./.env.prod
     depends_on:

src/client/Dockerfile

@@ -10,16 +10,17 @@ ENV NODE_OPTIONS --max-old-space-size=8192
 COPY package.json package-lock.json ./
 
 # NOTE: opencollective is not required but leads to warnings if missing
+#RUN npm rm -rf node_modules
 RUN npm install
-
+RUN npm i webpack webpack-cli --legacy-peer-deps
+RUN npm i @babel/core @babel/preset-env @babel/preset-react babel-loader
 # RUN apt-get update && apt-get install -y curl
-
 # install the dependencies
 # RUN npm ci 
-
 COPY . ./
 
-CMD ["npm", "start", "run"]
+# CMD ["npm", "start", "run"]
+CMD ["npm", "run", "develop"]
 
 # This is updated in to update the models dictionary state.
 # ENTRYPOINT ["curl --location --request GET 'http://127.0.0.1:5000/update' --data-raw ''"]

src/server/manage.py

@@ -33,8 +33,8 @@ def clean():
     db.session.commit()
 
 
-@cli.command("all_language")
-def all_language():
+@cli.command("all_languages")
+def all_languages():
     for lan in Language.query.all():
         print(lan.to_json() )
 

src/server/nginx/nginx.conf

@@ -2,15 +2,32 @@ upstream masakhane-web {
     server api:5000;
 }
 
+upstream masakhane-web-client {
+    server client:3000;
+}
+
 server {
 
     listen 80;
 
     location / {
+        proxy_pass http://masakhane-web-client;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /translate {
         proxy_pass http://masakhane-web;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $host;
         proxy_redirect off;
     }
 
+    location /save {
+        proxy_pass http://masakhane-web;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
 }