Add docker support

README.md

@@ -6,6 +6,6 @@ Finnish-language music server
 
 - Add the server IP to `serverip.txt` (used by the client)
 - Add the client IP to `adminips.txt` (used by the server)
-- On the music server: `python3 manage.py runserver`
+- On the music server: `python3 manage.py runserver` or `sudo docker-compose up --build` if using docker
 - On the client: `python3 musa_client.py`
 - Siinäpä se

client/player.py

@@ -6,7 +6,7 @@
 TIMEOUT = 20
 
 with open("serverip.txt", "r") as f:
-    SERVU = f"http://{f.readlines()[0]}:8000"
+    SERVU = f"http://{f.readlines()[0]}"
 
 instance = vlc.Instance()
 player = instance.media_player_new()
@@ -20,7 +20,7 @@
         print("Getting next song...")
         r = requests.post(SERVU + "/next/", verify=False)
         if not r.status_code == 200:
-            print("Not 200 status")
+            print(f"Invalid response: {r.status_code}\n{r.text}")
             break
 
         url = r.text

client/serverip.txt

@@ -1 +1 @@
-127.0.0.1
+127.0.0.1:8000

server/.dockerignore

@@ -0,0 +1 @@
+musa.tar

server/Dockerfile

@@ -0,0 +1,9 @@
+# syntax=docker/dockerfile:1
+FROM python:3
+ENV PYTHONUNBUFFERED=1
+WORKDIR /code
+COPY requirements.txt /code/
+RUN pip install -r requirements.txt
+COPY . /code/
+
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

server/docker-compose.yml

@@ -0,0 +1,8 @@
+version: "3.3"
+
+services:
+  web:
+    build: .
+    command: python manage.py runserver 0.0.0.0:8000
+    ports:
+      - "127.0.0.1:8000:8000"

server/player/views.py

@@ -19,6 +19,7 @@ def is_admin(request):
         ip = x_forwarded_for.split(',')[0]
     else:
         ip = request.META.get('REMOTE_ADDR')
+    print("Admin check on IP", ip)
     return ip in admins
 
 

server/requirements.txt

@@ -0,0 +1,2 @@
+Django>=3.0,<4.0
+requests>=2.22.0