From e86c689df42dcd0e96f38269fe93de2cdfc897d1 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Fri, 6 Oct 2023 18:06:53 -0700
Subject: [PATCH] updates to handbrake heimdall and streama

---
 handbrake/docker-compose.yml | 31 +++++++++++++++++++++++++++++++
 heimdall/docker-compose.yml  |  8 ++++++--
 streama/docker-compose.yml   | 20 --------------------
 3 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 handbrake/docker-compose.yml

diff --git a/handbrake/docker-compose.yml b/handbrake/docker-compose.yml
new file mode 100644
index 0000000..954000b
--- /dev/null
+++ b/handbrake/docker-compose.yml
@@ -0,0 +1,31 @@
+---
+version: "3"
+
+###########################################################################################################################
+# Handbrake
+# 
+# DockerHub: https://hub.docker.com/r/jlesage/handbrake
+#
+# SAMPLE ENV
+# <intentionally blank>
+#
+# NOTES
+#
+# You can specify read and write for example:
+# "handbrake-storage:/storage:ro"
+# "handbrake-output:/output:rw"
+###########################################################################################################################
+
+services:
+  handbrake:
+    image: jlesage/handbrake
+    volumes:
+      - ./data/config:/config
+      - ./data/raw:/storage
+      - ./data/watch:/watch
+      - ./data/processed:/output
+    restart: "no"
+    ports:
+      - "8000:5800"
+
+
diff --git a/heimdall/docker-compose.yml b/heimdall/docker-compose.yml
index 724e17d..e717ed5 100644
--- a/heimdall/docker-compose.yml
+++ b/heimdall/docker-compose.yml
@@ -11,10 +11,11 @@ version: "3"
 #
 # NOTES
 #
-# Make sure your volume is set correctly
+# Make sure your volume is set correctly.
+# Ports don't need to be set if behind proxy
 #
 # You can edit vol/www/.env
-# For https include FORCE_HTTPS=true
+# For https include: FORCE_HTTPS=true
 #
 ###########################################################################################################################
 
@@ -28,4 +29,7 @@ services:
     volumes:
       - ./data:/config
     restart: unless-stopped
+    #ports:
+    #  - "8000:80"
+
 
diff --git a/streama/docker-compose.yml b/streama/docker-compose.yml
index 34bef62..2a8a317 100644
--- a/streama/docker-compose.yml
+++ b/streama/docker-compose.yml
@@ -1,22 +1,10 @@
 ---
 version: "2"
 
-volumes:
-  streama-db:
-  streama-movies:
-  streama-appdata:
-
-networks:
-  admin_web:
-    external:
-      name: admin_web
-
 services:
   streama-db:
     image: mariadb:${DB_V}
     restart: always
-    networks:
-      - admin_web
     volumes:
       - streama-db:/var/lib/mysql
     environment:
@@ -31,8 +19,6 @@ services:
     restart: always
     depends_on:
       - streama-db
-    networks:
-      - admin_web
     volumes:
       - streama-movies:/data/streama # Change to your video folder
       - streama-appdata:/app/streama
@@ -43,9 +29,3 @@ services:
       MYSQL_DB: streama
       MYSQL_USER: streama
       MYSQL_PASSWORD: ${STREAMA_MYSQL_PASSWORD}
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.${PREFIX}_streama.rule=Host(`${STREAMA_DOMAIN_NAME}`)"
-      - "traefik.http.routers.${PREFIX}_streama.entrypoints=websecure"
-      - "traefik.http.routers.${PREFIX}_streama.tls.certresolver=letsencrypt"
-      - "traefik.http.services.${PREFIX}_streama.loadbalancer.server.port=8080"