From 78aacdee5109c460d691c0b4ac20a50ad3a51715 Mon Sep 17 00:00:00 2001
From: jr-k <jessym.reziga@gmail.com>
Date: Mon, 22 Jul 2024 03:23:19 +0200
Subject: [PATCH] fix docker

---
 Dockerfile               |  6 ++++--
 docker-compose.dev.yml   | 16 ++++++++++------
 docker-compose.yml       |  6 +++++-
 system/install-studio.sh |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 051e2ac..933407b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,13 @@
 FROM python:3.9.17-alpine3.17
 
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev sqlite-dev exfat-fuse ntfs-3g build-base linux-headers
+# Install ffmpeg and other dependencies
+RUN apk add --no-cache gcc musl-dev sqlite-dev ntfs-3g ffmpeg build-base linux-headers
 
 WORKDIR /app
 
 COPY . .
 
-RUN pip install -r requirements.txt && apk del .build-deps gcc musl-dev sqlite-dev exfat-fuse ntfs-3g build-base linux-headers
+# Install Python dependencies
+RUN pip install -r requirements.txt
 
 ENTRYPOINT ["python", "/app/obscreen.py"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 0411353..01d8b45 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -5,12 +5,16 @@ services:
       dockerfile: Dockerfile
     container_name: obscreen
     restart: unless-stopped
-    image: obscreen:latest
     environment:
-      - DEBUG=${DEBUG-false}
-      - PORT=${PORT-5000}
-      - SECRET_KEY=${SECRET_KEY-ANY_SECRET_KEY_HERE}
+      - DEMO=false
+      - DEBUG=false
+      - SECRET_KEY=ANY_SECRET_KEY_HERE
+      - PORT=5000
+      - PORT_HTTP_EXTERNAL_STORAGE=5001
     volumes:
-      - .:/app
+      - ./data/db:/app/data/db
+      - ./data/uploads:/app/data/uploads
+      - ./var/run/storage:/app/var/run/storage
     ports:
-      - ${PORT}:${PORT}
\ No newline at end of file
+      - 5000:5000
+      - 5001:5001
diff --git a/docker-compose.yml b/docker-compose.yml
index 57d8828..6fe9fbc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,11 +4,15 @@ services:
     restart: unless-stopped
     image: jierka/obscreen:latest
     environment:
+      - DEMO=false
       - DEBUG=false
-      - PORT=5000
       - SECRET_KEY=ANY_SECRET_KEY_HERE
+      - PORT=5000
+      - PORT_HTTP_EXTERNAL_STORAGE=5001
     volumes:
       - ./data/db:/app/data/db
       - ./data/uploads:/app/data/uploads
+      - ./var/run/storage:/app/var/run/storage
     ports:
       - 5000:5000
+      - 5001:5001
diff --git a/system/install-studio.sh b/system/install-studio.sh
index 12987de..1863347 100755
--- a/system/install-studio.sh
+++ b/system/install-studio.sh
@@ -19,7 +19,7 @@ sleep 3
 
 # Install system dependencies
 sudo apt-get update
-sudo apt-get install -y git python3-pip python3-venv libsqlite3-dev exfat-fuse ntfs-3g
+sudo apt-get install -y git python3-pip python3-venv libsqlite3-dev ntfs-3g ffmpeg
 
 # Get files
 cd $WORKING_DIR