Updated dockerfile to support latest build of application.

Author: SI-Encoding

Dockerfile.api

@@ -1,9 +1,10 @@
 FROM python:3.9
 WORKDIR /amazon-clone-flask
-COPY ./server/* ./server
+COPY ./server/* ./server/
 COPY ./requirements.txt . 
 RUN pip3 install -r ./requirements.txt
 EXPOSE 5000
 WORKDIR /amazon-clone-flask/server
-COPY ./entrypoint.sh .
+COPY entrypoint.sh .
+RUN chmod +x entrypoint.sh
 ENTRYPOINT ["./entrypoint.sh"]

Dockerfile.nginx

@@ -1,4 +1,4 @@
 FROM nginx:1.19-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
-COPY nginx.conf /etc/nginx/conf.d
+COPY nginx.conf /etc/nginx/conf.d/

README.md

@@ -17,7 +17,7 @@ This is an web application done using React and Flask.
 ## To deploy the entire thing (via four integrated Docker containers):
 1. `docker-compose up`
 
-
+docker-compose up --build --force-recreate
 ### How to install the needed dependencies
 
 1. pip install virtualenv
@@ -36,7 +36,24 @@ docker run -e TWILIO_ACCOUNT_SID=<YOUR_ACCOUNT_SID> -e TWILIO_AUTH_TOKEN=<YOUR_A
 1. Follow tutorial on https://medium.com/@dan.chiniara/installing-postgresql-for-windows-7ec8145698e3#:~:text=Graphical%20Installer%3A%20Postgres.app,and%20database.&text=Mac%20users%2C%20you're%20all%20set!
 2. Rename env-example to .env, and fill in the values.
 3. To create the database, for example, on Ubuntu run "sudo -u postgres psql -c 'create database {db_name};'" 
+4. If it throws error 'sudo: psql: command not found' then run 'sudo apt-get install postgresql-client'
+
+sudo service postgresql status
+
+$ sudo -u postgres createuser --interactive
+Enter name of role to add: myuser
+Shall the new role be a superuser? (y/n) n
+Shall the new role be allowed to create databases? (y/n) n
+Shall the new role be allowed to create more new roles? (y/n) n
+
+$ sudo -u postgres createdb mydatabase
+$ sudo -u postgres psql
+psql (13.5)
+Type "help" for help.
+
+postgres=# GRANT ALL PRIVILEGES ON DATABASE mydatabase TO myuser;
 
+ALTER USER myuser WITH PASSWORD 'new_password';
 
 ## Getting Started with Create React App
 

docker-compose.yml

@@ -4,8 +4,12 @@ services:
       context: .
       dockerfile: Dockerfile.api
     image: amazon-clone-flask-api
-    command: gunicorn -b :5000 server:app
+    command: bash -c "gunicorn server:create_app1"
     environment:
+      - GUNICORN_BIND=0.0.0.0:5000
+      - GUNICORN_WORKERS=2
+      - GUNICORN_THREADS=4
+      - GUNICORN_TIMEOUT=0
       - TWILIO_ACCOUNT_SID=${TWILIO_ACCOUNT_SID}
       - TWILIO_AUTH_TOKEN=${TWILIO_AUTH_TOKEN}
       - PGHOST=db
@@ -19,6 +23,8 @@ services:
       - "5000:5000"
     depends_on:
       - db
+    volumes:
+      - .:/app
   client: 
     build:
       context: .

entrypoint.sh

@@ -11,9 +11,10 @@ then
     echo "PostgreSQL started"
 fi
 
-python3 manage.py create_db
-python3 manage.py create_test_user
-python3 manage.py create_test_product_and_order
+
+python3  manage.py create_db
+python3  manage.py create_test_user
+python3  manage.py create_test_product_and_order
 
 
 exec "$@"

nginx.conf

@@ -1,18 +1,15 @@
-upstream hello_flask {
-    server api:5000;
-}
-
 server {
     listen 80;
+    server_name localhost;
 
     location / {
-        proxy_pass http://api;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://api:5000;
         proxy_set_header Host $host;
-        proxy_redirect off;
+        proxy_set_header X-Real-IP $remote_addr;
     }
 
     location /assets/ {
         alias /app/src/assets;
     }
 }
+