feat: DOCKERIZED

server/.dockerignore

@@ -0,0 +1 @@
+.env*

server/.env.sample

@@ -0,0 +1,7 @@
+# vars mostly used in local development
+BASE_DIR='/Users/tusharsamagra/projects/sarthi/server/deployments'
+NGINX_PROXY_CONF_LOCATION='/Users/tusharsamagra/projects/sarthi/server/nginx-confs'
+ENV=local
+DEPLOYMENT_HOST='localhost'
+# mac hack
+DOCKER_MOUNT_DIR='/Users/tusharsamagra/projects/sarthi/server/deployments'

server/Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.11
+
+WORKDIR /app
+
+RUN apt update -y && apt install docker-compose -y
+
+COPY requirements.txt ./
+
+RUN pip install -r requirements.txt
+
+COPY . .
+
+EXPOSE 5000
+
+CMD [ "flask", "run", "--host=0.0.0.0", "--port=5000"]

server/docker-compose.yml

@@ -8,3 +8,17 @@ services:
       - "80:80"
     volumes:
       - ./nginx-confs:/etc/nginx/conf.d
+
+  sarthi:
+    build: .
+    ports:
+      - 5000:5000
+    volumes:
+      # hack to bypass file resource sharing error to make my development easy on mac
+      - ./deployments:${DOCKER_MOUNT_DIR:-/deployments}
+      - ./nginx-confs:/nginx-confs
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      BASE_DIR: '/Users/tusharsamagra/projects/sarthi/server/deployments'
+      NGINX_PROXY_CONF_LOCATION: '/nginx-confs'
+      ENV: local

server/requirements.txt

@@ -1,4 +1,5 @@
 pyyaml
 flask
 pyjwt
-Flask - HTTPAuth
+Flask-HTTPAuth
+python-dotenv

server/utils.py

@@ -175,11 +175,12 @@ def find_free_port(self) -> str:
         while current_port <= self._end_port:
             with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
                 try:
-                    s.bind((self._host_name, current_port))
+                    s.connect((self._host_name, current_port))
+                    s.close()
+                    current_port += 1
+                except ConnectionRefusedError:
                     self._port = current_port
                     return current_port
-                except socket.error:
-                    current_port += 1
 
         raise RuntimeError(f"Could not find a free port in the specified range.")
 
@@ -251,7 +252,7 @@ def _test_nginx_config(self):
     def reload_nginx(self):
         self._test_nginx_config()
         subprocess.run(
-            ["docker", "exec", "-it", "sarthi_nginx", "nginx", "-s", "reload"],
+            ["docker", "exec", "sarthi_nginx", "nginx", "-s", "reload"],
             check=True,
         )
         logger.info("Nginx reloaded successfully.")