From 492f68e0f8e1498f7121b9ba890b0cd12ad498ba Mon Sep 17 00:00:00 2001
From: ksyasuda <ksyasuda@umich.edu>
Date: Thu, 5 Sep 2024 04:34:00 -0700
Subject: [PATCH] Change to gunicorn and update variable names

---
 Dockerfile                       | 13 ++++++-------
 env.example                      |  6 +++---
 mpv-youtube-queue-server.service |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9f185c3..7d9a4b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,16 +2,14 @@
 FROM python:3.10-slim
 
 # Set environment variables for the MPV socket and server host/port
-ENV MPV_SOCKET="/tmp/mpvsocket" \
-    HOST_NAME="0.0.0.0" \
-    PORT_NUMBER=8080 \
-    LOGLEVEL="info"
+ENV LISTEN_ADDRESS="0.0.0.0" \
+    LISTEN_PORT=8080
 
 # Set the working directory in the container
 WORKDIR /app
 
 # Copy the current directory contents into the container at /app
-COPY server.py /app/server.py
+COPY server.py requirements.txt /app/
 
 # Install any needed packages specified in requirements.txt
 # If there are no external dependencies, you can skip this step
@@ -20,7 +18,8 @@ COPY server.py /app/server.py
 # Make port 8080 available to the world outside this container
 EXPOSE "${PORT_NUMBER}"
 
-RUN pip3 install --no-cache-dir Flask mysql-connector-python
+RUN pip3 install --no-cache-dir -r requirements.txt
 
 # Run server.py when the container launches
-CMD ["python3", "server.py", "--host", "${HOST_NAME}", "--port", "${PORT_NUMBER}", "--input-ipc-server", "${MPV_SOCKET}"]
+# CMD ["python3", "server.py", "--host", "${LISTEN_ADDRESS}", "--port", "${LISTEN_PORT}", "--input-ipc-server", "${MPV_SOCKET}"]
+CMD gunicorn --bind "${LISTEN_ADDRESS}":"${LISTEN_PORT}" server:app
diff --git a/env.example b/env.example
index 4bab203..d09d758 100644
--- a/env.example
+++ b/env.example
@@ -1,7 +1,6 @@
-IP=0.0.0.0 # Lisen on all interfaces
-PORT_NUMBER=8080 # Internal port number
+LISTEN_ADDRESS=0.0.0.0 # Lisen on all interfaces
+LISTEN_PORT=8080 # Internal port number
 MPV_SOCKET=/tmp/mpvsocket # Path to mpv socket
-LOGLEVEL=info
 
 # MySQL connection info
 MYSQL_HOST=localhost
@@ -10,3 +9,4 @@ MYSQL_PASSWORD=SecretPassword
 MYSQL_DATABASE=mpv
 MYSQL_PORT=3306
 
+LOGLEVEL=info
diff --git a/mpv-youtube-queue-server.service b/mpv-youtube-queue-server.service
index 99da8b9..4df11ad 100644
--- a/mpv-youtube-queue-server.service
+++ b/mpv-youtube-queue-server.service
@@ -8,8 +8,8 @@ WorkingDirectory=<PATH_TO_PYTHON_SCRIPT>
 ExecStart=<PATH_TO_PYTHON> <PATH_TO_PYTHON_SCRIPT>
 Restart=on-failure
 Environment="MPV_SOCKET=/tmp/mpvsocket"
-Environment="HOST_NAME=0.0.0.0"
-Environment="PORT_NUMBER=42069"
+Environment="LISTEN_ADDRESS=0.0.0.0"
+Environment="LISTEN_PORT=42069"
 Environment="MYSQL_HOST=http://localhost"
 Environment="MYSQL_USER=mpvuser"
 Environment="MYSQL_PASSWORD=SecretPassword"