From 07b641da1bb5522200507ce91b7cd84656baf83e Mon Sep 17 00:00:00 2001
From: Divyansh Bhardwaj <87605149+Dbhardwaj99@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:40:30 +0530
Subject: [PATCH] Removed All the errors

---
 Dockerfile | 60 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 84887ce..15e1c4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ RUN git clone https://github.com/ranchimall/pyflo
 WORKDIR pyflo
 RUN apt-get install -y pkg-config
 RUN python3 setup.py install
+WORKDIR ../
 
 # Setup of Flo Token Tracker
 RUN git clone https://github.com/vivekteega/ftt-docker
@@ -37,27 +38,28 @@ RUN python3 -m pip install requests
 RUN sed -i "s|chardet==4.0.0|chardet|g" /ftt-docker/requirements.txt
 RUN touch config.ini
 RUN echo "[DEFAULT] \n\
-NET = testnet \n\
-FLO_CLI_PATH = /usr/local/bin/flo-cli \n\
-START_BLOCK = 740400" >> /ftt-docker/config.ini
+    NET = testnet \n\
+    FLO_CLI_PATH = /usr/local/bin/flo-cli \n\
+    START_BLOCK = 740400" >> /ftt-docker/config.ini
 
 RUN touch config.py
 RUN echo "committeeAddressList = ['oVwmQnQGtXjRpP7dxJeiRGd5azCrJiB6Ka'] \n\
-sseAPI_url = 'https://ranchimallflo-testnet.duckdns.org/' \n\
-privKey = 'RG6Dni1fLqeT2TEFbe7RB9tuw53bDPDXp8L4KuvmYkd5JGBam6KJ' " >> /ftt-docker/config.py
+    sseAPI_url = 'https://ranchimallflo-testnet.duckdns.org/' \n\
+    privKey = 'RG6Dni1fLqeT2TEFbe7RB9tuw53bDPDXp8L4KuvmYkd5JGBam6KJ' " >> /ftt-docker/config.py
 
 
 # Setup of RanchimallFlo API
 RUN git clone https://github.com/ranchimall/ranchimallflo-api
 WORKDIR ranchimallflo-api
-RUN pip3 install -r requirements.txt
+RUN python3 -m pip install --upgrade pip setuptools wheel
+RUN python3 -m pip install -r requirements.txt
 RUN pip3 install apscheduler
 RUN touch config.py
 RUN echo "dbfolder = '/home/production/dev/shivam/ranchimallflo-api' \n\
-sse_pubKey = '02b68a7ba52a499b4cb664033f511a14b0b8b83cd3b2ffcc7c763ceb9e85caabcf' \n\
-apiUrl = 'https://flosight.duckdns.org/api/' \n\
-apilayerAccesskey = '3abc51aa522420e4e185ac22733b0f30' \n\
-FLO_DATA_DIR = '/home/production/.flo' " >> /ranchimallflo-api/config.py
+    sse_pubKey = '02b68a7ba52a499b4cb664033f511a14b0b8b83cd3b2ffcc7c763ceb9e85caabcf' \n\
+    apiUrl = 'https://flosight.duckdns.org/api/' \n\
+    apilayerAccesskey = '3abc51aa522420e4e185ac22733b0f30' \n\
+    FLO_DATA_DIR = '/home/production/.flo' " >> /config.py
 
 
 # Setup of Floscout
@@ -68,15 +70,15 @@ FLO_DATA_DIR = '/home/production/.flo' " >> /ranchimallflo-api/config.py
 WORKDIR /etc/supervisor/conf.d/
 RUN touch ranchimallflo-api.conf
 RUN echo "[program:ranchimallflo-api]\n\
-directory=/ranchimallflo-api\n\
-command=/ranchimallflo-api/py3.7/bin/hypercorn -w 1 -b 0.0.0.0:5009 wsgi:app\n\
-user=root\n\
-autostart=true\n\
-autorestart=true\n\
-stopasgroup=true\n\
-killasgroup=true\n\
-stderr_logfile=/var/log/ranchimallflo-api/ranchimallflo-api.err.log \n\
-stdout_logfile=/var/log/ranchimallflo-api/ranchimallflo-api.out.log" >> ranchimallflo-api.conf
+    directory=/ranchimallflo-api\n\
+    command=/ranchimallflo-api/py3.7/bin/hypercorn -w 1 -b 0.0.0.0:5009 wsgi:app\n\
+    user=root\n\
+    autostart=true\n\
+    autorestart=true\n\
+    stopasgroup=true\n\
+    killasgroup=true\n\
+    stderr_logfile=/var/log/ranchimallflo-api/ranchimallflo-api.err.log \n\
+    stdout_logfile=/var/log/ranchimallflo-api/ranchimallflo-api.out.log" >> ranchimallflo-api.conf
 RUN mkdir /var/log/ranchimallflo-api/
 RUN touch /var/log/ranchimallflo-api/ranchimallflo-api.err.log
 RUN touch /var/log/ranchimallflo-api/ranchimallflo-api.out.log
@@ -84,18 +86,18 @@ RUN touch /var/log/ranchimallflo-api/ranchimallflo-api.out.log
 ## Flo token tracking configuration
 RUN touch ftt.conf
 RUN echo "[program:ftt-docker]\n\
-directory=ftt-docker\n\
-command=tracktokens-smartcontracts.py\n\
-user=root\n\
-autostart=true\n\
-autorestart=true\n\
-stopasgroup=true\n\
-killasgroup=true\n\
-stderr_logfile=/var/log/flo-token-tracking/flo-token-tracking.err.log\n\
-stdout_logfile=/var/log/flo-token-tracking/flo-token-tracking.out.log" >> ftt.conf
+    directory=ftt-docker\n\
+    command=tracktokens-smartcontracts.py\n\
+    user=root\n\
+    autostart=true\n\
+    autorestart=true\n\
+    stopasgroup=true\n\
+    killasgroup=true\n\
+    stderr_logfile=/var/log/flo-token-tracking/flo-token-tracking.err.log\n\
+    stdout_logfile=/var/log/flo-token-tracking/flo-token-tracking.out.log" >> ftt.conf
 RUN mkdir /var/log/flo-token-tracking
 RUN touch /var/log/flo-token-tracking/flo-token-tracking.err.log
 RUN touch /var/log/flo-token-tracking/flo-token-tracking.out.log
 
 # Run supervisor
-RUN supervisorctl restart
\ No newline at end of file
+RUN service supervisor restart
\ No newline at end of file